@graphql-tools/merge 6.2.9 → 6.2.10

package/es5/index.cjs.js

@@ -78,7 +78,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, tslib.__spread(args)); });
+            var resultsOfFactories = resolversFactories.map(function (factory) { return factory.apply(void 0, tslib.__spreadArray([], tslib.__read(args))); });
             return resolvers.concat(resultsOfFactories).reduce(utils.mergeDeep, {});
         });
     }
@@ -203,12 +203,12 @@ function addDescription(cb) {
             }
             return prev[key];
         }, ancestors[0]);
-        var key = tslib.__spread(keys, [parent.name.value]).join('.');
+        var key = tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(keys)), [parent.name.value]).join('.');
         var items = [];
         if (commentsRegistry[key]) {
-            items.push.apply(items, tslib.__spread(commentsRegistry[key]));
+            items.push.apply(items, tslib.__spreadArray([], tslib.__read(commentsRegistry[key])));
         }
-        return join(tslib.__spread(items.map(printComment), [node.description, cb(node)]), '\n');
+        return join(tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(items.map(printComment))), [node.description, cb(node)]), '\n');
     };
 }
 function indent(maybeString) {
@@ -411,7 +411,7 @@ function nameAlreadyExists(name, namesArr) {
 }
 function mergeArguments$1(a1, a2) {
     var e_1, _a;
-    var result = tslib.__spread(a2);
+    var result = tslib.__spreadArray([], tslib.__read(a2));
     var _loop_1 = function (argument) {
         var existingIndex = result.findIndex(function (a) { return a.name.value === argument.name.value; });
         if (existingIndex > -1) {
@@ -468,7 +468,7 @@ function mergeDirectives(d1, d2, config) {
     var reverseOrder = config && config.reverseDirectives;
     var asNext = reverseOrder ? d1 : d2;
     var asFirst = reverseOrder ? d2 : d1;
-    var result = deduplicateDirectives(tslib.__spread(asNext));
+    var result = deduplicateDirectives(tslib.__spreadArray([], tslib.__read(asNext)));
     var _loop_2 = function (directive) {
         if (directiveAlreadyExists(result, directive)) {
             var existingDirectiveIndex = result.findIndex(function (d) { return d.name.value === directive.name.value; });
@@ -507,7 +507,7 @@ function validateInputs(node, existingNode) {
 function mergeDirective(node, existingNode) {
     if (existingNode) {
         validateInputs(node, existingNode);
-        return tslib.__assign(tslib.__assign({}, node), { locations: tslib.__spread(existingNode.locations, node.locations.filter(function (name) { return !nameAlreadyExists(name, existingNode.locations); })) });
+        return tslib.__assign(tslib.__assign({}, node), { locations: tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(existingNode.locations)), tslib.__read(node.locations.filter(function (name) { return !nameAlreadyExists(name, existingNode.locations); }))) });
     }
     return node;
 }
@@ -557,7 +557,7 @@ function mergeEnumValues(first, second, config) {
         }
         finally { if (e_2) throw e_2.error; }
     }
-    var result = tslib.__spread(enumValueMap.values());
+    var result = tslib.__spreadArray([], tslib.__read(enumValueMap.values()));
     if (config && config.sort) {
         result.sort(utils.compareNodes);
     }
@@ -655,9 +655,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) {
@@ -668,18 +668,20 @@ function fieldAlreadyExists(fieldsArr, otherField) {
 }
 function mergeFields(type, f1, f2, config) {
     var e_1, _a;
-    var result = tslib.__spread(f2);
+    var result = tslib.__spreadArray([], tslib.__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);
@@ -793,7 +795,7 @@ function alreadyExists(arr, other) {
     return !!arr.find(function (i) { return i.name.value === other.name.value; });
 }
 function mergeNamedTypeArray(first, second, config) {
-    var result = tslib.__spread(second, first.filter(function (d) { return !alreadyExists(second, d); }));
+    var result = tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(second)), tslib.__read(first.filter(function (d) { return !alreadyExists(second, d); })));
     if (config && config.sort) {
         result.sort(utils.compareNodes);
     }
@@ -935,7 +937,7 @@ function mergeGraphQLTypes(types, config) {
         .map(function (ast) { return ast.definitions; })
         .reduce(function (defs, newDef) {
         if (newDef === void 0) { newDef = []; }
-        return tslib.__spread(defs, newDef);
+        return tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(defs)), tslib.__read(newDef));
     }, []);
     // XXX: right now we don't handle multiple schema definitions
     var schemaDef = allNodes.filter(isSchemaDefinition).reduce(function (def, node) {
@@ -971,7 +973,7 @@ function mergeGraphQLTypes(types, config) {
     if (!schemaDefinition) {
         return Object.values(mergedNodes);
     }
-    return tslib.__spread(Object.values(mergedNodes), [graphql.parse(schemaDefinition).definitions[0]]);
+    return tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(Object.values(mergedNodes))), [graphql.parse(schemaDefinition).definitions[0]]);
 }
 
 function travelSchemaPossibleExtensions(schema, hooks) {
@@ -1267,7 +1269,7 @@ function mergeSchemas(config) {
         }
         finally { if (e_1) throw e_1.error; }
     }
-    extractedResolvers.push.apply(extractedResolvers, tslib.__spread(ensureResolvers(config)));
+    extractedResolvers.push.apply(extractedResolvers, tslib.__spreadArray([], tslib.__read(ensureResolvers(config))));
     var resolvers = mergeResolvers(extractedResolvers, config);
     var extensions = mergeExtensions(extractedExtensions);
     return makeSchema({ resolvers: resolvers, typeDefs: typeDefs, extensions: extensions }, config);
@@ -1287,7 +1289,7 @@ function mergeSchemasAsync(config) {
                         Promise.all(config.schemas.map(function (schema) { return tslib.__awaiter(_this, void 0, void 0, function () { return tslib.__generator(this, function (_a) {
                             return [2 /*return*/, utils.getResolversFromSchema(schema)];
                         }); }); })).then(function (extractedResolvers) {
-                            return mergeResolvers(tslib.__spread(extractedResolvers, ensureResolvers(config)), config);
+                            return mergeResolvers(tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(extractedResolvers)), tslib.__read(ensureResolvers(config))), config);
                         }),
                         Promise.all(config.schemas.map(function (schema) { return tslib.__awaiter(_this, void 0, void 0, function () { return tslib.__generator(this, function (_a) {
                             return [2 /*return*/, extractExtensionsFromSchema(schema)];
@@ -1304,7 +1306,7 @@ function mergeSchemasAsync(config) {
 }
 function mergeTypes(_a) {
     var schemas = _a.schemas, typeDefs = _a.typeDefs, config = tslib.__rest(_a, ["schemas", "typeDefs"]);
-    return mergeTypeDefs(tslib.__spread(schemas, (typeDefs ? utils.asArray(typeDefs) : [])), config);
+    return mergeTypeDefs(tslib.__spreadArray(tslib.__spreadArray([], tslib.__read(schemas)), tslib.__read((typeDefs ? utils.asArray(typeDefs) : []))), config);
 }
 function ensureResolvers(config) {
     return config.resolvers ? utils.asArray(config.resolvers) : [];