zinfer 0.2.7 → 1.0.0-next.1

package/dist/core/getter-resolver.js

@@ -1,26 +1,19 @@
-import { SyntaxKind, Node } from "ts-morph";
-/**
- * Detects and resolves getter-based recursive patterns in Zod schemas.
- */
+import { SyntaxKind, isCallExpression, isIdentifier, isPropertyAccessExpression, } from "@typescript/native-preview/unstable/ast";
+import { findFirstDescendantByKind, getDescendantsOfKind } from "./tsgo-ast-utils.js";
 export class GetterResolver {
-    /**
-     * Analyzes a source file to find getter field mappings.
-     *
-     * @param sourceFile - The ts-morph SourceFile to analyze
-     * @returns Map of schema name to field info
-     */
     analyzeGetterFields(sourceFile, schemaNames) {
         const result = new Map();
-        const statements = sourceFile.getVariableStatements();
-        for (const stmt of statements) {
-            for (const decl of stmt.getDeclarations()) {
-                const schemaName = decl.getName();
+        for (const statement of sourceFile.statements) {
+            if (statement.kind !== SyntaxKind.VariableStatement)
+                continue;
+            for (const decl of statement.declarationList.declarations) {
+                const schemaName = decl.name.getText(sourceFile);
                 if (schemaNames && !schemaNames.has(schemaName))
                     continue;
-                const init = decl.getInitializer();
+                const init = decl.initializer;
                 if (!init)
                     continue;
-                const fieldMap = this.extractGetterFieldsFromAST(init, schemaName);
+                const fieldMap = this.extractGetterFieldsFromAST(init, schemaName, sourceFile);
                 if (fieldMap.size > 0) {
                     result.set(schemaName, fieldMap);
                 }
@@ -28,84 +21,70 @@ export class GetterResolver {
         }
         return result;
     }
-    /**
-     * Extracts getter field info from AST nodes.
-     */
-    extractGetterFieldsFromAST(node, schemaName) {
+    extractGetterFieldsFromAST(node, schemaName, sourceFile) {
         const fieldMap = new Map();
-        // Find all getter declarations within the node
-        const getters = node.getDescendantsOfKind(SyntaxKind.GetAccessor);
+        const getters = getDescendantsOfKind(node, SyntaxKind.GetAccessor);
         for (const getter of getters) {
-            const fieldName = getter.getName();
-            const body = getter.getBody();
+            const fieldName = getter.name.getText(sourceFile);
+            const body = getter.body;
             if (!body)
                 continue;
-            // Find return statement
-            const returnStmt = body.getFirstDescendantByKind(SyntaxKind.ReturnStatement);
+            const returnStmt = findFirstDescendantByKind(body, SyntaxKind.ReturnStatement);
             if (!returnStmt)
                 continue;
-            const returnExpr = returnStmt.getExpression();
+            const returnExpr = returnStmt.expression;
             if (!returnExpr)
                 continue;
-            const info = this.parseReturnExpressionAST(returnExpr, schemaName);
+            const info = this.parseReturnExpressionAST(returnExpr, schemaName, sourceFile);
             if (info) {
                 fieldMap.set(fieldName, info);
             }
         }
         return fieldMap;
     }
-    /**
-     * Parses the return expression AST to extract schema reference info.
-     */
-    parseReturnExpressionAST(expr, schemaName) {
+    parseReturnExpressionAST(expr, schemaName, sourceFile) {
         let isArray = false;
         let isRecord = false;
         let isOptional = false;
         let refSchema = null;
-        // Unwrap method chains like .optional(), .nullable(), .array()
         let currentExpr = expr;
-        while (Node.isCallExpression(currentExpr)) {
+        while (isCallExpression(currentExpr)) {
             const callExpr = currentExpr;
-            const exprNode = callExpr.getExpression();
-            if (Node.isPropertyAccessExpression(exprNode)) {
-                const propAccess = exprNode;
-                const methodName = propAccess.getName();
-                const baseExpr = propAccess.getExpression();
-                // Check for .optional() or .nullable() on a schema
+            const exprNode = callExpr.expression;
+            if (isPropertyAccessExpression(exprNode)) {
+                const methodName = exprNode.name.getText(sourceFile);
+                const baseExpr = exprNode.expression;
                 if (methodName === "optional" || methodName === "nullable") {
                     isOptional = true;
                     currentExpr = baseExpr;
                     continue;
                 }
-                // Check for SchemaName.array() pattern
-                if (methodName === "array" && Node.isIdentifier(baseExpr)) {
-                    const baseName = baseExpr.getText();
+                if (methodName === "array" && isIdentifier(baseExpr)) {
+                    const baseName = baseExpr.getText(sourceFile);
                     if (baseName !== "z") {
                         isArray = true;
                         refSchema = baseName;
                         break;
                     }
                 }
-                // Check for z.array(SchemaName) or z.record(key, SchemaName)
-                if (Node.isIdentifier(baseExpr) && baseExpr.getText() === "z") {
-                    const args = callExpr.getArguments();
+                if (isIdentifier(baseExpr) && baseExpr.getText(sourceFile) === "z") {
+                    const args = callExpr.arguments;
                     if (methodName === "array" && args.length > 0) {
                         isArray = true;
-                        refSchema = this.extractSchemaRef(args[0]);
+                        refSchema = this.extractSchemaRef(args[0], sourceFile);
                         break;
                     }
                     if (methodName === "record" && args.length >= 2) {
                         isRecord = true;
-                        refSchema = this.extractSchemaRef(args[1]);
+                        refSchema = this.extractSchemaRef(args[1], sourceFile);
                         break;
                     }
                 }
             }
             break;
         }
-        // If we haven't found a ref yet, check if currentExpr is an identifier
-        if (!refSchema && Node.isIdentifier(currentExpr)) {
-            refSchema = currentExpr.getText();
+        if (!refSchema && isIdentifier(currentExpr)) {
+            refSchema = currentExpr.getText(sourceFile);
         }
         if (!refSchema) {
             return null;
@@ -118,55 +97,35 @@ export class GetterResolver {
             isSelfRef: refSchema === schemaName,
         };
     }
-    /**
-     * Extracts schema reference from an argument node.
-     */
-    extractSchemaRef(node) {
-        if (Node.isIdentifier(node)) {
-            return node.getText();
+    extractSchemaRef(node, sourceFile) {
+        if (isIdentifier(node)) {
+            return node.getText(sourceFile);
         }
         return null;
     }
-    /**
-     * Resolves `any` types in extracted type string by replacing with self-references.
-     * Uses structured parsing instead of regex.
-     *
-     * @param typeStr - The extracted type string with `any` placeholders
-     * @param getterFields - Map of field name to getter field info
-     * @param typeName - The generated type name to use for self-references
-     * @returns The resolved type string with proper self-references
-     */
     resolveAnyTypes(typeStr, getterFields, typeName) {
         let result = typeStr;
         for (const [fieldName, info] of getterFields) {
             if (!info.isSelfRef) {
                 continue;
             }
-            // For z.record pattern: { [x: string]: any } -> { [x: string]: TypeName }
             if (info.isRecord) {
                 result = this.replaceRecordAny(result, fieldName, typeName);
             }
-            // Handle any field (array or single reference)
             result = this.replaceFieldAny(result, fieldName, typeName, info.isArray);
         }
         return result;
     }
-    /**
-     * Replaces any type in a record field.
-     */
     replaceRecordAny(typeStr, fieldName, typeName) {
-        // Find "fieldName: { [x: string]: any" or "fieldName?: { [x: string]: any"
         const fieldPatterns = [`${fieldName}: {`, `${fieldName}?: {`];
         const indexSigPattern = "[x: string]:";
         for (const pattern of fieldPatterns) {
             let idx = typeStr.indexOf(pattern);
             while (idx !== -1) {
-                // Find the index signature pattern
                 const afterBrace = idx + pattern.length;
                 const indexSigStart = typeStr.indexOf(indexSigPattern, afterBrace);
                 if (indexSigStart !== -1 && indexSigStart < afterBrace + 20) {
                     const colonPos = indexSigStart + indexSigPattern.length;
-                    // Find "any" after the colon - count whitespace explicitly
                     let scanPos = colonPos;
                     while (scanPos < typeStr.length && /\s/.test(typeStr[scanPos])) {
                         scanPos++;
@@ -182,18 +141,13 @@ export class GetterResolver {
         }
         return typeStr;
     }
-    /**
-     * Replaces any type in a regular field.
-     */
     replaceFieldAny(typeStr, fieldName, typeName, isArray) {
-        // Find "fieldName: any" or "fieldName?: any" patterns
         const fieldPatterns = [`${fieldName}: `, `${fieldName}?: `];
         for (const pattern of fieldPatterns) {
             let idx = typeStr.indexOf(pattern);
             while (idx !== -1) {
                 const valueStart = idx + pattern.length;
                 const restOfType = typeStr.substring(valueStart);
-                // Check for "readonly any" or just "any"
                 let anyIdx = -1;
                 let prefixLen = 0;
                 if (restOfType.startsWith("readonly ")) {
@@ -206,15 +160,12 @@ export class GetterResolver {
                     anyIdx = valueStart;
                 }
                 if (anyIdx !== -1) {
-                    // Check what comes after "any"
                     const afterAny = typeStr.substring(anyIdx + 3);
                     const hasArrayBrackets = afterAny.startsWith("[]");
-                    // Build replacement
                     let replacement = typeName;
                     if (isArray || hasArrayBrackets) {
                         replacement = `${typeName}[]`;
                     }
-                    // Calculate end position (include [] if present)
                     let endPos = anyIdx + 3;
                     if (hasArrayBrackets) {
                         endPos += 2;
@@ -226,9 +177,6 @@ export class GetterResolver {
         }
         return typeStr;
     }
-    /**
-     * Checks if a schema has getter-based self-references.
-     */
     hasSelfReferences(getterFields) {
         return Array.from(getterFields.values()).some((info) => info.isSelfRef);
     }

package/dist/core/getter-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"getter-resolver.js","sourceRoot":"","sources":["../../src/core/getter-resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getter-resolver.js","sourceRoot":"","sources":["../../src/core/getter-resolver.ts"],"names":[],"mappings":"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"}

package/dist/core/import-resolver.d.ts

@@ -1,37 +1,23 @@
-import { SourceFile, Project } from "ts-morph";
+import type { SourceFile } from "@typescript/native-preview/unstable/ast";
+import type { Project } from "@typescript/native-preview/unstable/sync";
 import { SchemaDetector } from "./schema-detector.js";
 /**
- * Information about an imported schema.
+ * ImportResolver, implemented against the tsgo/Corsa API. Cross-file module
+ * resolution goes through `Checker.getSymbolAtLocation` on the module
+ * specifier expression instead of ts-morph's `getModuleSpecifierSourceFile`.
+ * See issue #200.
  */
 export interface ImportedSchemaInfo {
-    /** Local name used in the importing file */
     localName: string;
-    /** Original name in the source file */
     originalName: string;
-    /** Resolved source file path */
     sourceFilePath: string;
-    /** Whether the schema was successfully resolved */
     resolved: boolean;
 }
-/**
- * Map of local schema name to imported schema info.
- */
 export type ImportedSchemaMap = Map<string, ImportedSchemaInfo>;
-/**
- * Resolves imported schemas from other files.
- */
 export declare class ImportResolver {
     private schemaDetector;
-    private moduleResolutionCache;
     private schemaSourceCache;
     constructor(schemaDetector?: SchemaDetector);
-    /**
-     * Finds all imported schemas in a source file.
-     *
-     * @param sourceFile - The source file to analyze
-     * @param project - The ts-morph project for module resolution
-     * @returns Map of local names to imported schema info
-     */
     findImportedSchemas(sourceFile: SourceFile, project: Project): ImportedSchemaMap;
     /**
      * Finds the actual source file containing a schema definition.
@@ -39,16 +25,10 @@ export declare class ImportResolver {
      */
     private findSchemaSource;
     /**
-     * Resolves a module specifier to a source file.
-     */
-    private resolveModuleSpecifier;
-    /**
-     * Generates possible file paths for a module specifier and resolves to a source file.
-     */
-    private resolveFromPossiblePaths;
-    /**
-     * Resolves an import declaration to its source file.
+     * Resolves a module specifier expression node to its target source file via
+     * the checker's symbol resolution (respects the project's configured
+     * module resolution, including package.json "imports" subpath mappings).
      */
-    private resolveImportedFile;
+    private resolveModuleSpecifierNode;
 }
 //# sourceMappingURL=import-resolver.d.ts.map

package/dist/core/import-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"import-resolver.d.ts","sourceRoot":"","sources":["../../src/core/import-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAqB,OAAO,EAAE,MAAM,UAAU,CAAC;AAElE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAGtD;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,4CAA4C;IAC5C,SAAS,EAAE,MAAM,CAAC;IAClB,uCAAuC;IACvC,YAAY,EAAE,MAAM,CAAC;IACrB,gCAAgC;IAChC,cAAc,EAAE,MAAM,CAAC;IACvB,mDAAmD;IACnD,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;AAEhE;;GAEG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,qBAAqB,CAA6C;IAC1E,OAAO,CAAC,iBAAiB,CAGrB;IAEJ,YAAY,cAAc,CAAC,EAAE,cAAc,EAE1C;IAED;;;;;;OAMG;IACH,mBAAmB,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,iBAAiB,CAiD/E;IAED;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IA0ExB;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAS9B;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAqChC;;OAEG;IACH,OAAO,CAAC,mBAAmB;CAwB5B"}
+{"version":3,"file":"import-resolver.d.ts","sourceRoot":"","sources":["../../src/core/import-resolver.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAIV,UAAU,EACX,MAAM,yCAAyC,CAAC;AACjD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0CAA0C,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAGtD;;;;;GAKG;AACH,MAAM,WAAW,kBAAkB;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,MAAM,iBAAiB,GAAG,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;AAEhE,qBAAa,cAAc;IACzB,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,iBAAiB,CAGrB;gBAEQ,cAAc,CAAC,EAAE,cAAc;IAI3C,mBAAmB,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,iBAAiB;IAkDhF;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAmExB;;;;OAIG;IACH,OAAO,CAAC,0BAA0B;CAiBnC"}

package/dist/core/import-resolver.js

@@ -1,56 +1,46 @@
-import { join } from "pathe";
+import { SyntaxKind, isNamedExports, isNamedImports, isStringLiteral, } from "@typescript/native-preview/unstable/ast";
 import { SchemaDetector } from "./schema-detector.js";
 import { logDebugError } from "./logger.js";
-/**
- * Resolves imported schemas from other files.
- */
 export class ImportResolver {
     schemaDetector;
-    moduleResolutionCache = new Map();
     schemaSourceCache = new Map();
     constructor(schemaDetector) {
         this.schemaDetector = schemaDetector ?? new SchemaDetector();
     }
-    /**
-     * Finds all imported schemas in a source file.
-     *
-     * @param sourceFile - The source file to analyze
-     * @param project - The ts-morph project for module resolution
-     * @returns Map of local names to imported schema info
-     */
     findImportedSchemas(sourceFile, project) {
         const result = new Map();
-        const imports = sourceFile.getImportDeclarations();
-        for (const importDecl of imports) {
-            const moduleSpecifier = importDecl.getModuleSpecifierValue();
+        for (const statement of sourceFile.statements) {
+            if (statement.kind !== SyntaxKind.ImportDeclaration)
+                continue;
+            const importDecl = statement;
+            const moduleSpecifierNode = importDecl.moduleSpecifier;
+            const moduleSpecifier = isStringLiteral(moduleSpecifierNode) ? moduleSpecifierNode.text : "";
             // Skip bare module specifiers (node_modules), but allow relative,
-            // absolute, and subpath imports (package.json "imports" field, e.g.
-            // "#/schemas/user.js"). Subpath imports — including the "#/*" form — are
-            // resolved by TypeScript's own module resolution (requires the
-            // TypeScript 6 bundled by ts-morph).
+            // absolute, and subpath imports (package.json "imports" field).
             if (!moduleSpecifier.startsWith(".") &&
                 !moduleSpecifier.startsWith("/") &&
                 !moduleSpecifier.startsWith("#")) {
                 continue;
             }
-            // Resolve the module to a source file
-            const resolvedSourceFile = this.resolveImportedFile(importDecl, sourceFile, project);
-            if (!resolvedSourceFile) {
+            const resolvedSourceFile = this.resolveModuleSpecifierNode(moduleSpecifierNode, project);
+            if (!resolvedSourceFile)
                 continue;
-            }
-            // Check named imports
-            const namedImports = importDecl.getNamedImports();
-            for (const namedImport of namedImports) {
-                const importedName = namedImport.getName();
-                const localName = namedImport.getAliasNode()?.getText() || importedName;
-                // Find the actual source file containing the schema definition
-                // This handles re-exports from index.ts files
+            const namedBindings = importDecl.importClause?.namedBindings;
+            if (!namedBindings || !isNamedImports(namedBindings))
+                continue;
+            for (const namedImport of namedBindings.elements) {
+                const importedName = namedImport.propertyName
+                    ? namedImport.propertyName.getText(sourceFile)
+                    : namedImport.name.getText(sourceFile);
+                const localName = namedImport.name.getText(sourceFile);
+                // Find the actual source file containing the schema definition.
+                // This handles re-exports from index.ts files.
                 const actualSource = this.findSchemaSource(resolvedSourceFile, importedName, project);
                 if (actualSource) {
                     result.set(localName, {
                         localName,
                         originalName: actualSource.schemaName,
-                        sourceFilePath: actualSource.sourceFile.getFilePath(),
+                        sourceFilePath: actualSource.sourceFile.fileName,
                         resolved: true,
                     });
                 }
@@ -63,35 +53,30 @@ export class ImportResolver {
      * Follows re-exports (export * from "./other") to find the original.
      */
     findSchemaSource(sourceFile, schemaName, project, visited = new Set()) {
-        const filePath = sourceFile.getFilePath();
-        // Check cross-call cache first
+        const filePath = sourceFile.fileName;
         const cacheKey = `${filePath}:${schemaName}`;
         if (this.schemaSourceCache.has(cacheKey)) {
             return this.schemaSourceCache.get(cacheKey);
         }
-        // Prevent infinite loops
         if (visited.has(filePath)) {
             return undefined;
         }
         visited.add(filePath);
-        // Check if the schema is defined directly in this file
         const schemas = this.schemaDetector.detectExportedSchemas(sourceFile);
         if (schemas.some((s) => s.name === schemaName)) {
             const result = { sourceFile, schemaName };
             this.schemaSourceCache.set(cacheKey, result);
             return result;
         }
-        // Check export declarations for re-exports
-        const exportDecls = sourceFile.getExportDeclarations();
-        for (const exportDecl of exportDecls) {
-            const moduleSpecifier = exportDecl.getModuleSpecifierValue();
-            if (!moduleSpecifier)
+        for (const statement of sourceFile.statements) {
+            if (statement.kind !== SyntaxKind.ExportDeclaration)
+                continue;
+            const exportDecl = statement;
+            if (!exportDecl.moduleSpecifier)
                 continue;
-            // Check if this is "export * from" or "export { name } from"
-            const namedExports = exportDecl.getNamedExports();
-            if (namedExports.length === 0) {
-                // This is "export * from './module'" - follow it
-                const reExportedFile = this.resolveModuleSpecifier(sourceFile, moduleSpecifier, project);
+            if (!exportDecl.exportClause) {
+                // "export * from './module'" - follow it
+                const reExportedFile = this.resolveModuleSpecifierNode(exportDecl.moduleSpecifier, project);
                 if (reExportedFile) {
                     const found = this.findSchemaSource(reExportedFile, schemaName, project, visited);
                     if (found) {
@@ -99,21 +84,23 @@ export class ImportResolver {
                         return found;
                     }
                 }
+                continue;
             }
-            else {
-                // Check named exports
-                for (const namedExport of namedExports) {
-                    const exportedName = namedExport.getAliasNode()?.getText() || namedExport.getName();
-                    if (exportedName === schemaName) {
-                        const originalName = namedExport.getName();
-                        const reExportedFile = this.resolveModuleSpecifier(sourceFile, moduleSpecifier, project);
-                        if (reExportedFile) {
-                            const found = this.findSchemaSource(reExportedFile, originalName, project, visited);
-                            if (found) {
-                                this.schemaSourceCache.set(cacheKey, found);
-                                return found;
-                            }
-                        }
+            if (!isNamedExports(exportDecl.exportClause))
+                continue;
+            for (const namedExport of exportDecl.exportClause.elements) {
+                const exportedName = namedExport.name.getText(sourceFile);
+                if (exportedName !== schemaName)
+                    continue;
+                const originalName = namedExport.propertyName
+                    ? namedExport.propertyName.getText(sourceFile)
+                    : exportedName;
+                const reExportedFile = this.resolveModuleSpecifierNode(exportDecl.moduleSpecifier, project);
+                if (reExportedFile) {
+                    const found = this.findSchemaSource(reExportedFile, originalName, project, visited);
+                    if (found) {
+                        this.schemaSourceCache.set(cacheKey, found);
+                        return found;
                     }
                 }
             }
@@ -122,64 +109,24 @@ export class ImportResolver {
         return undefined;
     }
     /**
-     * Resolves a module specifier to a source file.
-     */
-    resolveModuleSpecifier(fromFile, moduleSpecifier, project) {
-        const sourceDir = fromFile.getDirectoryPath();
-        return this.resolveFromPossiblePaths(sourceDir, moduleSpecifier, project);
-    }
-    /**
-     * Generates possible file paths for a module specifier and resolves to a source file.
-     */
-    resolveFromPossiblePaths(sourceDir, moduleSpecifier, project) {
-        const cacheKey = `${sourceDir}:${moduleSpecifier}`;
-        if (this.moduleResolutionCache.has(cacheKey)) {
-            return this.moduleResolutionCache.get(cacheKey);
-        }
-        const possiblePaths = [
-            join(sourceDir, `${moduleSpecifier}.ts`),
-            join(sourceDir, moduleSpecifier, "index.ts"),
-            join(sourceDir, `${moduleSpecifier}.js`),
-            join(sourceDir, moduleSpecifier, "index.js"),
-        ];
-        for (const possiblePath of possiblePaths) {
-            let resolved = project.getSourceFile(possiblePath);
-            if (!resolved) {
-                try {
-                    resolved = project.addSourceFileAtPathIfExists(possiblePath);
-                }
-                catch (error) {
-                    logDebugError(`Failed to add source file at ${possiblePath}`, error);
-                    continue;
-                }
-            }
-            if (resolved) {
-                this.moduleResolutionCache.set(cacheKey, resolved);
-                return resolved;
-            }
-        }
-        this.moduleResolutionCache.set(cacheKey, undefined);
-        return undefined;
-    }
-    /**
-     * Resolves an import declaration to its source file.
+     * Resolves a module specifier expression node to its target source file via
+     * the checker's symbol resolution (respects the project's configured
+     * module resolution, including package.json "imports" subpath mappings).
      */
-    resolveImportedFile(importDecl, sourceFile, project) {
-        const moduleSpecifier = importDecl.getModuleSpecifierValue();
+    resolveModuleSpecifierNode(moduleSpecifierNode, project) {
         try {
-            // Get the module specifier source file
-            const moduleSourceFile = importDecl.getModuleSpecifierSourceFile();
-            if (moduleSourceFile) {
-                return moduleSourceFile;
-            }
-            // Try to resolve manually for index.ts patterns
-            const sourceDir = sourceFile.getDirectoryPath();
-            return this.resolveFromPossiblePaths(sourceDir, moduleSpecifier, project);
+            const symbol = project.checker.getSymbolAtLocation(moduleSpecifierNode);
+            if (!symbol)
+                return undefined;
+            const decl = symbol.declarations[0];
+            if (!decl)
+                return undefined;
+            return project.program.getSourceFile(decl.path);
         }
         catch (error) {
-            logDebugError(`Module resolution failed for ${moduleSpecifier}`, error);
+            logDebugError("Module resolution failed", error);
+            return undefined;
         }
-        return undefined;
     }
 }
 //# sourceMappingURL=import-resolver.js.map

package/dist/core/import-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"import-resolver.js","sourceRoot":"","sources":["../../src/core/import-resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"import-resolver.js","sourceRoot":"","sources":["../../src/core/import-resolver.ts"],"names":[],"mappings":"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"}