@graphql-codegen/plugin-helpers 2.2.0-alpha-e04750ad3.0 → 2.3.1

package/index.d.ts

@@ -5,3 +5,4 @@ export * from './helpers';
 export * from './federation';
 export * from './errors';
 export * from './getCachedDocumentNodeFromSchema';
+export * from './oldVisit';

package/index.js

@@ -216,15 +216,17 @@ function isUsingTypes(document, externalFragments, schema) {
                 }
             },
         },
-        enter: {
-            VariableDefinition: (node, key, parent, path, anscestors) => {
+        VariableDefinition: {
+            enter: (node, key, parent, path, anscestors) => {
                 const insideIgnoredFragment = anscestors.find((f) => f.kind && f.kind === 'FragmentDefinition' && externalFragments.includes(f.name.value));
                 if (insideIgnoredFragment) {
                     return;
                 }
                 foundFields++;
             },
-            InputValueDefinition: (node, key, parent, path, anscestors) => {
+        },
+        InputValueDefinition: {
+            enter: (node, key, parent, path, anscestors) => {
                 const insideIgnoredFragment = anscestors.find((f) => f.kind && f.kind === 'FragmentDefinition' && externalFragments.includes(f.name.value));
                 if (insideIgnoredFragment) {
                     return;
@@ -396,7 +398,7 @@ class ApolloFederation {
     extractKeyOrRequiresFieldSet(directive) {
         const arg = directive.arguments.find(arg => arg.name.value === 'fields');
         const value = arg.value.value;
-        return graphql.visit(graphql.parse(`{${value}}`), {
+        return oldVisit(graphql.parse(`{${value}}`), {
             leave: {
                 SelectionSet(node) {
                     return node.selections.reduce((accum, field) => {
@@ -499,6 +501,22 @@ function isDetailedError(error) {
 
 const getCachedDocumentNodeFromSchema = utils.memoize1(utils.getDocumentNodeFromSchema);
 
+function oldVisit(root, { enter: enterVisitors, leave: leaveVisitors, ...newVisitor }) {
+    if (typeof enterVisitors === 'object') {
+        for (const key in enterVisitors) {
+            newVisitor[key] = newVisitor[key] || {};
+            newVisitor[key].enter = enterVisitors[key];
+        }
+    }
+    if (typeof leaveVisitors === 'object') {
+        for (const key in leaveVisitors) {
+            newVisitor[key] = newVisitor[key] || {};
+            newVisitor[key].leave = leaveVisitors[key];
+        }
+    }
+    return graphql.visit(root, newVisitor);
+}
+
 exports.ApolloFederation = ApolloFederation;
 exports.DetailedError = DetailedError;
 exports.addFederationReferencesToSchema = addFederationReferencesToSchema;
@@ -516,6 +534,7 @@ exports.mergeOutputs = mergeOutputs;
 exports.normalizeConfig = normalizeConfig;
 exports.normalizeInstanceOrArray = normalizeInstanceOrArray;
 exports.normalizeOutputParam = normalizeOutputParam;
+exports.oldVisit = oldVisit;
 exports.removeFederation = removeFederation;
 exports.removeNonNullWrapper = removeNonNullWrapper;
 exports.resolveExternalModuleAndFn = resolveExternalModuleAndFn;

package/index.mjs

@@ -210,15 +210,17 @@ function isUsingTypes(document, externalFragments, schema) {
                 }
             },
         },
-        enter: {
-            VariableDefinition: (node, key, parent, path, anscestors) => {
+        VariableDefinition: {
+            enter: (node, key, parent, path, anscestors) => {
                 const insideIgnoredFragment = anscestors.find((f) => f.kind && f.kind === 'FragmentDefinition' && externalFragments.includes(f.name.value));
                 if (insideIgnoredFragment) {
                     return;
                 }
                 foundFields++;
             },
-            InputValueDefinition: (node, key, parent, path, anscestors) => {
+        },
+        InputValueDefinition: {
+            enter: (node, key, parent, path, anscestors) => {
                 const insideIgnoredFragment = anscestors.find((f) => f.kind && f.kind === 'FragmentDefinition' && externalFragments.includes(f.name.value));
                 if (insideIgnoredFragment) {
                     return;
@@ -390,7 +392,7 @@ class ApolloFederation {
     extractKeyOrRequiresFieldSet(directive) {
         const arg = directive.arguments.find(arg => arg.name.value === 'fields');
         const value = arg.value.value;
-        return visit(parse(`{${value}}`), {
+        return oldVisit(parse(`{${value}}`), {
             leave: {
                 SelectionSet(node) {
                     return node.selections.reduce((accum, field) => {
@@ -493,4 +495,20 @@ function isDetailedError(error) {
 
 const getCachedDocumentNodeFromSchema = memoize1(getDocumentNodeFromSchema);
 
-export { ApolloFederation, DetailedError, addFederationReferencesToSchema, federationSpec, getBaseType, getCachedDocumentNodeFromSchema, hasNullableTypeRecursively, isComplexPluginOutput, isConfiguredOutput, isDetailedError, isOutputConfigArray, isUsingTypes, isWrapperType, mergeOutputs, normalizeConfig, normalizeInstanceOrArray, normalizeOutputParam, removeFederation, removeNonNullWrapper, resolveExternalModuleAndFn };
+function oldVisit(root, { enter: enterVisitors, leave: leaveVisitors, ...newVisitor }) {
+    if (typeof enterVisitors === 'object') {
+        for (const key in enterVisitors) {
+            newVisitor[key] = newVisitor[key] || {};
+            newVisitor[key].enter = enterVisitors[key];
+        }
+    }
+    if (typeof leaveVisitors === 'object') {
+        for (const key in leaveVisitors) {
+            newVisitor[key] = newVisitor[key] || {};
+            newVisitor[key].leave = leaveVisitors[key];
+        }
+    }
+    return visit(root, newVisitor);
+}
+
+export { ApolloFederation, DetailedError, addFederationReferencesToSchema, federationSpec, getBaseType, getCachedDocumentNodeFromSchema, hasNullableTypeRecursively, isComplexPluginOutput, isConfiguredOutput, isDetailedError, isOutputConfigArray, isUsingTypes, isWrapperType, mergeOutputs, normalizeConfig, normalizeInstanceOrArray, normalizeOutputParam, oldVisit, removeFederation, removeNonNullWrapper, resolveExternalModuleAndFn };

package/oldVisit.d.ts

@@ -0,0 +1,9 @@
+import { ASTNode, visit } from 'graphql';
+declare type VisitFn = typeof visit;
+declare type NewVisitor = Partial<Parameters<VisitFn>[1]>;
+declare type OldVisitor = {
+    enter?: Partial<Record<keyof NewVisitor, NewVisitor[keyof NewVisitor]['enter']>>;
+    leave?: Partial<Record<keyof NewVisitor, NewVisitor[keyof NewVisitor]['leave']>>;
+} & NewVisitor;
+export declare function oldVisit(root: ASTNode, { enter: enterVisitors, leave: leaveVisitors, ...newVisitor }: OldVisitor): any;
+export {};

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@graphql-codegen/plugin-helpers",
-  "version": "2.2.0-alpha-e04750ad3.0",
+  "version": "2.3.1",
   "description": "GraphQL Code Generator common utils and types",
   "peerDependencies": {
-    "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
+    "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
   },
   "dependencies": {
-    "@graphql-tools/utils": "^8.1.1",
+    "@graphql-tools/utils": "^8.5.2",
     "change-case-all": "1.0.14",
     "common-tags": "1.8.0",
     "import-from": "4.0.0",

package/utils.d.ts

@@ -3,4 +3,4 @@ import { Types } from './types';
 export declare function mergeOutputs(content: Types.PluginOutput | Array<Types.PluginOutput>): string;
 export declare function isWrapperType(t: GraphQLOutputType): t is GraphQLNonNull<any> | GraphQLList<any>;
 export declare function getBaseType(type: GraphQLOutputType): GraphQLNamedType;
-export declare function removeNonNullWrapper(type: GraphQLOutputType): GraphQLNamedType;
+export declare function removeNonNullWrapper(type: GraphQLOutputType): GraphQLOutputType;