From 642d690b422e3369cd771aad5bdb1461089f9a0c Mon Sep 17 00:00:00 2001 From: houhaoyu Date: Wed, 22 Jun 2022 18:58:32 +0800 Subject: [PATCH] fixed 98903ec from https://gitee.com/houhaoyu/developtools_ace-ets2bundle/pulls/772 fixed 1a82491 from https://gitee.com/houhaoyu/developtools_ace-ets2bundle/pulls/765 houhaoyu@huawei.com support deccjsunit/index Signed-off-by: houhaoyu Change-Id: If20b8fb59438acdbbc1c4069a5e1d7af5136af28 --- compiler/src/ets_checker.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/compiler/src/ets_checker.ts b/compiler/src/ets_checker.ts index 270a1d0..98112ba 100644 --- a/compiler/src/ets_checker.ts +++ b/compiler/src/ets_checker.ts @@ -148,8 +148,12 @@ function resolveModuleNames(moduleNames: string[], containingFile: string): ts.R } } else { const modulePath: string = path.resolve(__dirname, '../../../api', moduleName + '.d.ts'); + const suffix: string = /\.js$/.test(moduleName) ? '' : '.js'; + const jsModulePath: string = path.resolve(__dirname, '../node_modules', moduleName + suffix); if (ts.sys.fileExists(modulePath)) { resolvedModules.push(getResolveModule(modulePath, '.d.ts')); + } else if (ts.sys.fileExists(jsModulePath)) { + resolvedModules.push(getResolveModule(modulePath, '.js')); } else { resolvedModules.push(null); }