@graphql-tools/merge 6.2.7-alpha-e9af76ec.0 → 6.2.7

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.
Files changed (14) hide show
  1. package/es5/index.cjs.js +6 -1
  2. package/es5/index.cjs.js.map +1 -1
  3. package/es5/index.esm.js +6 -1
  4. package/es5/index.esm.js.map +1 -1
  5. package/es5/package.json +1 -1
  6. package/es5/typedefs-mergers/enum-values.d.ts +1 -1
  7. package/es5/typedefs-mergers/merge-typedefs.d.ts +1 -0
  8. package/index.cjs.js +6 -1
  9. package/index.cjs.js.map +1 -1
  10. package/index.esm.js +6 -1
  11. package/index.esm.js.map +1 -1
  12. package/package.json +1 -1
  13. package/typedefs-mergers/enum-values.d.ts +1 -1
  14. package/typedefs-mergers/merge-typedefs.d.ts +1 -0
package/es5/index.esm.js CHANGED
@@ -513,6 +513,11 @@ function deduplicateLists(source, target, filterFn) {
513
513
 
514
514
  function mergeEnumValues(first, second, config) {
515
515
  var e_1, _a, e_2, _b;
516
+ if (config === null || config === void 0 ? void 0 : config.consistentEnumMerge) {
517
+ var reversed = first;
518
+ first = second;
519
+ second = reversed;
520
+ }
516
521
  var enumValueMap = new Map();
517
522
  try {
518
523
  for (var first_1 = __values(first), first_1_1 = first_1.next(); !first_1_1.done; first_1_1 = first_1.next()) {
@@ -565,7 +570,7 @@ function mergeEnum(e1, e2, config) {
565
570
  : 'EnumTypeExtension',
566
571
  loc: e1.loc,
567
572
  directives: mergeDirectives(e1.directives, e2.directives, config),
568
- values: mergeEnumValues(e2.values, e1.values, config),
573
+ values: mergeEnumValues(e1.values, e2.values, config),
569
574
  };
570
575
  }
571
576
  return config && config.convertExtensions