@graphql-tools/merge 9.0.12 → 9.0.13
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/cjs/extensions.js +3 -3
- package/cjs/merge-resolvers.js +1 -2
- package/cjs/typedefs-mergers/arguments.js +1 -2
- package/cjs/typedefs-mergers/directives.js +2 -3
- package/cjs/typedefs-mergers/enum-values.js +1 -2
- package/cjs/typedefs-mergers/enum.js +1 -2
- package/cjs/typedefs-mergers/fields.js +1 -2
- package/cjs/typedefs-mergers/input-type.js +1 -2
- package/cjs/typedefs-mergers/interface.js +1 -2
- package/cjs/typedefs-mergers/merge-named-type-array.js +1 -2
- package/cjs/typedefs-mergers/merge-nodes.js +3 -3
- package/cjs/typedefs-mergers/merge-typedefs.js +2 -3
- package/cjs/typedefs-mergers/scalar.js +1 -2
- package/cjs/typedefs-mergers/schema-def.js +2 -2
- package/cjs/typedefs-mergers/type.js +1 -2
- package/cjs/typedefs-mergers/union.js +1 -2
- package/cjs/typedefs-mergers/utils.js +9 -9
- package/package.json +2 -2
package/cjs/extensions.js
CHANGED
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.extractExtensionsFromSchema = void 0;
|
|
4
|
+
exports.mergeExtensions = mergeExtensions;
|
|
5
|
+
exports.applyExtensions = applyExtensions;
|
|
4
6
|
const utils_1 = require("@graphql-tools/utils");
|
|
5
7
|
var utils_2 = require("@graphql-tools/utils");
|
|
6
8
|
Object.defineProperty(exports, "extractExtensionsFromSchema", { enumerable: true, get: function () { return utils_2.extractExtensionsFromSchema; } });
|
|
7
9
|
function mergeExtensions(extensions) {
|
|
8
10
|
return (0, utils_1.mergeDeep)(extensions, false, true);
|
|
9
11
|
}
|
|
10
|
-
exports.mergeExtensions = mergeExtensions;
|
|
11
12
|
function applyExtensionObject(obj, extensions) {
|
|
12
13
|
if (!obj || !extensions || extensions === obj.extensions) {
|
|
13
14
|
return;
|
|
@@ -51,4 +52,3 @@ function applyExtensions(schema, extensions) {
|
|
|
51
52
|
}
|
|
52
53
|
return schema;
|
|
53
54
|
}
|
|
54
|
-
exports.applyExtensions = applyExtensions;
|
package/cjs/merge-resolvers.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.mergeResolvers =
|
|
3
|
+
exports.mergeResolvers = mergeResolvers;
|
|
4
4
|
const utils_1 = require("@graphql-tools/utils");
|
|
5
5
|
/**
|
|
6
6
|
* Deep merges multiple resolver definition objects into a single definition.
|
|
@@ -65,4 +65,3 @@ function mergeResolvers(resolversDefinitions, options) {
|
|
|
65
65
|
}
|
|
66
66
|
return result;
|
|
67
67
|
}
|
|
68
|
-
exports.mergeResolvers = mergeResolvers;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.mergeArguments =
|
|
3
|
+
exports.mergeArguments = mergeArguments;
|
|
4
4
|
const utils_1 = require("@graphql-tools/utils");
|
|
5
5
|
function mergeArguments(args1, args2, config) {
|
|
6
6
|
const result = deduplicateArguments([...args2, ...args1].filter(utils_1.isSome), config);
|
|
@@ -9,7 +9,6 @@ function mergeArguments(args1, args2, config) {
|
|
|
9
9
|
}
|
|
10
10
|
return result;
|
|
11
11
|
}
|
|
12
|
-
exports.mergeArguments = mergeArguments;
|
|
13
12
|
function deduplicateArguments(args, config) {
|
|
14
13
|
return args.reduce((acc, current) => {
|
|
15
14
|
const dupIndex = acc.findIndex(arg => arg.name.value === current.name.value);
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.mergeDirectives = mergeDirectives;
|
|
4
|
+
exports.mergeDirective = mergeDirective;
|
|
4
5
|
const utils_1 = require("@graphql-tools/utils");
|
|
5
6
|
function directiveAlreadyExists(directivesArr, otherDirective) {
|
|
6
7
|
return !!directivesArr.find(directive => directive.name.value === otherDirective.name.value);
|
|
@@ -67,7 +68,6 @@ function mergeDirectives(d1 = [], d2 = [], config, directives) {
|
|
|
67
68
|
}
|
|
68
69
|
return result;
|
|
69
70
|
}
|
|
70
|
-
exports.mergeDirectives = mergeDirectives;
|
|
71
71
|
function mergeDirective(node, existingNode) {
|
|
72
72
|
if (existingNode) {
|
|
73
73
|
return {
|
|
@@ -81,7 +81,6 @@ function mergeDirective(node, existingNode) {
|
|
|
81
81
|
}
|
|
82
82
|
return node;
|
|
83
83
|
}
|
|
84
|
-
exports.mergeDirective = mergeDirective;
|
|
85
84
|
function deduplicateLists(source, target, filterFn) {
|
|
86
85
|
return source.concat(target.filter(val => filterFn(val, source)));
|
|
87
86
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.mergeEnumValues =
|
|
3
|
+
exports.mergeEnumValues = mergeEnumValues;
|
|
4
4
|
const utils_1 = require("@graphql-tools/utils");
|
|
5
5
|
const directives_js_1 = require("./directives.js");
|
|
6
6
|
function mergeEnumValues(first, second, config, directives) {
|
|
@@ -37,4 +37,3 @@ function mergeEnumValues(first, second, config, directives) {
|
|
|
37
37
|
}
|
|
38
38
|
return result;
|
|
39
39
|
}
|
|
40
|
-
exports.mergeEnumValues = mergeEnumValues;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.mergeEnum =
|
|
3
|
+
exports.mergeEnum = mergeEnum;
|
|
4
4
|
const graphql_1 = require("graphql");
|
|
5
5
|
const directives_js_1 = require("./directives.js");
|
|
6
6
|
const enum_values_js_1 = require("./enum-values.js");
|
|
@@ -26,4 +26,3 @@ function mergeEnum(e1, e2, config, directives) {
|
|
|
26
26
|
}
|
|
27
27
|
: e1;
|
|
28
28
|
}
|
|
29
|
-
exports.mergeEnum = mergeEnum;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.mergeFields =
|
|
3
|
+
exports.mergeFields = mergeFields;
|
|
4
4
|
const utils_1 = require("@graphql-tools/utils");
|
|
5
5
|
const arguments_js_1 = require("./arguments.js");
|
|
6
6
|
const directives_js_1 = require("./directives.js");
|
|
@@ -40,7 +40,6 @@ function mergeFields(type, f1, f2, config, directives) {
|
|
|
40
40
|
}
|
|
41
41
|
return result;
|
|
42
42
|
}
|
|
43
|
-
exports.mergeFields = mergeFields;
|
|
44
43
|
function preventConflicts(type, a, b, ignoreNullability = false) {
|
|
45
44
|
const aType = (0, utils_js_1.printTypeNode)(a.type);
|
|
46
45
|
const bType = (0, utils_js_1.printTypeNode)(b.type);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.mergeInputType =
|
|
3
|
+
exports.mergeInputType = mergeInputType;
|
|
4
4
|
const graphql_1 = require("graphql");
|
|
5
5
|
const directives_js_1 = require("./directives.js");
|
|
6
6
|
const fields_js_1 = require("./fields.js");
|
|
@@ -31,4 +31,3 @@ function mergeInputType(node, existingNode, config, directives) {
|
|
|
31
31
|
}
|
|
32
32
|
: node;
|
|
33
33
|
}
|
|
34
|
-
exports.mergeInputType = mergeInputType;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.mergeInterface =
|
|
3
|
+
exports.mergeInterface = mergeInterface;
|
|
4
4
|
const graphql_1 = require("graphql");
|
|
5
5
|
const directives_js_1 = require("./directives.js");
|
|
6
6
|
const fields_js_1 = require("./fields.js");
|
|
@@ -35,4 +35,3 @@ function mergeInterface(node, existingNode, config, directives) {
|
|
|
35
35
|
}
|
|
36
36
|
: node;
|
|
37
37
|
}
|
|
38
|
-
exports.mergeInterface = mergeInterface;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.mergeNamedTypeArray =
|
|
3
|
+
exports.mergeNamedTypeArray = mergeNamedTypeArray;
|
|
4
4
|
const utils_1 = require("@graphql-tools/utils");
|
|
5
5
|
function alreadyExists(arr, other) {
|
|
6
6
|
return !!arr.find(i => i.name.value === other.name.value);
|
|
@@ -12,4 +12,3 @@ function mergeNamedTypeArray(first = [], second = [], config = {}) {
|
|
|
12
12
|
}
|
|
13
13
|
return result;
|
|
14
14
|
}
|
|
15
|
-
exports.mergeNamedTypeArray = mergeNamedTypeArray;
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.schemaDefSymbol = void 0;
|
|
4
|
+
exports.isNamedDefinitionNode = isNamedDefinitionNode;
|
|
5
|
+
exports.mergeGraphQLNodes = mergeGraphQLNodes;
|
|
4
6
|
const graphql_1 = require("graphql");
|
|
5
7
|
const utils_1 = require("@graphql-tools/utils");
|
|
6
8
|
const directives_js_1 = require("./directives.js");
|
|
@@ -15,7 +17,6 @@ exports.schemaDefSymbol = 'SCHEMA_DEF_SYMBOL';
|
|
|
15
17
|
function isNamedDefinitionNode(definitionNode) {
|
|
16
18
|
return 'name' in definitionNode;
|
|
17
19
|
}
|
|
18
|
-
exports.isNamedDefinitionNode = isNamedDefinitionNode;
|
|
19
20
|
function mergeGraphQLNodes(nodes, config, directives = {}) {
|
|
20
21
|
const mergedResultMap = directives;
|
|
21
22
|
for (const nodeDefinition of nodes) {
|
|
@@ -77,7 +78,6 @@ function mergeGraphQLNodes(nodes, config, directives = {}) {
|
|
|
77
78
|
}
|
|
78
79
|
return mergedResultMap;
|
|
79
80
|
}
|
|
80
|
-
exports.mergeGraphQLNodes = mergeGraphQLNodes;
|
|
81
81
|
function isASTNode(node) {
|
|
82
82
|
return (node != null && typeof node === 'object' && 'kind' in node && typeof node.kind === 'string');
|
|
83
83
|
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.mergeTypeDefs = mergeTypeDefs;
|
|
4
|
+
exports.mergeGraphQLTypes = mergeGraphQLTypes;
|
|
4
5
|
const graphql_1 = require("graphql");
|
|
5
6
|
const utils_1 = require("@graphql-tools/utils");
|
|
6
7
|
const merge_nodes_js_1 = require("./merge-nodes.js");
|
|
@@ -28,7 +29,6 @@ function mergeTypeDefs(typeSource, config) {
|
|
|
28
29
|
(0, utils_1.resetComments)();
|
|
29
30
|
return result;
|
|
30
31
|
}
|
|
31
|
-
exports.mergeTypeDefs = mergeTypeDefs;
|
|
32
32
|
function visitTypeSources(typeSource, options, allDirectives = [], allNodes = [], visitedTypeSources = new Set()) {
|
|
33
33
|
if (typeSource && !visitedTypeSources.has(typeSource)) {
|
|
34
34
|
visitedTypeSources.add(typeSource);
|
|
@@ -123,4 +123,3 @@ function mergeGraphQLTypes(typeSource, config) {
|
|
|
123
123
|
}
|
|
124
124
|
return mergedNodeDefinitions;
|
|
125
125
|
}
|
|
126
|
-
exports.mergeGraphQLTypes = mergeGraphQLTypes;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.mergeScalar =
|
|
3
|
+
exports.mergeScalar = mergeScalar;
|
|
4
4
|
const graphql_1 = require("graphql");
|
|
5
5
|
const directives_js_1 = require("./directives.js");
|
|
6
6
|
function mergeScalar(node, existingNode, config, directives) {
|
|
@@ -24,4 +24,3 @@ function mergeScalar(node, existingNode, config, directives) {
|
|
|
24
24
|
}
|
|
25
25
|
: node;
|
|
26
26
|
}
|
|
27
|
-
exports.mergeScalar = mergeScalar;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.DEFAULT_OPERATION_TYPE_NAME_MAP = void 0;
|
|
4
|
+
exports.mergeSchemaDefs = mergeSchemaDefs;
|
|
4
5
|
const graphql_1 = require("graphql");
|
|
5
6
|
const directives_js_1 = require("./directives.js");
|
|
6
7
|
exports.DEFAULT_OPERATION_TYPE_NAME_MAP = {
|
|
@@ -37,4 +38,3 @@ function mergeSchemaDefs(node, existingNode, config, directives) {
|
|
|
37
38
|
}
|
|
38
39
|
: node);
|
|
39
40
|
}
|
|
40
|
-
exports.mergeSchemaDefs = mergeSchemaDefs;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.mergeType =
|
|
3
|
+
exports.mergeType = mergeType;
|
|
4
4
|
const graphql_1 = require("graphql");
|
|
5
5
|
const directives_js_1 = require("./directives.js");
|
|
6
6
|
const fields_js_1 = require("./fields.js");
|
|
@@ -33,4 +33,3 @@ function mergeType(node, existingNode, config, directives) {
|
|
|
33
33
|
}
|
|
34
34
|
: node;
|
|
35
35
|
}
|
|
36
|
-
exports.mergeType = mergeType;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.mergeUnion =
|
|
3
|
+
exports.mergeUnion = mergeUnion;
|
|
4
4
|
const graphql_1 = require("graphql");
|
|
5
5
|
const directives_js_1 = require("./directives.js");
|
|
6
6
|
const merge_named_type_array_js_1 = require("./merge-named-type-array.js");
|
|
@@ -27,4 +27,3 @@ function mergeUnion(first, second, config, directives) {
|
|
|
27
27
|
}
|
|
28
28
|
: first;
|
|
29
29
|
}
|
|
30
|
-
exports.mergeUnion = mergeUnion;
|
|
@@ -1,15 +1,21 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.CompareVal = void 0;
|
|
4
|
+
exports.isStringTypes = isStringTypes;
|
|
5
|
+
exports.isSourceTypes = isSourceTypes;
|
|
6
|
+
exports.extractType = extractType;
|
|
7
|
+
exports.isWrappingTypeNode = isWrappingTypeNode;
|
|
8
|
+
exports.isListTypeNode = isListTypeNode;
|
|
9
|
+
exports.isNonNullTypeNode = isNonNullTypeNode;
|
|
10
|
+
exports.printTypeNode = printTypeNode;
|
|
11
|
+
exports.defaultStringComparator = defaultStringComparator;
|
|
4
12
|
const graphql_1 = require("graphql");
|
|
5
13
|
function isStringTypes(types) {
|
|
6
14
|
return typeof types === 'string';
|
|
7
15
|
}
|
|
8
|
-
exports.isStringTypes = isStringTypes;
|
|
9
16
|
function isSourceTypes(types) {
|
|
10
17
|
return types instanceof graphql_1.Source;
|
|
11
18
|
}
|
|
12
|
-
exports.isSourceTypes = isSourceTypes;
|
|
13
19
|
function extractType(type) {
|
|
14
20
|
let visitedType = type;
|
|
15
21
|
while (visitedType.kind === graphql_1.Kind.LIST_TYPE || visitedType.kind === 'NonNullType') {
|
|
@@ -17,19 +23,15 @@ function extractType(type) {
|
|
|
17
23
|
}
|
|
18
24
|
return visitedType;
|
|
19
25
|
}
|
|
20
|
-
exports.extractType = extractType;
|
|
21
26
|
function isWrappingTypeNode(type) {
|
|
22
27
|
return type.kind !== graphql_1.Kind.NAMED_TYPE;
|
|
23
28
|
}
|
|
24
|
-
exports.isWrappingTypeNode = isWrappingTypeNode;
|
|
25
29
|
function isListTypeNode(type) {
|
|
26
30
|
return type.kind === graphql_1.Kind.LIST_TYPE;
|
|
27
31
|
}
|
|
28
|
-
exports.isListTypeNode = isListTypeNode;
|
|
29
32
|
function isNonNullTypeNode(type) {
|
|
30
33
|
return type.kind === graphql_1.Kind.NON_NULL_TYPE;
|
|
31
34
|
}
|
|
32
|
-
exports.isNonNullTypeNode = isNonNullTypeNode;
|
|
33
35
|
function printTypeNode(type) {
|
|
34
36
|
if (isListTypeNode(type)) {
|
|
35
37
|
return `[${printTypeNode(type.type)}]`;
|
|
@@ -39,7 +41,6 @@ function printTypeNode(type) {
|
|
|
39
41
|
}
|
|
40
42
|
return type.name.value;
|
|
41
43
|
}
|
|
42
|
-
exports.printTypeNode = printTypeNode;
|
|
43
44
|
var CompareVal;
|
|
44
45
|
(function (CompareVal) {
|
|
45
46
|
CompareVal[CompareVal["A_SMALLER_THAN_B"] = -1] = "A_SMALLER_THAN_B";
|
|
@@ -62,4 +63,3 @@ function defaultStringComparator(a, b) {
|
|
|
62
63
|
return CompareVal.A_GREATER_THAN_B;
|
|
63
64
|
return CompareVal.A_EQUALS_B;
|
|
64
65
|
}
|
|
65
|
-
exports.defaultStringComparator = defaultStringComparator;
|
package/package.json
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@graphql-tools/merge",
|
|
3
|
-
"version": "9.0.
|
|
3
|
+
"version": "9.0.13",
|
|
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 || ^17.0.0"
|
|
8
8
|
},
|
|
9
9
|
"dependencies": {
|
|
10
|
-
"@graphql-tools/utils": "^10.6.
|
|
10
|
+
"@graphql-tools/utils": "^10.6.3",
|
|
11
11
|
"tslib": "^2.4.0"
|
|
12
12
|
},
|
|
13
13
|
"repository": {
|