@graphql-tools/import 7.1.0 → 7.1.1-alpha-20250828211049-07841b34e88a4f0a4fa34a3e7cea935744763c34

package/cjs/index.js

@@ -52,8 +52,11 @@ function processImport(filePath, cwd = globalThis.process?.cwd(), predefinedImpo
         };
 }
 function visitFile(filePath, cwd, visitedFiles, predefinedImports, pathAliases) {
-    if (!(0, path_1.isAbsolute)(filePath) && !(filePath in predefinedImports)) {
-        filePath = resolveFilePath(cwd, filePath, pathAliases);
+    if (!(filePath in predefinedImports)) {
+        filePath = applyPathAliases(filePath, pathAliases);
+        if (!(0, path_1.isAbsolute)(filePath)) {
+            filePath = resolveFilePath(cwd, filePath);
+        }
     }
     if (!visitedFiles.has(filePath)) {
         const fileContent = filePath in predefinedImports ? predefinedImports[filePath] : (0, fs_1.readFileSync)(filePath, 'utf8');
@@ -442,19 +445,7 @@ function parseImportLine(importLine) {
     # import [Type].[Field] from [File]
   `);
 }
-function resolveFilePath(filePath, importFrom, pathAliases) {
-    // First, check if importFrom matches any path aliases.
-    if (pathAliases != null) {
-        for (const [prefixPattern, mapping] of Object.entries(pathAliases.mappings)) {
-            const matchedMapping = applyPathAlias(prefixPattern, mapping, importFrom);
-            if (matchedMapping == null) {
-                continue;
-            }
-            const resolvedMapping = (0, resolve_from_1.default)(pathAliases.rootDir ?? process.cwd(), matchedMapping);
-            return (0, fs_1.realpathSync)(resolvedMapping);
-        }
-    }
-    // Fall back to original resolution logic
+function resolveFilePath(filePath, importFrom) {
     const dirName = (0, path_1.dirname)(filePath);
     try {
         const fullPath = (0, path_1.join)(dirName, importFrom);
@@ -467,6 +458,29 @@ function resolveFilePath(filePath, importFrom, pathAliases) {
         throw e;
     }
 }
+/**
+ * Rewrites the provided file path using the first matched path alias (or
+ * returns the file path with no changes if none match).
+ *
+ * @param filePath - The file path to rewrite.
+ * @param pathAliases - The path aliases to evaluate.
+ *
+ * @returns The rewritten file path.
+ */
+function applyPathAliases(filePath, pathAliases) {
+    if (pathAliases == null) {
+        return filePath;
+    }
+    for (const [prefixPattern, mapping] of Object.entries(pathAliases.mappings)) {
+        const matchedMapping = applyPathAlias(prefixPattern, mapping, filePath);
+        if (matchedMapping == null) {
+            continue;
+        }
+        const resolvedMapping = (0, resolve_from_1.default)(pathAliases.rootDir ?? process.cwd(), matchedMapping);
+        return (0, fs_1.realpathSync)(resolvedMapping);
+    }
+    return filePath;
+}
 /**
  * Resolves an import alias and it's mapping using the same strategy as
  * tsconfig.json#paths

package/esm/index.js

@@ -44,8 +44,11 @@ export function processImport(filePath, cwd = globalThis.process?.cwd(), predefi
         };
 }
 function visitFile(filePath, cwd, visitedFiles, predefinedImports, pathAliases) {
-    if (!isAbsolute(filePath) && !(filePath in predefinedImports)) {
-        filePath = resolveFilePath(cwd, filePath, pathAliases);
+    if (!(filePath in predefinedImports)) {
+        filePath = applyPathAliases(filePath, pathAliases);
+        if (!isAbsolute(filePath)) {
+            filePath = resolveFilePath(cwd, filePath);
+        }
     }
     if (!visitedFiles.has(filePath)) {
         const fileContent = filePath in predefinedImports ? predefinedImports[filePath] : readFileSync(filePath, 'utf8');
@@ -434,19 +437,7 @@ export function parseImportLine(importLine) {
     # import [Type].[Field] from [File]
   `);
 }
-function resolveFilePath(filePath, importFrom, pathAliases) {
-    // First, check if importFrom matches any path aliases.
-    if (pathAliases != null) {
-        for (const [prefixPattern, mapping] of Object.entries(pathAliases.mappings)) {
-            const matchedMapping = applyPathAlias(prefixPattern, mapping, importFrom);
-            if (matchedMapping == null) {
-                continue;
-            }
-            const resolvedMapping = resolveFrom(pathAliases.rootDir ?? process.cwd(), matchedMapping);
-            return realpathSync(resolvedMapping);
-        }
-    }
-    // Fall back to original resolution logic
+function resolveFilePath(filePath, importFrom) {
     const dirName = dirname(filePath);
     try {
         const fullPath = join(dirName, importFrom);
@@ -459,6 +450,29 @@ function resolveFilePath(filePath, importFrom, pathAliases) {
         throw e;
     }
 }
+/**
+ * Rewrites the provided file path using the first matched path alias (or
+ * returns the file path with no changes if none match).
+ *
+ * @param filePath - The file path to rewrite.
+ * @param pathAliases - The path aliases to evaluate.
+ *
+ * @returns The rewritten file path.
+ */
+function applyPathAliases(filePath, pathAliases) {
+    if (pathAliases == null) {
+        return filePath;
+    }
+    for (const [prefixPattern, mapping] of Object.entries(pathAliases.mappings)) {
+        const matchedMapping = applyPathAlias(prefixPattern, mapping, filePath);
+        if (matchedMapping == null) {
+            continue;
+        }
+        const resolvedMapping = resolveFrom(pathAliases.rootDir ?? process.cwd(), matchedMapping);
+        return realpathSync(resolvedMapping);
+    }
+    return filePath;
+}
 /**
  * Resolves an import alias and it's mapping using the same strategy as
  * tsconfig.json#paths

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/import",
-  "version": "7.1.0",
+  "version": "7.1.1-alpha-20250828211049-07841b34e88a4f0a4fa34a3e7cea935744763c34",
   "description": "A set of utils for faster development of GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {