@graphql-tools/merge 6.2.9 → 6.2.10

package/es5/index.esm.js

@@ -1,4 +1,4 @@
-import { __values, __read, __spread, __assign, __awaiter, __generator, __rest } from 'tslib';
+import { __values, __read, __spreadArray, __assign, __awaiter, __generator, __rest } from 'tslib';
 import { mergeDeep, compareNodes, isNotEqual, getDocumentNodeFromSchema, createSchemaDefinition, asArray, getResolversFromSchema, SchemaDirectiveVisitor } from '@graphql-tools/utils/es5';
 import { getDescription, visit, print, Source, Kind, isSchema, parse, isScalarType, isSpecifiedScalarType, isIntrospectionType, isObjectType, isInterfaceType, isInputObjectType, isUnionType, isEnumType, buildSchema, buildASTSchema } from 'graphql';
 import { addResolversToSchema, addErrorLoggingToSchema } from '@graphql-tools/schema/es5';
@@ -74,7 +74,7 @@ function mergeResolvers(resolversDefinitions, options) {
             for (var _i = 0; _i < arguments.length; _i++) {
                 args[_i] = arguments[_i];
             }
-            var resultsOfFactories = resolversFactories.map(function (factory) { return factory.apply(void 0, __spread(args)); });
+            var resultsOfFactories = resolversFactories.map(function (factory) { return factory.apply(void 0, __spreadArray([], __read(args))); });
             return resolvers.concat(resultsOfFactories).reduce(mergeDeep, {});
         });
     }
@@ -199,12 +199,12 @@ function addDescription(cb) {
             }
             return prev[key];
         }, ancestors[0]);
-        var key = __spread(keys, [parent.name.value]).join('.');
+        var key = __spreadArray(__spreadArray([], __read(keys)), [parent.name.value]).join('.');
         var items = [];
         if (commentsRegistry[key]) {
-            items.push.apply(items, __spread(commentsRegistry[key]));
+            items.push.apply(items, __spreadArray([], __read(commentsRegistry[key])));
         }
-        return join(__spread(items.map(printComment), [node.description, cb(node)]), '\n');
+        return join(__spreadArray(__spreadArray([], __read(items.map(printComment))), [node.description, cb(node)]), '\n');
     };
 }
 function indent(maybeString) {
@@ -407,7 +407,7 @@ function nameAlreadyExists(name, namesArr) {
 }
 function mergeArguments$1(a1, a2) {
     var e_1, _a;
-    var result = __spread(a2);
+    var result = __spreadArray([], __read(a2));
     var _loop_1 = function (argument) {
         var existingIndex = result.findIndex(function (a) { return a.name.value === argument.name.value; });
         if (existingIndex > -1) {
@@ -464,7 +464,7 @@ function mergeDirectives(d1, d2, config) {
     var reverseOrder = config && config.reverseDirectives;
     var asNext = reverseOrder ? d1 : d2;
     var asFirst = reverseOrder ? d2 : d1;
-    var result = deduplicateDirectives(__spread(asNext));
+    var result = deduplicateDirectives(__spreadArray([], __read(asNext)));
     var _loop_2 = function (directive) {
         if (directiveAlreadyExists(result, directive)) {
             var existingDirectiveIndex = result.findIndex(function (d) { return d.name.value === directive.name.value; });
@@ -503,7 +503,7 @@ function validateInputs(node, existingNode) {
 function mergeDirective(node, existingNode) {
     if (existingNode) {
         validateInputs(node, existingNode);
-        return __assign(__assign({}, node), { locations: __spread(existingNode.locations, node.locations.filter(function (name) { return !nameAlreadyExists(name, existingNode.locations); })) });
+        return __assign(__assign({}, node), { locations: __spreadArray(__spreadArray([], __read(existingNode.locations)), __read(node.locations.filter(function (name) { return !nameAlreadyExists(name, existingNode.locations); }))) });
     }
     return node;
 }
@@ -553,7 +553,7 @@ function mergeEnumValues(first, second, config) {
         }
         finally { if (e_2) throw e_2.error; }
     }
-    var result = __spread(enumValueMap.values());
+    var result = __spreadArray([], __read(enumValueMap.values()));
     if (config && config.sort) {
         result.sort(compareNodes);
     }
@@ -651,9 +651,9 @@ function printTypeNode(type) {
     return type.name.value;
 }
 
-function fieldAlreadyExists(fieldsArr, otherField) {
+function fieldAlreadyExists(fieldsArr, otherField, config) {
     var result = fieldsArr.find(function (field) { return field.name.value === otherField.name.value; });
-    if (result) {
+    if (result && !(config === null || config === void 0 ? void 0 : config.ignoreFieldConflicts)) {
         var t1 = extractType(result.type);
         var t2 = extractType(otherField.type);
         if (t1.name.value !== t2.name.value) {
@@ -664,18 +664,20 @@ function fieldAlreadyExists(fieldsArr, otherField) {
 }
 function mergeFields(type, f1, f2, config) {
     var e_1, _a;
-    var result = __spread(f2);
+    var result = __spreadArray([], __read(f2));
     var _loop_1 = function (field) {
-        if (fieldAlreadyExists(result, field)) {
+        if (fieldAlreadyExists(result, field, config)) {
             var existing = result.find(function (f) { return f.name.value === field.name.value; });
-            if (config && config.throwOnConflict) {
-                preventConflicts(type, existing, field);
-            }
-            else {
-                preventConflicts(type, existing, field);
-            }
-            if (isNonNullTypeNode(field.type) && !isNonNullTypeNode(existing.type)) {
-                existing.type = field.type;
+            if (!(config === null || config === void 0 ? void 0 : config.ignoreFieldConflicts)) {
+                if (config === null || config === void 0 ? void 0 : config.throwOnConflict) {
+                    preventConflicts(type, existing, field);
+                }
+                else {
+                    preventConflicts(type, existing, field);
+                }
+                if (isNonNullTypeNode(field.type) && !isNonNullTypeNode(existing.type)) {
+                    existing.type = field.type;
+                }
             }
             existing.arguments = mergeArguments(field['arguments'] || [], existing.arguments || [], config);
             existing.directives = mergeDirectives(field.directives, existing.directives, config);
@@ -789,7 +791,7 @@ function alreadyExists(arr, other) {
     return !!arr.find(function (i) { return i.name.value === other.name.value; });
 }
 function mergeNamedTypeArray(first, second, config) {
-    var result = __spread(second, first.filter(function (d) { return !alreadyExists(second, d); }));
+    var result = __spreadArray(__spreadArray([], __read(second)), __read(first.filter(function (d) { return !alreadyExists(second, d); })));
     if (config && config.sort) {
         result.sort(compareNodes);
     }
@@ -931,7 +933,7 @@ function mergeGraphQLTypes(types, config) {
         .map(function (ast) { return ast.definitions; })
         .reduce(function (defs, newDef) {
         if (newDef === void 0) { newDef = []; }
-        return __spread(defs, newDef);
+        return __spreadArray(__spreadArray([], __read(defs)), __read(newDef));
     }, []);
     // XXX: right now we don't handle multiple schema definitions
     var schemaDef = allNodes.filter(isSchemaDefinition).reduce(function (def, node) {
@@ -967,7 +969,7 @@ function mergeGraphQLTypes(types, config) {
     if (!schemaDefinition) {
         return Object.values(mergedNodes);
     }
-    return __spread(Object.values(mergedNodes), [parse(schemaDefinition).definitions[0]]);
+    return __spreadArray(__spreadArray([], __read(Object.values(mergedNodes))), [parse(schemaDefinition).definitions[0]]);
 }
 
 function travelSchemaPossibleExtensions(schema, hooks) {
@@ -1263,7 +1265,7 @@ function mergeSchemas(config) {
         }
         finally { if (e_1) throw e_1.error; }
     }
-    extractedResolvers.push.apply(extractedResolvers, __spread(ensureResolvers(config)));
+    extractedResolvers.push.apply(extractedResolvers, __spreadArray([], __read(ensureResolvers(config))));
     var resolvers = mergeResolvers(extractedResolvers, config);
     var extensions = mergeExtensions(extractedExtensions);
     return makeSchema({ resolvers: resolvers, typeDefs: typeDefs, extensions: extensions }, config);
@@ -1283,7 +1285,7 @@ function mergeSchemasAsync(config) {
                         Promise.all(config.schemas.map(function (schema) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
                             return [2 /*return*/, getResolversFromSchema(schema)];
                         }); }); })).then(function (extractedResolvers) {
-                            return mergeResolvers(__spread(extractedResolvers, ensureResolvers(config)), config);
+                            return mergeResolvers(__spreadArray(__spreadArray([], __read(extractedResolvers)), __read(ensureResolvers(config))), config);
                         }),
                         Promise.all(config.schemas.map(function (schema) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
                             return [2 /*return*/, extractExtensionsFromSchema(schema)];
@@ -1300,7 +1302,7 @@ function mergeSchemasAsync(config) {
 }
 function mergeTypes(_a) {
     var schemas = _a.schemas, typeDefs = _a.typeDefs, config = __rest(_a, ["schemas", "typeDefs"]);
-    return mergeTypeDefs(__spread(schemas, (typeDefs ? asArray(typeDefs) : [])), config);
+    return mergeTypeDefs(__spreadArray(__spreadArray([], __read(schemas)), __read((typeDefs ? asArray(typeDefs) : []))), config);
 }
 function ensureResolvers(config) {
     return config.resolvers ? asArray(config.resolvers) : [];