@graphql-tools/import 6.6.16-alpha-6669bfeb.0 → 6.6.17

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 (3) hide show
  1. package/index.js +27 -43
  2. package/index.mjs +27 -43
  3. package/package.json +4 -4
package/index.js CHANGED
@@ -431,13 +431,15 @@ function visitFragmentDefinitionNode(node, dependencySet) {
431
431
  dependencySet.add(node.name.value);
432
432
  node.selectionSet.selections.forEach(selectionNode => visitSelectionNode(selectionNode, dependencySet));
433
433
  }
434
- function visitObjectTypeDefinitionNode(node, dependencySet, dependenciesByDefinitionName) {
435
- var _a, _b, _c;
434
+ function addInterfaceDependencies(node, dependencySet, dependenciesByDefinitionName) {
435
+ var _a, _b;
436
436
  const typeName = node.name.value;
437
- dependencySet.add(typeName);
438
- (_a = node.directives) === null || _a === void 0 ? void 0 : _a.forEach(directiveNode => visitDirectiveNode(directiveNode, dependencySet));
439
- (_b = node.fields) === null || _b === void 0 ? void 0 : _b.forEach(fieldDefinitionNode => visitFieldDefinitionNode(fieldDefinitionNode, dependencySet));
440
- (_c = node.interfaces) === null || _c === void 0 ? void 0 : _c.forEach(namedTypeNode => {
437
+ // all interfaces should be dependent to each other
438
+ const allDependencies = [
439
+ typeName,
440
+ ...(((_a = node.interfaces) === null || _a === void 0 ? void 0 : _a.map((namedTypeNode) => namedTypeNode.name.value)) || []),
441
+ ];
442
+ (_b = node.interfaces) === null || _b === void 0 ? void 0 : _b.forEach((namedTypeNode) => {
441
443
  visitNamedTypeNode(namedTypeNode, dependencySet);
442
444
  const interfaceName = namedTypeNode.name.value;
443
445
  let set = dependenciesByDefinitionName.get(interfaceName);
@@ -446,9 +448,21 @@ function visitObjectTypeDefinitionNode(node, dependencySet, dependenciesByDefini
446
448
  set = new Set();
447
449
  dependenciesByDefinitionName.set(interfaceName, set);
448
450
  }
449
- set.add(typeName);
451
+ allDependencies.forEach(dependency => {
452
+ if (dependency !== interfaceName) {
453
+ set.add(dependency);
454
+ }
455
+ });
450
456
  });
451
457
  }
458
+ function visitObjectTypeDefinitionNode(node, dependencySet, dependenciesByDefinitionName) {
459
+ var _a, _b;
460
+ const typeName = node.name.value;
461
+ dependencySet.add(typeName);
462
+ (_a = node.directives) === null || _a === void 0 ? void 0 : _a.forEach(directiveNode => visitDirectiveNode(directiveNode, dependencySet));
463
+ (_b = node.fields) === null || _b === void 0 ? void 0 : _b.forEach(fieldDefinitionNode => visitFieldDefinitionNode(fieldDefinitionNode, dependencySet));
464
+ addInterfaceDependencies(node, dependencySet, dependenciesByDefinitionName);
465
+ }
452
466
  function visitDirectiveNode(node, dependencySet) {
453
467
  const directiveName = node.name.value;
454
468
  if (!builtinDirectives.includes(directiveName)) {
@@ -492,22 +506,12 @@ function visitInputValueDefinitionNode(node, dependencySet, dependenciesByDefini
492
506
  visitTypeNode(node.type, dependencySet);
493
507
  }
494
508
  function visitInterfaceTypeDefinitionNode(node, dependencySet, dependenciesByDefinitionName) {
495
- var _a, _b, _c;
509
+ var _a, _b;
496
510
  const typeName = node.name.value;
497
511
  dependencySet.add(typeName);
498
512
  (_a = node.directives) === null || _a === void 0 ? void 0 : _a.forEach(directiveNode => visitDirectiveNode(directiveNode, dependencySet));
499
513
  (_b = node.fields) === null || _b === void 0 ? void 0 : _b.forEach(fieldDefinitionNode => visitFieldDefinitionNode(fieldDefinitionNode, dependencySet));
500
- (_c = node.interfaces) === null || _c === void 0 ? void 0 : _c.forEach((namedTypeNode) => {
501
- visitNamedTypeNode(namedTypeNode, dependencySet);
502
- const interfaceName = namedTypeNode.name.value;
503
- let set = dependenciesByDefinitionName.get(interfaceName);
504
- // interface should be dependent to the type as well
505
- if (set == null) {
506
- set = new Set();
507
- dependenciesByDefinitionName.set(interfaceName, set);
508
- }
509
- set.add(typeName);
510
- });
514
+ addInterfaceDependencies(node, dependencySet, dependenciesByDefinitionName);
511
515
  }
512
516
  function visitUnionTypeDefinitionNode(node, dependencySet) {
513
517
  var _a, _b;
@@ -532,40 +536,20 @@ function visitDirectiveDefinitionNode(node, dependencySet, dependenciesByDefinit
532
536
  (_a = node.arguments) === null || _a === void 0 ? void 0 : _a.forEach(inputValueDefinitionNode => visitInputValueDefinitionNode(inputValueDefinitionNode, dependencySet));
533
537
  }
534
538
  function visitObjectTypeExtensionNode(node, dependencySet, dependenciesByDefinitionName) {
535
- var _a, _b, _c;
539
+ var _a, _b;
536
540
  const typeName = node.name.value;
537
541
  dependencySet.add(typeName);
538
542
  (_a = node.directives) === null || _a === void 0 ? void 0 : _a.forEach(directiveNode => visitDirectiveNode(directiveNode, dependencySet));
539
543
  (_b = node.fields) === null || _b === void 0 ? void 0 : _b.forEach(fieldDefinitionNode => visitFieldDefinitionNode(fieldDefinitionNode, dependencySet));
540
- (_c = node.interfaces) === null || _c === void 0 ? void 0 : _c.forEach(namedTypeNode => {
541
- visitNamedTypeNode(namedTypeNode, dependencySet);
542
- const interfaceName = namedTypeNode.name.value;
543
- let set = dependenciesByDefinitionName.get(interfaceName);
544
- // interface should be dependent to the type as well
545
- if (set == null) {
546
- set = new Set();
547
- dependenciesByDefinitionName.set(interfaceName, set);
548
- }
549
- set.add(typeName);
550
- });
544
+ addInterfaceDependencies(node, dependencySet, dependenciesByDefinitionName);
551
545
  }
552
546
  function visitInterfaceTypeExtensionNode(node, dependencySet, dependenciesByDefinitionName) {
553
- var _a, _b, _c;
547
+ var _a, _b;
554
548
  const typeName = node.name.value;
555
549
  dependencySet.add(typeName);
556
550
  (_a = node.directives) === null || _a === void 0 ? void 0 : _a.forEach(directiveNode => visitDirectiveNode(directiveNode, dependencySet));
557
551
  (_b = node.fields) === null || _b === void 0 ? void 0 : _b.forEach(fieldDefinitionNode => visitFieldDefinitionNode(fieldDefinitionNode, dependencySet));
558
- (_c = node.interfaces) === null || _c === void 0 ? void 0 : _c.forEach((namedTypeNode) => {
559
- visitNamedTypeNode(namedTypeNode, dependencySet);
560
- const interfaceName = namedTypeNode.name.value;
561
- let set = dependenciesByDefinitionName.get(interfaceName);
562
- // interface should be dependent to the type as well
563
- if (set == null) {
564
- set = new Set();
565
- dependenciesByDefinitionName.set(interfaceName, set);
566
- }
567
- set.add(typeName);
568
- });
552
+ addInterfaceDependencies(node, dependencySet, dependenciesByDefinitionName);
569
553
  }
570
554
  function visitUnionTypeExtensionNode(node, dependencySet) {
571
555
  var _a, _b;
package/index.mjs CHANGED
@@ -425,13 +425,15 @@ function visitFragmentDefinitionNode(node, dependencySet) {
425
425
  dependencySet.add(node.name.value);
426
426
  node.selectionSet.selections.forEach(selectionNode => visitSelectionNode(selectionNode, dependencySet));
427
427
  }
428
- function visitObjectTypeDefinitionNode(node, dependencySet, dependenciesByDefinitionName) {
429
- var _a, _b, _c;
428
+ function addInterfaceDependencies(node, dependencySet, dependenciesByDefinitionName) {
429
+ var _a, _b;
430
430
  const typeName = node.name.value;
431
- dependencySet.add(typeName);
432
- (_a = node.directives) === null || _a === void 0 ? void 0 : _a.forEach(directiveNode => visitDirectiveNode(directiveNode, dependencySet));
433
- (_b = node.fields) === null || _b === void 0 ? void 0 : _b.forEach(fieldDefinitionNode => visitFieldDefinitionNode(fieldDefinitionNode, dependencySet));
434
- (_c = node.interfaces) === null || _c === void 0 ? void 0 : _c.forEach(namedTypeNode => {
431
+ // all interfaces should be dependent to each other
432
+ const allDependencies = [
433
+ typeName,
434
+ ...(((_a = node.interfaces) === null || _a === void 0 ? void 0 : _a.map((namedTypeNode) => namedTypeNode.name.value)) || []),
435
+ ];
436
+ (_b = node.interfaces) === null || _b === void 0 ? void 0 : _b.forEach((namedTypeNode) => {
435
437
  visitNamedTypeNode(namedTypeNode, dependencySet);
436
438
  const interfaceName = namedTypeNode.name.value;
437
439
  let set = dependenciesByDefinitionName.get(interfaceName);
@@ -440,9 +442,21 @@ function visitObjectTypeDefinitionNode(node, dependencySet, dependenciesByDefini
440
442
  set = new Set();
441
443
  dependenciesByDefinitionName.set(interfaceName, set);
442
444
  }
443
- set.add(typeName);
445
+ allDependencies.forEach(dependency => {
446
+ if (dependency !== interfaceName) {
447
+ set.add(dependency);
448
+ }
449
+ });
444
450
  });
445
451
  }
452
+ function visitObjectTypeDefinitionNode(node, dependencySet, dependenciesByDefinitionName) {
453
+ var _a, _b;
454
+ const typeName = node.name.value;
455
+ dependencySet.add(typeName);
456
+ (_a = node.directives) === null || _a === void 0 ? void 0 : _a.forEach(directiveNode => visitDirectiveNode(directiveNode, dependencySet));
457
+ (_b = node.fields) === null || _b === void 0 ? void 0 : _b.forEach(fieldDefinitionNode => visitFieldDefinitionNode(fieldDefinitionNode, dependencySet));
458
+ addInterfaceDependencies(node, dependencySet, dependenciesByDefinitionName);
459
+ }
446
460
  function visitDirectiveNode(node, dependencySet) {
447
461
  const directiveName = node.name.value;
448
462
  if (!builtinDirectives.includes(directiveName)) {
@@ -486,22 +500,12 @@ function visitInputValueDefinitionNode(node, dependencySet, dependenciesByDefini
486
500
  visitTypeNode(node.type, dependencySet);
487
501
  }
488
502
  function visitInterfaceTypeDefinitionNode(node, dependencySet, dependenciesByDefinitionName) {
489
- var _a, _b, _c;
503
+ var _a, _b;
490
504
  const typeName = node.name.value;
491
505
  dependencySet.add(typeName);
492
506
  (_a = node.directives) === null || _a === void 0 ? void 0 : _a.forEach(directiveNode => visitDirectiveNode(directiveNode, dependencySet));
493
507
  (_b = node.fields) === null || _b === void 0 ? void 0 : _b.forEach(fieldDefinitionNode => visitFieldDefinitionNode(fieldDefinitionNode, dependencySet));
494
- (_c = node.interfaces) === null || _c === void 0 ? void 0 : _c.forEach((namedTypeNode) => {
495
- visitNamedTypeNode(namedTypeNode, dependencySet);
496
- const interfaceName = namedTypeNode.name.value;
497
- let set = dependenciesByDefinitionName.get(interfaceName);
498
- // interface should be dependent to the type as well
499
- if (set == null) {
500
- set = new Set();
501
- dependenciesByDefinitionName.set(interfaceName, set);
502
- }
503
- set.add(typeName);
504
- });
508
+ addInterfaceDependencies(node, dependencySet, dependenciesByDefinitionName);
505
509
  }
506
510
  function visitUnionTypeDefinitionNode(node, dependencySet) {
507
511
  var _a, _b;
@@ -526,40 +530,20 @@ function visitDirectiveDefinitionNode(node, dependencySet, dependenciesByDefinit
526
530
  (_a = node.arguments) === null || _a === void 0 ? void 0 : _a.forEach(inputValueDefinitionNode => visitInputValueDefinitionNode(inputValueDefinitionNode, dependencySet));
527
531
  }
528
532
  function visitObjectTypeExtensionNode(node, dependencySet, dependenciesByDefinitionName) {
529
- var _a, _b, _c;
533
+ var _a, _b;
530
534
  const typeName = node.name.value;
531
535
  dependencySet.add(typeName);
532
536
  (_a = node.directives) === null || _a === void 0 ? void 0 : _a.forEach(directiveNode => visitDirectiveNode(directiveNode, dependencySet));
533
537
  (_b = node.fields) === null || _b === void 0 ? void 0 : _b.forEach(fieldDefinitionNode => visitFieldDefinitionNode(fieldDefinitionNode, dependencySet));
534
- (_c = node.interfaces) === null || _c === void 0 ? void 0 : _c.forEach(namedTypeNode => {
535
- visitNamedTypeNode(namedTypeNode, dependencySet);
536
- const interfaceName = namedTypeNode.name.value;
537
- let set = dependenciesByDefinitionName.get(interfaceName);
538
- // interface should be dependent to the type as well
539
- if (set == null) {
540
- set = new Set();
541
- dependenciesByDefinitionName.set(interfaceName, set);
542
- }
543
- set.add(typeName);
544
- });
538
+ addInterfaceDependencies(node, dependencySet, dependenciesByDefinitionName);
545
539
  }
546
540
  function visitInterfaceTypeExtensionNode(node, dependencySet, dependenciesByDefinitionName) {
547
- var _a, _b, _c;
541
+ var _a, _b;
548
542
  const typeName = node.name.value;
549
543
  dependencySet.add(typeName);
550
544
  (_a = node.directives) === null || _a === void 0 ? void 0 : _a.forEach(directiveNode => visitDirectiveNode(directiveNode, dependencySet));
551
545
  (_b = node.fields) === null || _b === void 0 ? void 0 : _b.forEach(fieldDefinitionNode => visitFieldDefinitionNode(fieldDefinitionNode, dependencySet));
552
- (_c = node.interfaces) === null || _c === void 0 ? void 0 : _c.forEach((namedTypeNode) => {
553
- visitNamedTypeNode(namedTypeNode, dependencySet);
554
- const interfaceName = namedTypeNode.name.value;
555
- let set = dependenciesByDefinitionName.get(interfaceName);
556
- // interface should be dependent to the type as well
557
- if (set == null) {
558
- set = new Set();
559
- dependenciesByDefinitionName.set(interfaceName, set);
560
- }
561
- set.add(typeName);
562
- });
546
+ addInterfaceDependencies(node, dependencySet, dependenciesByDefinitionName);
563
547
  }
564
548
  function visitUnionTypeExtensionNode(node, dependencySet) {
565
549
  var _a, _b;
package/package.json CHANGED
@@ -1,15 +1,15 @@
1
1
  {
2
2
  "name": "@graphql-tools/import",
3
- "version": "6.6.16-alpha-6669bfeb.0",
3
+ "version": "6.6.17",
4
4
  "description": "A set of utils for faster development of GraphQL tools",
5
5
  "sideEffects": false,
6
6
  "peerDependencies": {
7
- "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
7
+ "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
8
8
  },
9
9
  "dependencies": {
10
- "@graphql-tools/utils": "8.6.12-alpha-6669bfeb.0",
10
+ "@graphql-tools/utils": "8.6.13",
11
11
  "resolve-from": "5.0.0",
12
- "tslib": "~2.4.0"
12
+ "tslib": "^2.4.0"
13
13
  },
14
14
  "repository": {
15
15
  "type": "git",