Skip to content

Commit 3e6658b

Browse files
committed
fix(alita): 修复 typescript ,javascript 文件互相导入的时候,解析错误的bug
1 parent 0ff1e49 commit 3e6658b

File tree

1 file changed

+15
-3
lines changed

1 file changed

+15
-3
lines changed

src/basetran/handleModules.js

+15-3
Original file line numberDiff line numberDiff line change
@@ -307,22 +307,33 @@ function getFinalSource(filepath, source) {
307307

308308
const extname = npath.extname(filepath)
309309

310-
const indexFiles = npath.resolve(originalPath, 'index')
311310

312311
let fileSufix = '.js'
312+
let backupSufix = '.ts'
313313
if (extname === '.ts' || extname === '.tsx') {
314314
fileSufix = '.ts'
315+
backupSufix = '.js'
316+
}
317+
318+
let finalSource = getFinalSourceByExtname(fileSufix, originalPath, source)
319+
if (!finalSource) {
320+
finalSource = getFinalSourceByExtname(backupSufix, originalPath, source)
315321
}
316322

323+
if (!finalSource) {
324+
console.log(`${filepath.replace(global.execArgs.OUT_DIR, '')}: 未找到${source}模块!`)
325+
}
326+
return finalSource
327+
}
328+
329+
function getFinalSourceByExtname(fileSufix, originalPath, source) {
317330
const allFiles = [
318331
`${originalPath}.wx${fileSufix}`,
319332
`${originalPath}${fileSufix}`,
320333
`${originalPath}.wx${fileSufix}x`,
321334
`${originalPath}${fileSufix}x`
322335
]
323336

324-
325-
326337
for(let i = 0; i < allFiles.length; i ++ ) {
327338
const filePath = allFiles[i]
328339

@@ -335,6 +346,7 @@ function getFinalSource(filepath, source) {
335346
}
336347
}
337348

349+
const indexFiles = npath.resolve(originalPath, 'index')
338350
const allIndexFiles = [
339351
`${indexFiles}.wx${fileSufix}`,
340352
`${indexFiles}${fileSufix}`,

0 commit comments

Comments
 (0)