@nmarks/graphql-codegen-per-operation-file-preset 1.0.4 → 1.0.6

package/cjs/index.js

@@ -38,14 +38,19 @@ function needsSchemaTypesImport(document, schema, config) {
     let needsImport = false;
     // Get scalar mappings from config
     const scalarMappings = config.scalars || {};
-    // Check if document has any variables - if so, we need Types import for Types.Exact, Types.Scalars, etc.
-    let hasVariables = false;
+    // Check if document has an operation definition
+    // ALL operations (query/mutation/subscription) generate a Variables type that uses Types.Exact
+    // even if they have no variables: Types.Exact<{ [key: string]: never; }>
+    let hasOperation = false;
     // Collect all type names referenced in the document
     const referencedTypeNames = new Set();
     (0, graphql_1.visit)(document, {
+        // Operations always need Types import for their Variables type
+        OperationDefinition: () => {
+            hasOperation = true;
+        },
         // Check variable types for input types or custom scalars
         VariableDefinition: (node) => {
-            hasVariables = true; // Any variable means we need Types import
             const typeName = getBaseTypeName(node.type);
             referencedTypeNames.add(typeName);
         },
@@ -54,8 +59,8 @@ function needsSchemaTypesImport(document, schema, config) {
             referencedTypeNames.add(node.typeCondition.name.value);
         },
     });
-    // If operation has variables, it will use Types.Exact, Types.Scalars, Types.InputMaybe, etc.
-    if (hasVariables) {
+    // All operations generate Variables type that uses Types.Exact
+    if (hasOperation) {
         return true;
     }
     // Helper to recursively check if a type needs importing
@@ -180,17 +185,65 @@ exports.preset = {
                     document: singleDefDocument,
                     location: source.documents[0].location,
                 };
+                // Find other fragments in the same source file (they are "local" now but will be "external" after split)
+                const localFragments = definitions
+                    .filter(d => d.definition.kind === graphql_1.Kind.FRAGMENT_DEFINITION && d.name !== name)
+                    .map(d => d.definition);
+                // Add local fragments to external fragments list so they're available during generation
+                const localFragmentNodes = localFragments.map(frag => ({
+                    level: 0,
+                    isExternal: true,
+                    name: frag.name.value,
+                    onType: frag.typeCondition.name.value,
+                    node: frag,
+                }));
+                const allExternalFragments = [
+                    ...source.externalFragments,
+                    ...localFragmentNodes,
+                ];
                 // Update fragment imports to use the correct output path for this operation
                 const updatedFragmentImports = source.fragmentImports.map(fragmentImport => ({
                     ...fragmentImport,
                     outputPath: filename, // Update to actual output path
                 }));
+                // Generate fragment imports for local fragments (they'll be in separate files after splitting)
+                const localFragmentImports = localFragments.map((frag) => {
+                    var _a;
+                    const fragmentFilePath = (0, utils_js_1.generateOperationFilePath)(source.documents[0].location, frag.name.value, folder, extension);
+                    // Get fragment import identifiers (document + type)
+                    const identifiers = [
+                        {
+                            name: `${frag.name.value}FragmentDoc`,
+                            kind: 'document',
+                        },
+                        {
+                            name: `${frag.name.value}Fragment`,
+                            kind: 'type',
+                        },
+                    ];
+                    return {
+                        baseDir,
+                        baseOutputDir: options.baseOutputDir,
+                        outputPath: filename,
+                        importSource: {
+                            path: fragmentFilePath,
+                            identifiers,
+                        },
+                        emitLegacyCommonJSImports: options.config.emitLegacyCommonJSImports,
+                        importExtension: options.config.importExtension,
+                        typesImport: (_a = options.config.useTypeImports) !== null && _a !== void 0 ? _a : false,
+                    };
+                });
+                const allFragmentImports = [
+                    ...updatedFragmentImports,
+                    ...localFragmentImports,
+                ];
                 // Check if THIS specific operation uses types (not the whole source file)
                 const singleDefDocumentWithFragments = {
                     ...singleDefDocument,
                     definitions: [
                         ...singleDefDocument.definitions,
-                        ...source.externalFragments.map(fragment => fragment.node),
+                        ...allExternalFragments.map(fragment => fragment.node),
                     ],
                 };
                 const needsTypesImport = needsSchemaTypesImport(singleDefDocumentWithFragments, schemaObject, options.config);
@@ -221,8 +274,8 @@ exports.preset = {
                     ...options.config,
                     exportFragmentSpreadSubTypes: true,
                     namespacedImportName: importTypesNamespace,
-                    externalFragments: source.externalFragments,
-                    fragmentImports: updatedFragmentImports,
+                    externalFragments: allExternalFragments,
+                    fragmentImports: allFragmentImports,
                 };
                 artifacts.push({
                     ...options,

package/esm/index.js

@@ -34,14 +34,19 @@ function needsSchemaTypesImport(document, schema, config) {
     let needsImport = false;
     // Get scalar mappings from config
     const scalarMappings = config.scalars || {};
-    // Check if document has any variables - if so, we need Types import for Types.Exact, Types.Scalars, etc.
-    let hasVariables = false;
+    // Check if document has an operation definition
+    // ALL operations (query/mutation/subscription) generate a Variables type that uses Types.Exact
+    // even if they have no variables: Types.Exact<{ [key: string]: never; }>
+    let hasOperation = false;
     // Collect all type names referenced in the document
     const referencedTypeNames = new Set();
     visit(document, {
+        // Operations always need Types import for their Variables type
+        OperationDefinition: () => {
+            hasOperation = true;
+        },
         // Check variable types for input types or custom scalars
         VariableDefinition: (node) => {
-            hasVariables = true; // Any variable means we need Types import
             const typeName = getBaseTypeName(node.type);
             referencedTypeNames.add(typeName);
         },
@@ -50,8 +55,8 @@ function needsSchemaTypesImport(document, schema, config) {
             referencedTypeNames.add(node.typeCondition.name.value);
         },
     });
-    // If operation has variables, it will use Types.Exact, Types.Scalars, Types.InputMaybe, etc.
-    if (hasVariables) {
+    // All operations generate Variables type that uses Types.Exact
+    if (hasOperation) {
         return true;
     }
     // Helper to recursively check if a type needs importing
@@ -176,17 +181,65 @@ export const preset = {
                     document: singleDefDocument,
                     location: source.documents[0].location,
                 };
+                // Find other fragments in the same source file (they are "local" now but will be "external" after split)
+                const localFragments = definitions
+                    .filter(d => d.definition.kind === Kind.FRAGMENT_DEFINITION && d.name !== name)
+                    .map(d => d.definition);
+                // Add local fragments to external fragments list so they're available during generation
+                const localFragmentNodes = localFragments.map(frag => ({
+                    level: 0,
+                    isExternal: true,
+                    name: frag.name.value,
+                    onType: frag.typeCondition.name.value,
+                    node: frag,
+                }));
+                const allExternalFragments = [
+                    ...source.externalFragments,
+                    ...localFragmentNodes,
+                ];
                 // Update fragment imports to use the correct output path for this operation
                 const updatedFragmentImports = source.fragmentImports.map(fragmentImport => ({
                     ...fragmentImport,
                     outputPath: filename, // Update to actual output path
                 }));
+                // Generate fragment imports for local fragments (they'll be in separate files after splitting)
+                const localFragmentImports = localFragments.map((frag) => {
+                    var _a;
+                    const fragmentFilePath = generateOperationFilePath(source.documents[0].location, frag.name.value, folder, extension);
+                    // Get fragment import identifiers (document + type)
+                    const identifiers = [
+                        {
+                            name: `${frag.name.value}FragmentDoc`,
+                            kind: 'document',
+                        },
+                        {
+                            name: `${frag.name.value}Fragment`,
+                            kind: 'type',
+                        },
+                    ];
+                    return {
+                        baseDir,
+                        baseOutputDir: options.baseOutputDir,
+                        outputPath: filename,
+                        importSource: {
+                            path: fragmentFilePath,
+                            identifiers,
+                        },
+                        emitLegacyCommonJSImports: options.config.emitLegacyCommonJSImports,
+                        importExtension: options.config.importExtension,
+                        typesImport: (_a = options.config.useTypeImports) !== null && _a !== void 0 ? _a : false,
+                    };
+                });
+                const allFragmentImports = [
+                    ...updatedFragmentImports,
+                    ...localFragmentImports,
+                ];
                 // Check if THIS specific operation uses types (not the whole source file)
                 const singleDefDocumentWithFragments = {
                     ...singleDefDocument,
                     definitions: [
                         ...singleDefDocument.definitions,
-                        ...source.externalFragments.map(fragment => fragment.node),
+                        ...allExternalFragments.map(fragment => fragment.node),
                     ],
                 };
                 const needsTypesImport = needsSchemaTypesImport(singleDefDocumentWithFragments, schemaObject, options.config);
@@ -217,8 +270,8 @@ export const preset = {
                     ...options.config,
                     exportFragmentSpreadSubTypes: true,
                     namespacedImportName: importTypesNamespace,
-                    externalFragments: source.externalFragments,
-                    fragmentImports: updatedFragmentImports,
+                    externalFragments: allExternalFragments,
+                    fragmentImports: allFragmentImports,
                 };
                 artifacts.push({
                     ...options,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nmarks/graphql-codegen-per-operation-file-preset",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "GraphQL Code Generator preset for generating one file per operation/fragment",
   "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"