@nmarks/graphql-codegen-per-operation-file-preset 1.0.9 → 1.0.10

package/cjs/index.js

@@ -24,18 +24,17 @@ function extractDefinitions(document) {
     return definitions;
 }
 /**
- * Finds "local" fragments - fragments defined in the same source file as the current definition.
- * These are initially local but become external after we split the file per-operation.
- *
- * Example:
- * Source file has: query MyQuery { ...MyFragment } + fragment MyFragment { ... }
- * After split: MyQuery.ts needs to import from MyFragment.ts
+ * Collects all fragment names directly referenced by a definition via FragmentSpread nodes.
+ * This only gets DIRECT references - not transitive dependencies.
  */
-function findLocalFragments(allDefinitions, currentDefinitionName) {
-    return allDefinitions
-        .filter(d => d.definition.kind === graphql_1.Kind.FRAGMENT_DEFINITION &&
-        d.name !== currentDefinitionName)
-        .map(d => d.definition);
+function getDirectlyReferencedFragments(definition) {
+    const referencedFragments = new Set();
+    (0, graphql_1.visit)(definition, {
+        FragmentSpread: (node) => {
+            referencedFragments.add(node.name.value);
+        },
+    });
+    return referencedFragments;
 }
 /**
  * Creates LoadedFragment objects for local fragments so they can be treated as external fragments
@@ -50,6 +49,54 @@ function createLoadedFragments(fragments) {
         node: frag,
     }));
 }
+/**
+ * Analyzes fragment dependencies for a definition.
+ *
+ * Returns two sets:
+ * 1. `allNeeded` - ALL fragments needed (including transitive) - for externalFragments
+ * 2. `directlyNeeded` - Only DIRECT dependencies - for fragmentImports
+ *
+ * Why the distinction?
+ * - `externalFragments` must include all transitive deps so the plugin can resolve types
+ * - `fragmentImports` should only include direct deps; transitive deps are imported by intermediate files
+ *
+ * Example: Query → FragA → FragB
+ * - Query's externalFragments: [FragA, FragB] (plugin needs both)
+ * - Query's fragmentImports: [FragA] (only direct; FragA.ts imports FragB)
+ *
+ * @param definition - The operation/fragment definition to analyze
+ * @param externalFragments - All external fragments available (from other files)
+ * @param localFragmentMap - Map of local fragment names to their definitions
+ */
+function analyzeFragmentDependencies(definition, externalFragments, localFragmentMap) {
+    const allNeeded = new Set();
+    // Build a map for quick lookup of external fragment nodes
+    const externalFragmentMap = new Map();
+    for (const frag of externalFragments) {
+        externalFragmentMap.set(frag.name, frag.node);
+    }
+    function collectTransitive(fragmentNames) {
+        for (const name of fragmentNames) {
+            if (allNeeded.has(name))
+                continue;
+            // Check if this fragment exists (either local or external)
+            const localDef = localFragmentMap.get(name);
+            const externalDef = externalFragmentMap.get(name);
+            const fragmentDef = localDef || externalDef;
+            if (fragmentDef) {
+                allNeeded.add(name);
+                // Get transitive dependencies
+                const transitiveDeps = getDirectlyReferencedFragments(fragmentDef);
+                collectTransitive(transitiveDeps);
+            }
+        }
+    }
+    // Get direct references from the definition
+    const directlyNeeded = getDirectlyReferencedFragments(definition);
+    // Collect all transitive dependencies (includes direct ones)
+    collectTransitive(directlyNeeded);
+    return { allNeeded, directlyNeeded };
+}
 /**
  * Creates fragment import declarations for local fragments.
  * After splitting, these fragments will be in separate files, so we need to generate imports.
@@ -327,25 +374,72 @@ exports.preset = {
                  * resolver marked MyFrag as "local" (same document).
                  *
                  * Solution: Treat local fragments as external after splitting.
+                 * Only include fragments that are actually referenced by this definition.
                  */
-                const localFragments = findLocalFragments(definitions, name);
-                const localFragmentNodes = createLoadedFragments(localFragments);
-                // Combine external fragments (from other files) + local fragments (same source file)
+                // Build a map of local fragment names -> definitions for lookup
+                const localFragmentMap = new Map();
+                for (const d of definitions) {
+                    if (d.definition.kind === graphql_1.Kind.FRAGMENT_DEFINITION && d.name !== name) {
+                        localFragmentMap.set(d.name, d.definition);
+                    }
+                }
+                /**
+                 * ANALYZE FRAGMENT DEPENDENCIES
+                 *
+                 * We need two different sets of fragments:
+                 * 1. allNeeded - ALL transitive deps for externalFragments (plugin needs these for type resolution)
+                 * 2. directlyNeeded - Only DIRECT deps for fragmentImports (transitive deps handled by intermediate files)
+                 *
+                 * Example: Query → FragA → FragB
+                 * - externalFragments: [FragA, FragB] (plugin needs both for types)
+                 * - fragmentImports: [FragA] (only direct; FragA.ts already imports FragB)
+                 */
+                const { allNeeded, directlyNeeded } = analyzeFragmentDependencies(definition, source.externalFragments, localFragmentMap);
+                // Filter local fragments to only those in the transitive dependency set
+                // (for externalFragments - plugin needs all of them)
+                const allLocalFragments = Array.from(localFragmentMap.entries())
+                    .filter(([fragName]) => allNeeded.has(fragName))
+                    .map(([, fragDef]) => fragDef);
+                const localFragmentNodes = createLoadedFragments(allLocalFragments);
+                // Filter external fragments to only those actually needed by this definition
+                const filteredExternalFragments = source.externalFragments.filter(frag => allNeeded.has(frag.name));
+                // Combine filtered external fragments + local fragments (all transitive deps)
                 const allExternalFragments = [
-                    ...source.externalFragments,
+                    ...filteredExternalFragments,
                     ...localFragmentNodes,
                 ];
                 /**
                  * UPDATE FRAGMENT IMPORTS
                  *
-                 * 1. External fragments: Update outputPath to this operation's file
-                 * 2. Local fragments: Generate new imports pointing to their split files
+                 * Only import DIRECT dependencies, not transitive ones.
+                 * Transitive dependencies are imported by the intermediate fragment files.
+                 *
+                 * 1. External fragments: Filter to only DIRECTLY needed ones, update outputPath
+                 * 2. Local fragments: Generate imports only for DIRECTLY referenced fragments
                  */
-                const updatedFragmentImports = source.fragmentImports.map(fragmentImport => ({
+                const updatedFragmentImports = source.fragmentImports
+                    // Filter to only include imports for fragments DIRECTLY referenced
+                    .filter(fragmentImport => {
+                    // Check if any of the import's identifiers are for directly needed fragments
+                    return fragmentImport.importSource.identifiers.some(id => {
+                        // Check if this identifier's name matches a directly needed fragment
+                        for (const neededName of directlyNeeded) {
+                            if (id.name === neededName || id.name.startsWith(neededName)) {
+                                return true;
+                            }
+                        }
+                        return false;
+                    });
+                })
+                    .map(fragmentImport => ({
                     ...fragmentImport,
                     outputPath: filename,
                 }));
-                const localFragmentImports = createLocalFragmentImports(localFragments, fragmentRegistry, source.documents[0].location, filename, folder, extension, {
+                // Only create imports for DIRECTLY referenced local fragments
+                const directlyNeededLocalFragments = Array.from(localFragmentMap.entries())
+                    .filter(([fragName]) => directlyNeeded.has(fragName))
+                    .map(([, fragDef]) => fragDef);
+                const localFragmentImports = createLocalFragmentImports(directlyNeededLocalFragments, fragmentRegistry, source.documents[0].location, filename, folder, extension, {
                     baseDir,
                     baseOutputDir: options.baseOutputDir,
                     emitLegacyCommonJSImports: options.config.emitLegacyCommonJSImports,

package/esm/index.js

@@ -20,18 +20,17 @@ function extractDefinitions(document) {
     return definitions;
 }
 /**
- * Finds "local" fragments - fragments defined in the same source file as the current definition.
- * These are initially local but become external after we split the file per-operation.
- *
- * Example:
- * Source file has: query MyQuery { ...MyFragment } + fragment MyFragment { ... }
- * After split: MyQuery.ts needs to import from MyFragment.ts
+ * Collects all fragment names directly referenced by a definition via FragmentSpread nodes.
+ * This only gets DIRECT references - not transitive dependencies.
  */
-function findLocalFragments(allDefinitions, currentDefinitionName) {
-    return allDefinitions
-        .filter(d => d.definition.kind === Kind.FRAGMENT_DEFINITION &&
-        d.name !== currentDefinitionName)
-        .map(d => d.definition);
+function getDirectlyReferencedFragments(definition) {
+    const referencedFragments = new Set();
+    visit(definition, {
+        FragmentSpread: (node) => {
+            referencedFragments.add(node.name.value);
+        },
+    });
+    return referencedFragments;
 }
 /**
  * Creates LoadedFragment objects for local fragments so they can be treated as external fragments
@@ -46,6 +45,54 @@ function createLoadedFragments(fragments) {
         node: frag,
     }));
 }
+/**
+ * Analyzes fragment dependencies for a definition.
+ *
+ * Returns two sets:
+ * 1. `allNeeded` - ALL fragments needed (including transitive) - for externalFragments
+ * 2. `directlyNeeded` - Only DIRECT dependencies - for fragmentImports
+ *
+ * Why the distinction?
+ * - `externalFragments` must include all transitive deps so the plugin can resolve types
+ * - `fragmentImports` should only include direct deps; transitive deps are imported by intermediate files
+ *
+ * Example: Query → FragA → FragB
+ * - Query's externalFragments: [FragA, FragB] (plugin needs both)
+ * - Query's fragmentImports: [FragA] (only direct; FragA.ts imports FragB)
+ *
+ * @param definition - The operation/fragment definition to analyze
+ * @param externalFragments - All external fragments available (from other files)
+ * @param localFragmentMap - Map of local fragment names to their definitions
+ */
+function analyzeFragmentDependencies(definition, externalFragments, localFragmentMap) {
+    const allNeeded = new Set();
+    // Build a map for quick lookup of external fragment nodes
+    const externalFragmentMap = new Map();
+    for (const frag of externalFragments) {
+        externalFragmentMap.set(frag.name, frag.node);
+    }
+    function collectTransitive(fragmentNames) {
+        for (const name of fragmentNames) {
+            if (allNeeded.has(name))
+                continue;
+            // Check if this fragment exists (either local or external)
+            const localDef = localFragmentMap.get(name);
+            const externalDef = externalFragmentMap.get(name);
+            const fragmentDef = localDef || externalDef;
+            if (fragmentDef) {
+                allNeeded.add(name);
+                // Get transitive dependencies
+                const transitiveDeps = getDirectlyReferencedFragments(fragmentDef);
+                collectTransitive(transitiveDeps);
+            }
+        }
+    }
+    // Get direct references from the definition
+    const directlyNeeded = getDirectlyReferencedFragments(definition);
+    // Collect all transitive dependencies (includes direct ones)
+    collectTransitive(directlyNeeded);
+    return { allNeeded, directlyNeeded };
+}
 /**
  * Creates fragment import declarations for local fragments.
  * After splitting, these fragments will be in separate files, so we need to generate imports.
@@ -323,25 +370,72 @@ export const preset = {
                  * resolver marked MyFrag as "local" (same document).
                  *
                  * Solution: Treat local fragments as external after splitting.
+                 * Only include fragments that are actually referenced by this definition.
                  */
-                const localFragments = findLocalFragments(definitions, name);
-                const localFragmentNodes = createLoadedFragments(localFragments);
-                // Combine external fragments (from other files) + local fragments (same source file)
+                // Build a map of local fragment names -> definitions for lookup
+                const localFragmentMap = new Map();
+                for (const d of definitions) {
+                    if (d.definition.kind === Kind.FRAGMENT_DEFINITION && d.name !== name) {
+                        localFragmentMap.set(d.name, d.definition);
+                    }
+                }
+                /**
+                 * ANALYZE FRAGMENT DEPENDENCIES
+                 *
+                 * We need two different sets of fragments:
+                 * 1. allNeeded - ALL transitive deps for externalFragments (plugin needs these for type resolution)
+                 * 2. directlyNeeded - Only DIRECT deps for fragmentImports (transitive deps handled by intermediate files)
+                 *
+                 * Example: Query → FragA → FragB
+                 * - externalFragments: [FragA, FragB] (plugin needs both for types)
+                 * - fragmentImports: [FragA] (only direct; FragA.ts already imports FragB)
+                 */
+                const { allNeeded, directlyNeeded } = analyzeFragmentDependencies(definition, source.externalFragments, localFragmentMap);
+                // Filter local fragments to only those in the transitive dependency set
+                // (for externalFragments - plugin needs all of them)
+                const allLocalFragments = Array.from(localFragmentMap.entries())
+                    .filter(([fragName]) => allNeeded.has(fragName))
+                    .map(([, fragDef]) => fragDef);
+                const localFragmentNodes = createLoadedFragments(allLocalFragments);
+                // Filter external fragments to only those actually needed by this definition
+                const filteredExternalFragments = source.externalFragments.filter(frag => allNeeded.has(frag.name));
+                // Combine filtered external fragments + local fragments (all transitive deps)
                 const allExternalFragments = [
-                    ...source.externalFragments,
+                    ...filteredExternalFragments,
                     ...localFragmentNodes,
                 ];
                 /**
                  * UPDATE FRAGMENT IMPORTS
                  *
-                 * 1. External fragments: Update outputPath to this operation's file
-                 * 2. Local fragments: Generate new imports pointing to their split files
+                 * Only import DIRECT dependencies, not transitive ones.
+                 * Transitive dependencies are imported by the intermediate fragment files.
+                 *
+                 * 1. External fragments: Filter to only DIRECTLY needed ones, update outputPath
+                 * 2. Local fragments: Generate imports only for DIRECTLY referenced fragments
                  */
-                const updatedFragmentImports = source.fragmentImports.map(fragmentImport => ({
+                const updatedFragmentImports = source.fragmentImports
+                    // Filter to only include imports for fragments DIRECTLY referenced
+                    .filter(fragmentImport => {
+                    // Check if any of the import's identifiers are for directly needed fragments
+                    return fragmentImport.importSource.identifiers.some(id => {
+                        // Check if this identifier's name matches a directly needed fragment
+                        for (const neededName of directlyNeeded) {
+                            if (id.name === neededName || id.name.startsWith(neededName)) {
+                                return true;
+                            }
+                        }
+                        return false;
+                    });
+                })
+                    .map(fragmentImport => ({
                     ...fragmentImport,
                     outputPath: filename,
                 }));
-                const localFragmentImports = createLocalFragmentImports(localFragments, fragmentRegistry, source.documents[0].location, filename, folder, extension, {
+                // Only create imports for DIRECTLY referenced local fragments
+                const directlyNeededLocalFragments = Array.from(localFragmentMap.entries())
+                    .filter(([fragName]) => directlyNeeded.has(fragName))
+                    .map(([, fragDef]) => fragDef);
+                const localFragmentImports = createLocalFragmentImports(directlyNeededLocalFragments, fragmentRegistry, source.documents[0].location, filename, folder, extension, {
                     baseDir,
                     baseOutputDir: options.baseOutputDir,
                     emitLegacyCommonJSImports: options.config.emitLegacyCommonJSImports,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nmarks/graphql-codegen-per-operation-file-preset",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "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"