diff --git a/src/runner/context.ts b/src/runner/context.ts index 261c4f5..efa2993 100644 --- a/src/runner/context.ts +++ b/src/runner/context.ts @@ -116,17 +116,9 @@ export async function collectContext(github: Octokit, snapshot: RequestSnapshot, for (const file of changed) for (const [label, commit, filename] of [['base', snapshot.base, file.previous_filename ?? file.filename], ['head', snapshot.head, file.filename]] as const) { if (!/\.[cm]?[jt]sx?$/.test(filename)) continue; const text = written.get(`${label}/${filename}`)?.toString('utf8') ?? ''; - const imports: string[] = []; - const visit = (node: ts.Node): void => { - const specifier = (ts.isImportDeclaration(node) || ts.isExportDeclaration(node)) ? node.moduleSpecifier - : ts.isImportEqualsDeclaration(node) && ts.isExternalModuleReference(node.moduleReference) ? node.moduleReference.expression - : ts.isCallExpression(node) && (node.expression.kind === ts.SyntaxKind.ImportKeyword || (ts.isIdentifier(node.expression) && node.expression.text === 'require')) ? node.arguments[0] : undefined; - if (specifier && ts.isStringLiteralLike(specifier) && /^\.{1,2}\//.test(specifier.text)) imports.push(specifier.text); - ts.forEachChild(node, visit); - }; - // Parse syntax: generated code strings and comments are not actual module dependencies. - visit(ts.createSourceFile(filename, text, ts.ScriptTarget.Latest, true)); - for (const specifier of imports) { + // The compiler distinguishes imports (including type queries) from generated strings/comments. + for (const {fileName:specifier} of ts.preProcessFile(text, true, true).importedFiles) { + if (!/^\.{1,2}\//.test(specifier)) continue; const path = posix.normalize(posix.join(posix.dirname(filename!), specifier)); if (posix.extname(path) && !/\.(?:[cm]?[jt]sx?|json)$/.test(path)) continue; if (dependencies.has(`${label}/${path}`)) continue; diff --git a/tests/context.test.ts b/tests/context.test.ts index c6586ba..65e5e66 100644 --- a/tests/context.test.ts +++ b/tests/context.test.ts @@ -108,7 +108,7 @@ const template = \`require('./missing.cjs')\`; /* import('./missing.mjs'); */ export const fixture = {generated,template};`; const result=await fixture({source});assert.equal(result.result.complete,true);assert.equal(result.result.requiredContextComplete,true); - for(const source of ["export {check} from './missing.js';","const x = import('./missing.js');","const x = require('./missing.js');","import x = require('./missing.js');"]){ + for(const source of ["type X = import('./missing.js').X;","export {check} from './missing.js';","const x = import('./missing.js');","const x = require('./missing.js');","import x = require('./missing.js');"]){ const missing=await fixture({source});assert.equal(missing.result.complete,false,source);assert.equal(missing.result.requiredContextComplete,false,source); } });