@graphql-codegen/graphql-modules-preset 2.3.2-alpha-94c0a1415.0 → 2.3.2-alpha-23d229715.0

package/builder.d.ts

@@ -1,17 +1,6 @@
 import { DocumentNode, GraphQLSchema } from 'graphql';
 import { ModulesConfig } from './config';
 import { BaseVisitor } from '@graphql-codegen/visitor-plugin-common';
-declare type RegistryKeys = 'objects' | 'inputs' | 'interfaces' | 'scalars' | 'unions' | 'enums';
-declare type Registry = Record<RegistryKeys, string[]>;
-export declare function extractDeclared({ doc, rootTypes }: {
-    doc: DocumentNode;
-    rootTypes: string[];
-}): {
-    picks: Record<RegistryKeys, Record<string, string[]>>;
-    defined: Registry;
-    extended: Registry;
-    usedTypes: string[];
-};
 export declare function buildModule(name: string, doc: DocumentNode, { importNamespace, importPath, encapsulate, shouldDeclare, rootTypes, schema, baseVisitor, useGraphQLModules, }: {
     importNamespace: string;
     importPath: string;
@@ -22,4 +11,3 @@ export declare function buildModule(name: string, doc: DocumentNode, { importNam
     schema?: GraphQLSchema;
     useGraphQLModules: boolean;
 }): string;
-export {};

package/index.d.ts

@@ -1,5 +1,4 @@
 import { Types } from '@graphql-codegen/plugin-helpers';
 import { ModulesConfig } from './config';
-export { extractDeclared } from './builder';
 export declare const preset: Types.OutputPreset<ModulesConfig>;
 export default preset;

package/index.js

@@ -183,101 +183,12 @@ function createObject(keys, valueFn) {
 
 const registryKeys = ['objects', 'inputs', 'interfaces', 'scalars', 'unions', 'enums'];
 const resolverKeys = ['scalars', 'objects', 'enums'];
-function extractDeclared({ doc, rootTypes }) {
+function buildModule(name, doc, { importNamespace, importPath, encapsulate, shouldDeclare, rootTypes, schema, baseVisitor, useGraphQLModules, }) {
     const picks = createObject(registryKeys, () => ({}));
     const defined = createObject(registryKeys, () => []);
     const extended = createObject(registryKeys, () => []);
+    // List of types used in objects, fields, arguments etc
     const usedTypes = collectUsedTypes(doc);
-    function collectFields(node, picksObj) {
-        const name = node.name.value;
-        if (node.fields) {
-            if (!picksObj[name]) {
-                picksObj[name] = [];
-            }
-            node.fields.forEach(field => {
-                picksObj[name].push(field.name.value);
-            });
-        }
-    }
-    function collectValuesFromEnum(node) {
-        const name = node.name.value;
-        if (node.values) {
-            if (!picks.enums[name]) {
-                picks.enums[name] = [];
-            }
-            node.values.forEach(field => {
-                picks.enums[name].push(field.name.value);
-            });
-        }
-    }
-    function collectTypeDefinition(node) {
-        const name = node.name.value;
-        switch (node.kind) {
-            case graphql.Kind.OBJECT_TYPE_DEFINITION: {
-                defined.objects.push(name);
-                collectFields(node, picks.objects);
-                break;
-            }
-            case graphql.Kind.ENUM_TYPE_DEFINITION: {
-                defined.enums.push(name);
-                collectValuesFromEnum(node);
-                break;
-            }
-            case graphql.Kind.INPUT_OBJECT_TYPE_DEFINITION: {
-                defined.inputs.push(name);
-                collectFields(node, picks.inputs);
-                break;
-            }
-            case graphql.Kind.SCALAR_TYPE_DEFINITION: {
-                defined.scalars.push(name);
-                break;
-            }
-            case graphql.Kind.INTERFACE_TYPE_DEFINITION: {
-                defined.interfaces.push(name);
-                collectFields(node, picks.interfaces);
-                break;
-            }
-            case graphql.Kind.UNION_TYPE_DEFINITION: {
-                defined.unions.push(name);
-                break;
-            }
-        }
-    }
-    function collectTypeExtension(node) {
-        const name = node.name.value;
-        switch (node.kind) {
-            case graphql.Kind.OBJECT_TYPE_EXTENSION: {
-                collectFields(node, picks.objects);
-                // Do not include root types as extensions
-                // so we can use them in DefinedFields
-                if (rootTypes.includes(name)) {
-                    pushUnique(defined.objects, name);
-                    return;
-                }
-                pushUnique(extended.objects, name);
-                break;
-            }
-            case graphql.Kind.ENUM_TYPE_EXTENSION: {
-                collectValuesFromEnum(node);
-                pushUnique(extended.enums, name);
-                break;
-            }
-            case graphql.Kind.INPUT_OBJECT_TYPE_EXTENSION: {
-                collectFields(node, picks.inputs);
-                pushUnique(extended.inputs, name);
-                break;
-            }
-            case graphql.Kind.INTERFACE_TYPE_EXTENSION: {
-                collectFields(node, picks.interfaces);
-                pushUnique(extended.interfaces, name);
-                break;
-            }
-            case graphql.Kind.UNION_TYPE_EXTENSION: {
-                pushUnique(extended.unions, name);
-                break;
-            }
-        }
-    }
     graphql.visit(doc, {
         ObjectTypeDefinition(node) {
             collectTypeDefinition(node);
@@ -313,10 +224,6 @@ function extractDeclared({ doc, rootTypes }) {
             collectTypeExtension(node);
         },
     });
-    return { picks, defined, extended, usedTypes };
-}
-function buildModule(name, doc, { importNamespace, importPath, encapsulate, shouldDeclare, rootTypes, schema, baseVisitor, useGraphQLModules, }) {
-    const { picks, defined, extended, usedTypes } = extractDeclared({ doc, rootTypes });
     // Defined and Extended types
     const visited = createObject(registryKeys, key => concatByKey(defined, extended, key));
     // Types that are not defined or extended in a module, they come from other modules
@@ -513,6 +420,103 @@ function buildModule(name, doc, { importNamespace, importPath, encapsulate, shou
     function printExportType(typeName) {
         return `export type ${encapsulateTypeName(typeName)} = ${printTypeBody(typeName)};`;
     }
+    //
+    //
+    //
+    // Utils
+    //
+    //
+    //
+    function collectFields(node, picksObj) {
+        const name = node.name.value;
+        if (node.fields) {
+            if (!picksObj[name]) {
+                picksObj[name] = [];
+            }
+            node.fields.forEach(field => {
+                picksObj[name].push(field.name.value);
+            });
+        }
+    }
+    function collectValuesFromEnum(node) {
+        const name = node.name.value;
+        if (node.values) {
+            if (!picks.enums[name]) {
+                picks.enums[name] = [];
+            }
+            node.values.forEach(field => {
+                picks.enums[name].push(field.name.value);
+            });
+        }
+    }
+    function collectTypeDefinition(node) {
+        const name = node.name.value;
+        switch (node.kind) {
+            case graphql.Kind.OBJECT_TYPE_DEFINITION: {
+                defined.objects.push(name);
+                collectFields(node, picks.objects);
+                break;
+            }
+            case graphql.Kind.ENUM_TYPE_DEFINITION: {
+                defined.enums.push(name);
+                collectValuesFromEnum(node);
+                break;
+            }
+            case graphql.Kind.INPUT_OBJECT_TYPE_DEFINITION: {
+                defined.inputs.push(name);
+                collectFields(node, picks.inputs);
+                break;
+            }
+            case graphql.Kind.SCALAR_TYPE_DEFINITION: {
+                defined.scalars.push(name);
+                break;
+            }
+            case graphql.Kind.INTERFACE_TYPE_DEFINITION: {
+                defined.interfaces.push(name);
+                collectFields(node, picks.interfaces);
+                break;
+            }
+            case graphql.Kind.UNION_TYPE_DEFINITION: {
+                defined.unions.push(name);
+                break;
+            }
+        }
+    }
+    function collectTypeExtension(node) {
+        const name = node.name.value;
+        switch (node.kind) {
+            case graphql.Kind.OBJECT_TYPE_EXTENSION: {
+                collectFields(node, picks.objects);
+                // Do not include root types as extensions
+                // so we can use them in DefinedFields
+                if (rootTypes.includes(name)) {
+                    pushUnique(defined.objects, name);
+                    return;
+                }
+                pushUnique(extended.objects, name);
+                break;
+            }
+            case graphql.Kind.ENUM_TYPE_EXTENSION: {
+                collectValuesFromEnum(node);
+                pushUnique(extended.enums, name);
+                break;
+            }
+            case graphql.Kind.INPUT_OBJECT_TYPE_EXTENSION: {
+                collectFields(node, picks.inputs);
+                pushUnique(extended.inputs, name);
+                break;
+            }
+            case graphql.Kind.INTERFACE_TYPE_EXTENSION: {
+                collectFields(node, picks.interfaces);
+                pushUnique(extended.interfaces, name);
+                break;
+            }
+            case graphql.Kind.UNION_TYPE_EXTENSION: {
+                pushUnique(extended.unions, name);
+                break;
+            }
+        }
+    }
 }
 
 const preset = {
@@ -619,5 +623,4 @@ const preset = {
 };
 
 exports.default = preset;
-exports.extractDeclared = extractDeclared;
 exports.preset = preset;

package/index.mjs

@@ -177,101 +177,12 @@ function createObject(keys, valueFn) {
 
 const registryKeys = ['objects', 'inputs', 'interfaces', 'scalars', 'unions', 'enums'];
 const resolverKeys = ['scalars', 'objects', 'enums'];
-function extractDeclared({ doc, rootTypes }) {
+function buildModule(name, doc, { importNamespace, importPath, encapsulate, shouldDeclare, rootTypes, schema, baseVisitor, useGraphQLModules, }) {
     const picks = createObject(registryKeys, () => ({}));
     const defined = createObject(registryKeys, () => []);
     const extended = createObject(registryKeys, () => []);
+    // List of types used in objects, fields, arguments etc
     const usedTypes = collectUsedTypes(doc);
-    function collectFields(node, picksObj) {
-        const name = node.name.value;
-        if (node.fields) {
-            if (!picksObj[name]) {
-                picksObj[name] = [];
-            }
-            node.fields.forEach(field => {
-                picksObj[name].push(field.name.value);
-            });
-        }
-    }
-    function collectValuesFromEnum(node) {
-        const name = node.name.value;
-        if (node.values) {
-            if (!picks.enums[name]) {
-                picks.enums[name] = [];
-            }
-            node.values.forEach(field => {
-                picks.enums[name].push(field.name.value);
-            });
-        }
-    }
-    function collectTypeDefinition(node) {
-        const name = node.name.value;
-        switch (node.kind) {
-            case Kind.OBJECT_TYPE_DEFINITION: {
-                defined.objects.push(name);
-                collectFields(node, picks.objects);
-                break;
-            }
-            case Kind.ENUM_TYPE_DEFINITION: {
-                defined.enums.push(name);
-                collectValuesFromEnum(node);
-                break;
-            }
-            case Kind.INPUT_OBJECT_TYPE_DEFINITION: {
-                defined.inputs.push(name);
-                collectFields(node, picks.inputs);
-                break;
-            }
-            case Kind.SCALAR_TYPE_DEFINITION: {
-                defined.scalars.push(name);
-                break;
-            }
-            case Kind.INTERFACE_TYPE_DEFINITION: {
-                defined.interfaces.push(name);
-                collectFields(node, picks.interfaces);
-                break;
-            }
-            case Kind.UNION_TYPE_DEFINITION: {
-                defined.unions.push(name);
-                break;
-            }
-        }
-    }
-    function collectTypeExtension(node) {
-        const name = node.name.value;
-        switch (node.kind) {
-            case Kind.OBJECT_TYPE_EXTENSION: {
-                collectFields(node, picks.objects);
-                // Do not include root types as extensions
-                // so we can use them in DefinedFields
-                if (rootTypes.includes(name)) {
-                    pushUnique(defined.objects, name);
-                    return;
-                }
-                pushUnique(extended.objects, name);
-                break;
-            }
-            case Kind.ENUM_TYPE_EXTENSION: {
-                collectValuesFromEnum(node);
-                pushUnique(extended.enums, name);
-                break;
-            }
-            case Kind.INPUT_OBJECT_TYPE_EXTENSION: {
-                collectFields(node, picks.inputs);
-                pushUnique(extended.inputs, name);
-                break;
-            }
-            case Kind.INTERFACE_TYPE_EXTENSION: {
-                collectFields(node, picks.interfaces);
-                pushUnique(extended.interfaces, name);
-                break;
-            }
-            case Kind.UNION_TYPE_EXTENSION: {
-                pushUnique(extended.unions, name);
-                break;
-            }
-        }
-    }
     visit(doc, {
         ObjectTypeDefinition(node) {
             collectTypeDefinition(node);
@@ -307,10 +218,6 @@ function extractDeclared({ doc, rootTypes }) {
             collectTypeExtension(node);
         },
     });
-    return { picks, defined, extended, usedTypes };
-}
-function buildModule(name, doc, { importNamespace, importPath, encapsulate, shouldDeclare, rootTypes, schema, baseVisitor, useGraphQLModules, }) {
-    const { picks, defined, extended, usedTypes } = extractDeclared({ doc, rootTypes });
     // Defined and Extended types
     const visited = createObject(registryKeys, key => concatByKey(defined, extended, key));
     // Types that are not defined or extended in a module, they come from other modules
@@ -507,6 +414,103 @@ function buildModule(name, doc, { importNamespace, importPath, encapsulate, shou
     function printExportType(typeName) {
         return `export type ${encapsulateTypeName(typeName)} = ${printTypeBody(typeName)};`;
     }
+    //
+    //
+    //
+    // Utils
+    //
+    //
+    //
+    function collectFields(node, picksObj) {
+        const name = node.name.value;
+        if (node.fields) {
+            if (!picksObj[name]) {
+                picksObj[name] = [];
+            }
+            node.fields.forEach(field => {
+                picksObj[name].push(field.name.value);
+            });
+        }
+    }
+    function collectValuesFromEnum(node) {
+        const name = node.name.value;
+        if (node.values) {
+            if (!picks.enums[name]) {
+                picks.enums[name] = [];
+            }
+            node.values.forEach(field => {
+                picks.enums[name].push(field.name.value);
+            });
+        }
+    }
+    function collectTypeDefinition(node) {
+        const name = node.name.value;
+        switch (node.kind) {
+            case Kind.OBJECT_TYPE_DEFINITION: {
+                defined.objects.push(name);
+                collectFields(node, picks.objects);
+                break;
+            }
+            case Kind.ENUM_TYPE_DEFINITION: {
+                defined.enums.push(name);
+                collectValuesFromEnum(node);
+                break;
+            }
+            case Kind.INPUT_OBJECT_TYPE_DEFINITION: {
+                defined.inputs.push(name);
+                collectFields(node, picks.inputs);
+                break;
+            }
+            case Kind.SCALAR_TYPE_DEFINITION: {
+                defined.scalars.push(name);
+                break;
+            }
+            case Kind.INTERFACE_TYPE_DEFINITION: {
+                defined.interfaces.push(name);
+                collectFields(node, picks.interfaces);
+                break;
+            }
+            case Kind.UNION_TYPE_DEFINITION: {
+                defined.unions.push(name);
+                break;
+            }
+        }
+    }
+    function collectTypeExtension(node) {
+        const name = node.name.value;
+        switch (node.kind) {
+            case Kind.OBJECT_TYPE_EXTENSION: {
+                collectFields(node, picks.objects);
+                // Do not include root types as extensions
+                // so we can use them in DefinedFields
+                if (rootTypes.includes(name)) {
+                    pushUnique(defined.objects, name);
+                    return;
+                }
+                pushUnique(extended.objects, name);
+                break;
+            }
+            case Kind.ENUM_TYPE_EXTENSION: {
+                collectValuesFromEnum(node);
+                pushUnique(extended.enums, name);
+                break;
+            }
+            case Kind.INPUT_OBJECT_TYPE_EXTENSION: {
+                collectFields(node, picks.inputs);
+                pushUnique(extended.inputs, name);
+                break;
+            }
+            case Kind.INTERFACE_TYPE_EXTENSION: {
+                collectFields(node, picks.interfaces);
+                pushUnique(extended.interfaces, name);
+                break;
+            }
+            case Kind.UNION_TYPE_EXTENSION: {
+                pushUnique(extended.unions, name);
+                break;
+            }
+        }
+    }
 }
 
 const preset = {
@@ -613,4 +617,4 @@ const preset = {
 };
 
 export default preset;
-export { extractDeclared, preset };
+export { preset };

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@graphql-codegen/graphql-modules-preset",
-  "version": "2.3.2-alpha-94c0a1415.0",
+  "version": "2.3.2-alpha-23d229715.0",
   "description": "GraphQL Code Generator preset for modularized schema",
   "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 || ^16.0.0"
   },
   "dependencies": {
-    "@graphql-codegen/plugin-helpers": "^2.3.0",
-    "@graphql-codegen/visitor-plugin-common": "2.5.1",
-    "@graphql-tools/utils": "8.5.3",
+    "@graphql-codegen/plugin-helpers": "2.4.0-alpha-23d229715.0",
+    "@graphql-codegen/visitor-plugin-common": "2.5.2-alpha-23d229715.0",
+    "@graphql-tools/utils": "8.5.5",
     "change-case-all": "1.0.14",
     "parse-filepath": "^1.0.2",
     "tslib": "~2.3.0"
@@ -26,6 +26,7 @@
     "definition": "index.d.ts"
   },
   "exports": {
+    "./package.json": "./package.json",
     ".": {
       "require": "./index.js",
       "import": "./index.mjs"