@graphql-tools/import 6.6.18 → 6.7.0-alpha-b76ec274.0

package/{index.js → cjs/index.js}

@@ -1,16 +1,13 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
-
-const graphql = require('graphql');
-const fs = require('fs');
-const path = require('path');
-const resolveFrom = _interopDefault(require('resolve-from'));
-const process = require('process');
-const utils = require('@graphql-tools/utils');
-
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseImportLine = exports.extractImportLines = exports.processImports = exports.extractDependencies = exports.processImport = void 0;
+const tslib_1 = require("tslib");
+const graphql_1 = require("graphql");
+const fs_1 = require("fs");
+const path_1 = require("path");
+const resolve_from_1 = tslib_1.__importDefault(require("resolve-from"));
+const process_1 = require("process");
+const utils_1 = require("@graphql-tools/utils");
 const builtinTypes = ['String', 'Float', 'Int', 'Boolean', 'ID', 'Upload'];
 const builtinDirectives = [
     'deprecated',
@@ -32,13 +29,13 @@ const IMPORT_DEFAULT_REGEX = /^import\s+('|")(.*)('|");?$/;
  * and copies them into the final document.
  * processImport does not merge the typeDefs as designed ( https://github.com/ardatan/graphql-tools/issues/2980#issuecomment-1003692728 )
  */
-function processImport(filePath, cwd = process.cwd(), predefinedImports = {}, visitedFiles = new Map()) {
-    const set = visitFile(filePath, path.join(cwd + '/root.graphql'), visitedFiles, predefinedImports);
+function processImport(filePath, cwd = (0, process_1.cwd)(), predefinedImports = {}, visitedFiles = new Map()) {
+    const set = visitFile(filePath, (0, path_1.join)(cwd + '/root.graphql'), visitedFiles, predefinedImports);
     const definitionStrSet = new Set();
     let definitionsStr = '';
     for (const defs of set.values()) {
         for (const def of defs) {
-            const defStr = graphql.print(def);
+            const defStr = (0, graphql_1.print)(def);
             if (!definitionStrSet.has(defStr)) {
                 definitionStrSet.add(defStr);
                 definitionsStr += defStr + '\n';
@@ -46,18 +43,19 @@ function processImport(filePath, cwd = process.cwd(), predefinedImports = {}, vi
         }
     }
     return (definitionsStr === null || definitionsStr === void 0 ? void 0 : definitionsStr.length)
-        ? graphql.parse(new graphql.Source(definitionsStr, filePath))
+        ? (0, graphql_1.parse)(new graphql_1.Source(definitionsStr, filePath))
         : {
-            kind: graphql.Kind.DOCUMENT,
+            kind: graphql_1.Kind.DOCUMENT,
             definitions: [],
         };
 }
+exports.processImport = processImport;
 function visitFile(filePath, cwd, visitedFiles, predefinedImports) {
-    if (!path.isAbsolute(filePath) && !(filePath in predefinedImports)) {
+    if (!(0, path_1.isAbsolute)(filePath) && !(filePath in predefinedImports)) {
         filePath = resolveFilePath(cwd, filePath);
     }
     if (!visitedFiles.has(filePath)) {
-        const fileContent = filePath in predefinedImports ? predefinedImports[filePath] : fs.readFileSync(filePath, 'utf8');
+        const fileContent = filePath in predefinedImports ? predefinedImports[filePath] : (0, fs_1.readFileSync)(filePath, 'utf8');
         const { importLines, otherLines } = extractImportLines(fileContent);
         const { definitionsByName, dependenciesByDefinitionName } = extractDependencies(filePath, otherLines);
         const fileDefinitionMap = getFileDefinitionMap(definitionsByName, dependenciesByDefinitionName);
@@ -95,11 +93,11 @@ function visitFile(filePath, cwd, visitedFiles, predefinedImports) {
                         });
                         const newDependencySet = new Set();
                         switch (field.kind) {
-                            case graphql.Kind.FIELD_DEFINITION:
-                                visitFieldDefinitionNode(field, newDependencySet);
+                            case graphql_1.Kind.FIELD_DEFINITION:
+                                visitFieldDefinitionNode(field, newDependencySet, dependenciesByDefinitionName);
                                 break;
-                            case graphql.Kind.INPUT_VALUE_DEFINITION:
-                                visitInputValueDefinitionNode(field, newDependencySet);
+                            case graphql_1.Kind.INPUT_VALUE_DEFINITION:
+                                visitInputValueDefinitionNode(field, newDependencySet, dependenciesByDefinitionName);
                                 break;
                         }
                         newDependencySet.forEach(dependencyName => {
@@ -155,7 +153,7 @@ function visitFile(filePath, cwd, visitedFiles, predefinedImports) {
 function extractDependencies(filePath, fileContents) {
     const definitionsByName = new Map();
     const dependenciesByDefinitionName = new Map();
-    const { document } = utils.parseGraphQLSDL(filePath, fileContents, {
+    const { document } = (0, utils_1.parseGraphQLSDL)(filePath, fileContents, {
         noLocation: true,
     });
     for (const definition of document.definitions) {
@@ -166,10 +164,11 @@ function extractDependencies(filePath, fileContents) {
         dependenciesByDefinitionName,
     };
 }
+exports.extractDependencies = extractDependencies;
 function visitDefinition(definition, definitionsByName, dependenciesByDefinitionName) {
     var _a;
     // TODO: handle queries without names
-    if ('name' in definition || definition.kind === graphql.Kind.SCHEMA_DEFINITION) {
+    if ('name' in definition || definition.kind === graphql_1.Kind.SCHEMA_DEFINITION) {
         const definitionName = 'name' in definition && definition.name ? definition.name.value : 'schema';
         if (!definitionsByName.has(definitionName)) {
             definitionsByName.set(definitionName, new Set());
@@ -182,52 +181,52 @@ function visitDefinition(definition, definitionsByName, dependenciesByDefinition
             dependenciesByDefinitionName.set(definitionName, dependencySet);
         }
         switch (definition.kind) {
-            case graphql.Kind.OPERATION_DEFINITION:
+            case graphql_1.Kind.OPERATION_DEFINITION:
                 visitOperationDefinitionNode(definition, dependencySet);
                 break;
-            case graphql.Kind.FRAGMENT_DEFINITION:
+            case graphql_1.Kind.FRAGMENT_DEFINITION:
                 visitFragmentDefinitionNode(definition, dependencySet);
                 break;
-            case graphql.Kind.OBJECT_TYPE_DEFINITION:
+            case graphql_1.Kind.OBJECT_TYPE_DEFINITION:
                 visitObjectTypeDefinitionNode(definition, dependencySet, dependenciesByDefinitionName);
                 break;
-            case graphql.Kind.INTERFACE_TYPE_DEFINITION:
+            case graphql_1.Kind.INTERFACE_TYPE_DEFINITION:
                 visitInterfaceTypeDefinitionNode(definition, dependencySet, dependenciesByDefinitionName);
                 break;
-            case graphql.Kind.UNION_TYPE_DEFINITION:
+            case graphql_1.Kind.UNION_TYPE_DEFINITION:
                 visitUnionTypeDefinitionNode(definition, dependencySet);
                 break;
-            case graphql.Kind.ENUM_TYPE_DEFINITION:
+            case graphql_1.Kind.ENUM_TYPE_DEFINITION:
                 visitEnumTypeDefinitionNode(definition, dependencySet);
                 break;
-            case graphql.Kind.INPUT_OBJECT_TYPE_DEFINITION:
-                visitInputObjectTypeDefinitionNode(definition, dependencySet);
+            case graphql_1.Kind.INPUT_OBJECT_TYPE_DEFINITION:
+                visitInputObjectTypeDefinitionNode(definition, dependencySet, dependenciesByDefinitionName);
                 break;
-            case graphql.Kind.DIRECTIVE_DEFINITION:
-                visitDirectiveDefinitionNode(definition, dependencySet);
+            case graphql_1.Kind.DIRECTIVE_DEFINITION:
+                visitDirectiveDefinitionNode(definition, dependencySet, dependenciesByDefinitionName);
                 break;
-            case graphql.Kind.SCALAR_TYPE_DEFINITION:
+            case graphql_1.Kind.SCALAR_TYPE_DEFINITION:
                 visitScalarDefinitionNode(definition, dependencySet);
                 break;
-            case graphql.Kind.SCHEMA_DEFINITION:
+            case graphql_1.Kind.SCHEMA_DEFINITION:
                 visitSchemaDefinitionNode(definition, dependencySet);
                 break;
-            case graphql.Kind.OBJECT_TYPE_EXTENSION:
+            case graphql_1.Kind.OBJECT_TYPE_EXTENSION:
                 visitObjectTypeExtensionNode(definition, dependencySet, dependenciesByDefinitionName);
                 break;
-            case graphql.Kind.INTERFACE_TYPE_EXTENSION:
+            case graphql_1.Kind.INTERFACE_TYPE_EXTENSION:
                 visitInterfaceTypeExtensionNode(definition, dependencySet, dependenciesByDefinitionName);
                 break;
-            case graphql.Kind.UNION_TYPE_EXTENSION:
+            case graphql_1.Kind.UNION_TYPE_EXTENSION:
                 visitUnionTypeExtensionNode(definition, dependencySet);
                 break;
-            case graphql.Kind.ENUM_TYPE_EXTENSION:
+            case graphql_1.Kind.ENUM_TYPE_EXTENSION:
                 visitEnumTypeExtensionNode(definition, dependencySet);
                 break;
-            case graphql.Kind.INPUT_OBJECT_TYPE_EXTENSION:
-                visitInputObjectTypeExtensionNode(definition, dependencySet);
+            case graphql_1.Kind.INPUT_OBJECT_TYPE_EXTENSION:
+                visitInputObjectTypeExtensionNode(definition, dependencySet, dependenciesByDefinitionName);
                 break;
-            case graphql.Kind.SCALAR_TYPE_EXTENSION:
+            case graphql_1.Kind.SCALAR_TYPE_EXTENSION:
                 visitScalarExtensionNode(definition, dependencySet);
                 break;
         }
@@ -247,11 +246,11 @@ function visitDefinition(definition, definitionsByName, dependenciesByDefinition
                     dependenciesByDefinitionName.set(definitionName, dependencySet);
                 }
                 switch (field.kind) {
-                    case graphql.Kind.FIELD_DEFINITION:
-                        visitFieldDefinitionNode(field, dependencySet);
+                    case graphql_1.Kind.FIELD_DEFINITION:
+                        visitFieldDefinitionNode(field, dependencySet, dependenciesByDefinitionName);
                         break;
-                    case graphql.Kind.INPUT_VALUE_DEFINITION:
-                        visitInputValueDefinitionNode(field, dependencySet);
+                    case graphql_1.Kind.INPUT_VALUE_DEFINITION:
+                        visitInputValueDefinitionNode(field, dependencySet, dependenciesByDefinitionName);
                         break;
                 }
             }
@@ -332,6 +331,7 @@ function processImports(importLines, filePath, visitedFiles, predefinedImports)
     }
     return { allImportedDefinitionsMap, potentialTransitiveDefinitionsMap };
 }
+exports.processImports = processImports;
 /**
  * Splits the contents of a GraphQL file into lines that are imports
  * and other lines which define the actual GraphQL document.
@@ -350,6 +350,7 @@ function extractImportLines(fileContent) {
     }
     return { importLines, otherLines };
 }
+exports.extractImportLines = extractImportLines;
 /**
  * Parses an import line, returning a list of entities imported and the file
  * from which they are imported.
@@ -384,15 +385,16 @@ function parseImportLine(importLine) {
     # import [Type].[Field] from [File]
   `);
 }
+exports.parseImportLine = parseImportLine;
 function resolveFilePath(filePath, importFrom) {
-    const dirName = path.dirname(filePath);
+    const dirName = (0, path_1.dirname)(filePath);
     try {
-        const fullPath = path.join(dirName, importFrom);
-        return fs.realpathSync(fullPath);
+        const fullPath = (0, path_1.join)(dirName, importFrom);
+        return (0, fs_1.realpathSync)(fullPath);
     }
     catch (e) {
         if (e.code === 'ENOENT') {
-            return resolveFrom(dirName, importFrom);
+            return (0, resolve_from_1.default)(dirName, importFrom);
         }
         throw e;
     }
@@ -406,13 +408,13 @@ function visitOperationDefinitionNode(node, dependencySet) {
 }
 function visitSelectionNode(node, dependencySet) {
     switch (node.kind) {
-        case graphql.Kind.FIELD:
+        case graphql_1.Kind.FIELD:
             visitFieldNode(node, dependencySet);
             break;
-        case graphql.Kind.FRAGMENT_SPREAD:
+        case graphql_1.Kind.FRAGMENT_SPREAD:
             visitFragmentSpreadNode(node, dependencySet);
             break;
-        case graphql.Kind.INLINE_FRAGMENT:
+        case graphql_1.Kind.INLINE_FRAGMENT:
             visitInlineFragmentNode(node, dependencySet);
             break;
     }
@@ -460,7 +462,7 @@ function visitObjectTypeDefinitionNode(node, dependencySet, dependenciesByDefini
     const typeName = node.name.value;
     dependencySet.add(typeName);
     (_a = node.directives) === null || _a === void 0 ? void 0 : _a.forEach(directiveNode => visitDirectiveNode(directiveNode, dependencySet));
-    (_b = node.fields) === null || _b === void 0 ? void 0 : _b.forEach(fieldDefinitionNode => visitFieldDefinitionNode(fieldDefinitionNode, dependencySet));
+    (_b = node.fields) === null || _b === void 0 ? void 0 : _b.forEach(fieldDefinitionNode => visitFieldDefinitionNode(fieldDefinitionNode, dependencySet, dependenciesByDefinitionName));
     addInterfaceDependencies(node, dependencySet, dependenciesByDefinitionName);
 }
 function visitDirectiveNode(node, dependencySet) {
@@ -471,28 +473,28 @@ function visitDirectiveNode(node, dependencySet) {
 }
 function visitFieldDefinitionNode(node, dependencySet, dependenciesByDefinitionName) {
     var _a, _b;
-    (_a = node.arguments) === null || _a === void 0 ? void 0 : _a.forEach(inputValueDefinitionNode => visitInputValueDefinitionNode(inputValueDefinitionNode, dependencySet));
+    (_a = node.arguments) === null || _a === void 0 ? void 0 : _a.forEach(inputValueDefinitionNode => visitInputValueDefinitionNode(inputValueDefinitionNode, dependencySet, dependenciesByDefinitionName));
     (_b = node.directives) === null || _b === void 0 ? void 0 : _b.forEach(directiveNode => visitDirectiveNode(directiveNode, dependencySet));
-    visitTypeNode(node.type, dependencySet);
+    visitTypeNode(node.type, dependencySet, dependenciesByDefinitionName);
 }
 function visitTypeNode(node, dependencySet, dependenciesByDefinitionName) {
     switch (node.kind) {
-        case graphql.Kind.LIST_TYPE:
-            visitListTypeNode(node, dependencySet);
+        case graphql_1.Kind.LIST_TYPE:
+            visitListTypeNode(node, dependencySet, dependenciesByDefinitionName);
             break;
-        case graphql.Kind.NON_NULL_TYPE:
-            visitNonNullTypeNode(node, dependencySet);
+        case graphql_1.Kind.NON_NULL_TYPE:
+            visitNonNullTypeNode(node, dependencySet, dependenciesByDefinitionName);
             break;
-        case graphql.Kind.NAMED_TYPE:
+        case graphql_1.Kind.NAMED_TYPE:
             visitNamedTypeNode(node, dependencySet);
             break;
     }
 }
 function visitListTypeNode(node, dependencySet, dependenciesByDefinitionName) {
-    visitTypeNode(node.type, dependencySet);
+    visitTypeNode(node.type, dependencySet, dependenciesByDefinitionName);
 }
 function visitNonNullTypeNode(node, dependencySet, dependenciesByDefinitionName) {
-    visitTypeNode(node.type, dependencySet);
+    visitTypeNode(node.type, dependencySet, dependenciesByDefinitionName);
 }
 function visitNamedTypeNode(node, dependencySet) {
     const namedTypeName = node.name.value;
@@ -503,14 +505,14 @@ function visitNamedTypeNode(node, dependencySet) {
 function visitInputValueDefinitionNode(node, dependencySet, dependenciesByDefinitionName) {
     var _a;
     (_a = node.directives) === null || _a === void 0 ? void 0 : _a.forEach(directiveNode => visitDirectiveNode(directiveNode, dependencySet));
-    visitTypeNode(node.type, dependencySet);
+    visitTypeNode(node.type, dependencySet, dependenciesByDefinitionName);
 }
 function visitInterfaceTypeDefinitionNode(node, dependencySet, dependenciesByDefinitionName) {
     var _a, _b;
     const typeName = node.name.value;
     dependencySet.add(typeName);
     (_a = node.directives) === null || _a === void 0 ? void 0 : _a.forEach(directiveNode => visitDirectiveNode(directiveNode, dependencySet));
-    (_b = node.fields) === null || _b === void 0 ? void 0 : _b.forEach(fieldDefinitionNode => visitFieldDefinitionNode(fieldDefinitionNode, dependencySet));
+    (_b = node.fields) === null || _b === void 0 ? void 0 : _b.forEach(fieldDefinitionNode => visitFieldDefinitionNode(fieldDefinitionNode, dependencySet, dependenciesByDefinitionName));
     addInterfaceDependencies(node, dependencySet, dependenciesByDefinitionName);
 }
 function visitUnionTypeDefinitionNode(node, dependencySet) {
@@ -528,19 +530,19 @@ function visitInputObjectTypeDefinitionNode(node, dependencySet, dependenciesByD
     var _a, _b;
     dependencySet.add(node.name.value);
     (_a = node.directives) === null || _a === void 0 ? void 0 : _a.forEach(directiveNode => visitDirectiveNode(directiveNode, dependencySet));
-    (_b = node.fields) === null || _b === void 0 ? void 0 : _b.forEach(inputValueDefinitionNode => visitInputValueDefinitionNode(inputValueDefinitionNode, dependencySet));
+    (_b = node.fields) === null || _b === void 0 ? void 0 : _b.forEach(inputValueDefinitionNode => visitInputValueDefinitionNode(inputValueDefinitionNode, dependencySet, dependenciesByDefinitionName));
 }
 function visitDirectiveDefinitionNode(node, dependencySet, dependenciesByDefinitionName) {
     var _a;
     dependencySet.add(node.name.value);
-    (_a = node.arguments) === null || _a === void 0 ? void 0 : _a.forEach(inputValueDefinitionNode => visitInputValueDefinitionNode(inputValueDefinitionNode, dependencySet));
+    (_a = node.arguments) === null || _a === void 0 ? void 0 : _a.forEach(inputValueDefinitionNode => visitInputValueDefinitionNode(inputValueDefinitionNode, dependencySet, dependenciesByDefinitionName));
 }
 function visitObjectTypeExtensionNode(node, dependencySet, dependenciesByDefinitionName) {
     var _a, _b;
     const typeName = node.name.value;
     dependencySet.add(typeName);
     (_a = node.directives) === null || _a === void 0 ? void 0 : _a.forEach(directiveNode => visitDirectiveNode(directiveNode, dependencySet));
-    (_b = node.fields) === null || _b === void 0 ? void 0 : _b.forEach(fieldDefinitionNode => visitFieldDefinitionNode(fieldDefinitionNode, dependencySet));
+    (_b = node.fields) === null || _b === void 0 ? void 0 : _b.forEach(fieldDefinitionNode => visitFieldDefinitionNode(fieldDefinitionNode, dependencySet, dependenciesByDefinitionName));
     addInterfaceDependencies(node, dependencySet, dependenciesByDefinitionName);
 }
 function visitInterfaceTypeExtensionNode(node, dependencySet, dependenciesByDefinitionName) {
@@ -548,7 +550,7 @@ function visitInterfaceTypeExtensionNode(node, dependencySet, dependenciesByDefi
     const typeName = node.name.value;
     dependencySet.add(typeName);
     (_a = node.directives) === null || _a === void 0 ? void 0 : _a.forEach(directiveNode => visitDirectiveNode(directiveNode, dependencySet));
-    (_b = node.fields) === null || _b === void 0 ? void 0 : _b.forEach(fieldDefinitionNode => visitFieldDefinitionNode(fieldDefinitionNode, dependencySet));
+    (_b = node.fields) === null || _b === void 0 ? void 0 : _b.forEach(fieldDefinitionNode => visitFieldDefinitionNode(fieldDefinitionNode, dependencySet, dependenciesByDefinitionName));
     addInterfaceDependencies(node, dependencySet, dependenciesByDefinitionName);
 }
 function visitUnionTypeExtensionNode(node, dependencySet) {
@@ -566,7 +568,7 @@ function visitInputObjectTypeExtensionNode(node, dependencySet, dependenciesByDe
     var _a, _b;
     dependencySet.add(node.name.value);
     (_a = node.directives) === null || _a === void 0 ? void 0 : _a.forEach(directiveNode => visitDirectiveNode(directiveNode, dependencySet));
-    (_b = node.fields) === null || _b === void 0 ? void 0 : _b.forEach(inputValueDefinitionNode => visitInputValueDefinitionNode(inputValueDefinitionNode, dependencySet));
+    (_b = node.fields) === null || _b === void 0 ? void 0 : _b.forEach(inputValueDefinitionNode => visitInputValueDefinitionNode(inputValueDefinitionNode, dependencySet, dependenciesByDefinitionName));
 }
 function visitSchemaDefinitionNode(node, dependencySet) {
     var _a;
@@ -587,9 +589,3 @@ function visitScalarExtensionNode(node, dependencySet) {
 function visitOperationTypeDefinitionNode(node, dependencySet) {
     visitNamedTypeNode(node.type, dependencySet);
 }
-
-exports.extractDependencies = extractDependencies;
-exports.extractImportLines = extractImportLines;
-exports.parseImportLine = parseImportLine;
-exports.processImport = processImport;
-exports.processImports = processImports;

package/cjs/package.json

@@ -0,0 +1 @@
+{"type":"commonjs"}

package/{index.mjs → esm/index.js}

@@ -1,10 +1,9 @@
-import { print, parse, Source, Kind } from 'graphql';
+import { Source, parse, Kind, print, } from 'graphql';
 import { readFileSync, realpathSync } from 'fs';
-import { join, isAbsolute, dirname } from 'path';
+import { dirname, join, isAbsolute } from 'path';
 import resolveFrom from 'resolve-from';
-import { cwd } from 'process';
+import { cwd as cwdFactory } from 'process';
 import { parseGraphQLSDL } from '@graphql-tools/utils';
-
 const builtinTypes = ['String', 'Float', 'Int', 'Boolean', 'ID', 'Upload'];
 const builtinDirectives = [
     'deprecated',
@@ -26,8 +25,8 @@ const IMPORT_DEFAULT_REGEX = /^import\s+('|")(.*)('|");?$/;
  * and copies them into the final document.
  * processImport does not merge the typeDefs as designed ( https://github.com/ardatan/graphql-tools/issues/2980#issuecomment-1003692728 )
  */
-function processImport(filePath, cwd$1 = cwd(), predefinedImports = {}, visitedFiles = new Map()) {
-    const set = visitFile(filePath, join(cwd$1 + '/root.graphql'), visitedFiles, predefinedImports);
+export function processImport(filePath, cwd = cwdFactory(), predefinedImports = {}, visitedFiles = new Map()) {
+    const set = visitFile(filePath, join(cwd + '/root.graphql'), visitedFiles, predefinedImports);
     const definitionStrSet = new Set();
     let definitionsStr = '';
     for (const defs of set.values()) {
@@ -90,10 +89,10 @@ function visitFile(filePath, cwd, visitedFiles, predefinedImports) {
                         const newDependencySet = new Set();
                         switch (field.kind) {
                             case Kind.FIELD_DEFINITION:
-                                visitFieldDefinitionNode(field, newDependencySet);
+                                visitFieldDefinitionNode(field, newDependencySet, dependenciesByDefinitionName);
                                 break;
                             case Kind.INPUT_VALUE_DEFINITION:
-                                visitInputValueDefinitionNode(field, newDependencySet);
+                                visitInputValueDefinitionNode(field, newDependencySet, dependenciesByDefinitionName);
                                 break;
                         }
                         newDependencySet.forEach(dependencyName => {
@@ -146,7 +145,7 @@ function visitFile(filePath, cwd, visitedFiles, predefinedImports) {
     }
     return visitedFiles.get(filePath);
 }
-function extractDependencies(filePath, fileContents) {
+export function extractDependencies(filePath, fileContents) {
     const definitionsByName = new Map();
     const dependenciesByDefinitionName = new Map();
     const { document } = parseGraphQLSDL(filePath, fileContents, {
@@ -195,10 +194,10 @@ function visitDefinition(definition, definitionsByName, dependenciesByDefinition
                 visitEnumTypeDefinitionNode(definition, dependencySet);
                 break;
             case Kind.INPUT_OBJECT_TYPE_DEFINITION:
-                visitInputObjectTypeDefinitionNode(definition, dependencySet);
+                visitInputObjectTypeDefinitionNode(definition, dependencySet, dependenciesByDefinitionName);
                 break;
             case Kind.DIRECTIVE_DEFINITION:
-                visitDirectiveDefinitionNode(definition, dependencySet);
+                visitDirectiveDefinitionNode(definition, dependencySet, dependenciesByDefinitionName);
                 break;
             case Kind.SCALAR_TYPE_DEFINITION:
                 visitScalarDefinitionNode(definition, dependencySet);
@@ -219,7 +218,7 @@ function visitDefinition(definition, definitionsByName, dependenciesByDefinition
                 visitEnumTypeExtensionNode(definition, dependencySet);
                 break;
             case Kind.INPUT_OBJECT_TYPE_EXTENSION:
-                visitInputObjectTypeExtensionNode(definition, dependencySet);
+                visitInputObjectTypeExtensionNode(definition, dependencySet, dependenciesByDefinitionName);
                 break;
             case Kind.SCALAR_TYPE_EXTENSION:
                 visitScalarExtensionNode(definition, dependencySet);
@@ -242,10 +241,10 @@ function visitDefinition(definition, definitionsByName, dependenciesByDefinition
                 }
                 switch (field.kind) {
                     case Kind.FIELD_DEFINITION:
-                        visitFieldDefinitionNode(field, dependencySet);
+                        visitFieldDefinitionNode(field, dependencySet, dependenciesByDefinitionName);
                         break;
                     case Kind.INPUT_VALUE_DEFINITION:
-                        visitInputValueDefinitionNode(field, dependencySet);
+                        visitInputValueDefinitionNode(field, dependencySet, dependenciesByDefinitionName);
                         break;
                 }
             }
@@ -277,7 +276,7 @@ function getFileDefinitionMap(definitionsByName, dependenciesByDefinitionName) {
     }
     return fileDefinitionMap;
 }
-function processImports(importLines, filePath, visitedFiles, predefinedImports) {
+export function processImports(importLines, filePath, visitedFiles, predefinedImports) {
     const potentialTransitiveDefinitionsMap = new Map();
     const allImportedDefinitionsMap = new Map();
     for (const line of importLines) {
@@ -330,7 +329,7 @@ function processImports(importLines, filePath, visitedFiles, predefinedImports)
  * Splits the contents of a GraphQL file into lines that are imports
  * and other lines which define the actual GraphQL document.
  */
-function extractImportLines(fileContent) {
+export function extractImportLines(fileContent) {
     const importLines = [];
     let otherLines = '';
     for (const line of fileContent.split('\n')) {
@@ -350,7 +349,7 @@ function extractImportLines(fileContent) {
  *
  * Throws if the import line does not have a correct format.
  */
-function parseImportLine(importLine) {
+export function parseImportLine(importLine) {
     let regexMatch = importLine.match(IMPORT_FROM_REGEX);
     if (regexMatch != null) {
         // Apply regex to import line
@@ -454,7 +453,7 @@ function visitObjectTypeDefinitionNode(node, dependencySet, dependenciesByDefini
     const typeName = node.name.value;
     dependencySet.add(typeName);
     (_a = node.directives) === null || _a === void 0 ? void 0 : _a.forEach(directiveNode => visitDirectiveNode(directiveNode, dependencySet));
-    (_b = node.fields) === null || _b === void 0 ? void 0 : _b.forEach(fieldDefinitionNode => visitFieldDefinitionNode(fieldDefinitionNode, dependencySet));
+    (_b = node.fields) === null || _b === void 0 ? void 0 : _b.forEach(fieldDefinitionNode => visitFieldDefinitionNode(fieldDefinitionNode, dependencySet, dependenciesByDefinitionName));
     addInterfaceDependencies(node, dependencySet, dependenciesByDefinitionName);
 }
 function visitDirectiveNode(node, dependencySet) {
@@ -465,17 +464,17 @@ function visitDirectiveNode(node, dependencySet) {
 }
 function visitFieldDefinitionNode(node, dependencySet, dependenciesByDefinitionName) {
     var _a, _b;
-    (_a = node.arguments) === null || _a === void 0 ? void 0 : _a.forEach(inputValueDefinitionNode => visitInputValueDefinitionNode(inputValueDefinitionNode, dependencySet));
+    (_a = node.arguments) === null || _a === void 0 ? void 0 : _a.forEach(inputValueDefinitionNode => visitInputValueDefinitionNode(inputValueDefinitionNode, dependencySet, dependenciesByDefinitionName));
     (_b = node.directives) === null || _b === void 0 ? void 0 : _b.forEach(directiveNode => visitDirectiveNode(directiveNode, dependencySet));
-    visitTypeNode(node.type, dependencySet);
+    visitTypeNode(node.type, dependencySet, dependenciesByDefinitionName);
 }
 function visitTypeNode(node, dependencySet, dependenciesByDefinitionName) {
     switch (node.kind) {
         case Kind.LIST_TYPE:
-            visitListTypeNode(node, dependencySet);
+            visitListTypeNode(node, dependencySet, dependenciesByDefinitionName);
             break;
         case Kind.NON_NULL_TYPE:
-            visitNonNullTypeNode(node, dependencySet);
+            visitNonNullTypeNode(node, dependencySet, dependenciesByDefinitionName);
             break;
         case Kind.NAMED_TYPE:
             visitNamedTypeNode(node, dependencySet);
@@ -483,10 +482,10 @@ function visitTypeNode(node, dependencySet, dependenciesByDefinitionName) {
     }
 }
 function visitListTypeNode(node, dependencySet, dependenciesByDefinitionName) {
-    visitTypeNode(node.type, dependencySet);
+    visitTypeNode(node.type, dependencySet, dependenciesByDefinitionName);
 }
 function visitNonNullTypeNode(node, dependencySet, dependenciesByDefinitionName) {
-    visitTypeNode(node.type, dependencySet);
+    visitTypeNode(node.type, dependencySet, dependenciesByDefinitionName);
 }
 function visitNamedTypeNode(node, dependencySet) {
     const namedTypeName = node.name.value;
@@ -497,14 +496,14 @@ function visitNamedTypeNode(node, dependencySet) {
 function visitInputValueDefinitionNode(node, dependencySet, dependenciesByDefinitionName) {
     var _a;
     (_a = node.directives) === null || _a === void 0 ? void 0 : _a.forEach(directiveNode => visitDirectiveNode(directiveNode, dependencySet));
-    visitTypeNode(node.type, dependencySet);
+    visitTypeNode(node.type, dependencySet, dependenciesByDefinitionName);
 }
 function visitInterfaceTypeDefinitionNode(node, dependencySet, dependenciesByDefinitionName) {
     var _a, _b;
     const typeName = node.name.value;
     dependencySet.add(typeName);
     (_a = node.directives) === null || _a === void 0 ? void 0 : _a.forEach(directiveNode => visitDirectiveNode(directiveNode, dependencySet));
-    (_b = node.fields) === null || _b === void 0 ? void 0 : _b.forEach(fieldDefinitionNode => visitFieldDefinitionNode(fieldDefinitionNode, dependencySet));
+    (_b = node.fields) === null || _b === void 0 ? void 0 : _b.forEach(fieldDefinitionNode => visitFieldDefinitionNode(fieldDefinitionNode, dependencySet, dependenciesByDefinitionName));
     addInterfaceDependencies(node, dependencySet, dependenciesByDefinitionName);
 }
 function visitUnionTypeDefinitionNode(node, dependencySet) {
@@ -522,19 +521,19 @@ function visitInputObjectTypeDefinitionNode(node, dependencySet, dependenciesByD
     var _a, _b;
     dependencySet.add(node.name.value);
     (_a = node.directives) === null || _a === void 0 ? void 0 : _a.forEach(directiveNode => visitDirectiveNode(directiveNode, dependencySet));
-    (_b = node.fields) === null || _b === void 0 ? void 0 : _b.forEach(inputValueDefinitionNode => visitInputValueDefinitionNode(inputValueDefinitionNode, dependencySet));
+    (_b = node.fields) === null || _b === void 0 ? void 0 : _b.forEach(inputValueDefinitionNode => visitInputValueDefinitionNode(inputValueDefinitionNode, dependencySet, dependenciesByDefinitionName));
 }
 function visitDirectiveDefinitionNode(node, dependencySet, dependenciesByDefinitionName) {
     var _a;
     dependencySet.add(node.name.value);
-    (_a = node.arguments) === null || _a === void 0 ? void 0 : _a.forEach(inputValueDefinitionNode => visitInputValueDefinitionNode(inputValueDefinitionNode, dependencySet));
+    (_a = node.arguments) === null || _a === void 0 ? void 0 : _a.forEach(inputValueDefinitionNode => visitInputValueDefinitionNode(inputValueDefinitionNode, dependencySet, dependenciesByDefinitionName));
 }
 function visitObjectTypeExtensionNode(node, dependencySet, dependenciesByDefinitionName) {
     var _a, _b;
     const typeName = node.name.value;
     dependencySet.add(typeName);
     (_a = node.directives) === null || _a === void 0 ? void 0 : _a.forEach(directiveNode => visitDirectiveNode(directiveNode, dependencySet));
-    (_b = node.fields) === null || _b === void 0 ? void 0 : _b.forEach(fieldDefinitionNode => visitFieldDefinitionNode(fieldDefinitionNode, dependencySet));
+    (_b = node.fields) === null || _b === void 0 ? void 0 : _b.forEach(fieldDefinitionNode => visitFieldDefinitionNode(fieldDefinitionNode, dependencySet, dependenciesByDefinitionName));
     addInterfaceDependencies(node, dependencySet, dependenciesByDefinitionName);
 }
 function visitInterfaceTypeExtensionNode(node, dependencySet, dependenciesByDefinitionName) {
@@ -542,7 +541,7 @@ function visitInterfaceTypeExtensionNode(node, dependencySet, dependenciesByDefi
     const typeName = node.name.value;
     dependencySet.add(typeName);
     (_a = node.directives) === null || _a === void 0 ? void 0 : _a.forEach(directiveNode => visitDirectiveNode(directiveNode, dependencySet));
-    (_b = node.fields) === null || _b === void 0 ? void 0 : _b.forEach(fieldDefinitionNode => visitFieldDefinitionNode(fieldDefinitionNode, dependencySet));
+    (_b = node.fields) === null || _b === void 0 ? void 0 : _b.forEach(fieldDefinitionNode => visitFieldDefinitionNode(fieldDefinitionNode, dependencySet, dependenciesByDefinitionName));
     addInterfaceDependencies(node, dependencySet, dependenciesByDefinitionName);
 }
 function visitUnionTypeExtensionNode(node, dependencySet) {
@@ -560,7 +559,7 @@ function visitInputObjectTypeExtensionNode(node, dependencySet, dependenciesByDe
     var _a, _b;
     dependencySet.add(node.name.value);
     (_a = node.directives) === null || _a === void 0 ? void 0 : _a.forEach(directiveNode => visitDirectiveNode(directiveNode, dependencySet));
-    (_b = node.fields) === null || _b === void 0 ? void 0 : _b.forEach(inputValueDefinitionNode => visitInputValueDefinitionNode(inputValueDefinitionNode, dependencySet));
+    (_b = node.fields) === null || _b === void 0 ? void 0 : _b.forEach(inputValueDefinitionNode => visitInputValueDefinitionNode(inputValueDefinitionNode, dependencySet, dependenciesByDefinitionName));
 }
 function visitSchemaDefinitionNode(node, dependencySet) {
     var _a;
@@ -581,5 +580,3 @@ function visitScalarExtensionNode(node, dependencySet) {
 function visitOperationTypeDefinitionNode(node, dependencySet) {
     visitNamedTypeNode(node.type, dependencySet);
 }
-
-export { extractDependencies, extractImportLines, parseImportLine, processImport, processImports };

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@graphql-tools/import",
-  "version": "6.6.18",
+  "version": "6.7.0-alpha-b76ec274.0",
   "description": "A set of utils for faster development of GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "dependencies": {
-    "@graphql-tools/utils": "8.7.0",
+    "@graphql-tools/utils": "8.8.0-alpha-b76ec274.0",
     "resolve-from": "5.0.0",
     "tslib": "^2.4.0"
   },
@@ -18,21 +18,42 @@
   },
   "author": "Dotan Simha <dotansimha@gmail.com>",
   "license": "MIT",
-  "main": "index.js",
-  "module": "index.mjs",
-  "typings": "index.d.ts",
+  "main": "cjs/index.js",
+  "module": "esm/index.js",
+  "typings": "typings/index.d.ts",
   "typescript": {
-    "definition": "index.d.ts"
+    "definition": "typings/index.d.ts"
   },
+  "type": "module",
   "exports": {
     ".": {
-      "require": "./index.js",
-      "import": "./index.mjs"
+      "require": {
+        "types": "./typings/index.d.ts",
+        "default": "./cjs/index.js"
+      },
+      "import": {
+        "types": "./typings/index.d.ts",
+        "default": "./esm/index.js"
+      },
+      "default": {
+        "types": "./typings/index.d.ts",
+        "default": "./esm/index.js"
+      }
     },
     "./*": {
-      "require": "./*.js",
-      "import": "./*.mjs"
+      "require": {
+        "types": "./typings/*.d.ts",
+        "default": "./cjs/*.js"
+      },
+      "import": {
+        "types": "./typings/*.d.ts",
+        "default": "./esm/*.js"
+      },
+      "default": {
+        "types": "./typings/*.d.ts",
+        "default": "./esm/*.js"
+      }
     },
     "./package.json": "./package.json"
   }
-}
+}

package/README.md

@@ -1,5 +0,0 @@
-Check API Reference for more information about this package;
-https://www.graphql-tools.com/docs/api/modules/import_src
-
-You can also learn more about GraphQL Import in this chapter;
-https://www.graphql-tools.com/docs/schema-loading#using-import-expression