@graphql-tools/import 6.5.8 → 6.6.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/index.js +16 -2
- package/index.mjs +16 -2
- package/package.json +2 -2
package/index.js
CHANGED
|
@@ -11,7 +11,6 @@ const resolveFrom = _interopDefault(require('resolve-from'));
|
|
|
11
11
|
const process = require('process');
|
|
12
12
|
const utils = require('@graphql-tools/utils');
|
|
13
13
|
|
|
14
|
-
/* eslint-disable no-unused-expressions */
|
|
15
14
|
const builtinTypes = ['String', 'Float', 'Int', 'Boolean', 'ID', 'Upload'];
|
|
16
15
|
const builtinDirectives = [
|
|
17
16
|
'deprecated',
|
|
@@ -68,6 +67,16 @@ function visitFile(filePath, cwd, visitedFiles, predefinedImports) {
|
|
|
68
67
|
const fileDefinitionMap = visitedFiles.get(filePath);
|
|
69
68
|
if (fileDefinitionMap && !definitionSet.has(definition)) {
|
|
70
69
|
definitionSet.add(definition);
|
|
70
|
+
// Call addDefinition recursively to add all dependent documents
|
|
71
|
+
if ('name' in definition && definition.name) {
|
|
72
|
+
const documentName = definition.name.value;
|
|
73
|
+
const dependencyDefinitionForDocument = allImportedDefinitionsMap.get(documentName);
|
|
74
|
+
dependencyDefinitionForDocument === null || dependencyDefinitionForDocument === void 0 ? void 0 : dependencyDefinitionForDocument.forEach(node => {
|
|
75
|
+
if (node !== definition) {
|
|
76
|
+
addDefinition(node, definitionName, definitionSet);
|
|
77
|
+
}
|
|
78
|
+
});
|
|
79
|
+
}
|
|
71
80
|
// Regenerate field exports if some fields are imported after visitor
|
|
72
81
|
if ('fields' in definition && definition.fields) {
|
|
73
82
|
for (const field of definition.fields) {
|
|
@@ -126,7 +135,12 @@ function visitFile(filePath, cwd, visitedFiles, predefinedImports) {
|
|
|
126
135
|
}
|
|
127
136
|
const dependencyDefinitionsFromImports = allImportedDefinitionsMap.get(dependencyName);
|
|
128
137
|
dependencyDefinitionsFromImports === null || dependencyDefinitionsFromImports === void 0 ? void 0 : dependencyDefinitionsFromImports.forEach(dependencyDefinition => {
|
|
129
|
-
addDefinition
|
|
138
|
+
// addDefinition will add recursively all dependent documents for dependencyName document
|
|
139
|
+
if ('name' in dependencyDefinition &&
|
|
140
|
+
dependencyDefinition.name &&
|
|
141
|
+
dependencyDefinition.name.value === dependencyName) {
|
|
142
|
+
addDefinition(dependencyDefinition, definitionName, definitionsWithDependencies);
|
|
143
|
+
}
|
|
130
144
|
});
|
|
131
145
|
}
|
|
132
146
|
}
|
package/index.mjs
CHANGED
|
@@ -5,7 +5,6 @@ import resolveFrom from 'resolve-from';
|
|
|
5
5
|
import { cwd } from 'process';
|
|
6
6
|
import { parseGraphQLSDL } from '@graphql-tools/utils';
|
|
7
7
|
|
|
8
|
-
/* eslint-disable no-unused-expressions */
|
|
9
8
|
const builtinTypes = ['String', 'Float', 'Int', 'Boolean', 'ID', 'Upload'];
|
|
10
9
|
const builtinDirectives = [
|
|
11
10
|
'deprecated',
|
|
@@ -62,6 +61,16 @@ function visitFile(filePath, cwd, visitedFiles, predefinedImports) {
|
|
|
62
61
|
const fileDefinitionMap = visitedFiles.get(filePath);
|
|
63
62
|
if (fileDefinitionMap && !definitionSet.has(definition)) {
|
|
64
63
|
definitionSet.add(definition);
|
|
64
|
+
// Call addDefinition recursively to add all dependent documents
|
|
65
|
+
if ('name' in definition && definition.name) {
|
|
66
|
+
const documentName = definition.name.value;
|
|
67
|
+
const dependencyDefinitionForDocument = allImportedDefinitionsMap.get(documentName);
|
|
68
|
+
dependencyDefinitionForDocument === null || dependencyDefinitionForDocument === void 0 ? void 0 : dependencyDefinitionForDocument.forEach(node => {
|
|
69
|
+
if (node !== definition) {
|
|
70
|
+
addDefinition(node, definitionName, definitionSet);
|
|
71
|
+
}
|
|
72
|
+
});
|
|
73
|
+
}
|
|
65
74
|
// Regenerate field exports if some fields are imported after visitor
|
|
66
75
|
if ('fields' in definition && definition.fields) {
|
|
67
76
|
for (const field of definition.fields) {
|
|
@@ -120,7 +129,12 @@ function visitFile(filePath, cwd, visitedFiles, predefinedImports) {
|
|
|
120
129
|
}
|
|
121
130
|
const dependencyDefinitionsFromImports = allImportedDefinitionsMap.get(dependencyName);
|
|
122
131
|
dependencyDefinitionsFromImports === null || dependencyDefinitionsFromImports === void 0 ? void 0 : dependencyDefinitionsFromImports.forEach(dependencyDefinition => {
|
|
123
|
-
addDefinition
|
|
132
|
+
// addDefinition will add recursively all dependent documents for dependencyName document
|
|
133
|
+
if ('name' in dependencyDefinition &&
|
|
134
|
+
dependencyDefinition.name &&
|
|
135
|
+
dependencyDefinition.name.value === dependencyName) {
|
|
136
|
+
addDefinition(dependencyDefinition, definitionName, definitionsWithDependencies);
|
|
137
|
+
}
|
|
124
138
|
});
|
|
125
139
|
}
|
|
126
140
|
}
|
package/package.json
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@graphql-tools/import",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.6.3",
|
|
4
4
|
"description": "A set of utils for faster development of GraphQL tools",
|
|
5
5
|
"sideEffects": false,
|
|
6
6
|
"peerDependencies": {
|
|
7
7
|
"graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
|
|
8
8
|
},
|
|
9
9
|
"dependencies": {
|
|
10
|
-
"@graphql-tools/utils": "8.5.
|
|
10
|
+
"@graphql-tools/utils": "8.5.5",
|
|
11
11
|
"resolve-from": "5.0.0",
|
|
12
12
|
"tslib": "~2.3.0"
|
|
13
13
|
},
|