@nmarks/graphql-codegen-per-operation-file-preset 1.0.1 → 1.0.2

package/cjs/index.js

@@ -5,7 +5,6 @@ const tslib_1 = require("tslib");
 const path_1 = require("path");
 const graphql_1 = require("graphql");
 const add_1 = tslib_1.__importDefault(require("@graphql-codegen/add"));
-const plugin_helpers_1 = require("@graphql-codegen/plugin-helpers");
 const visitor_plugin_common_1 = require("@graphql-codegen/visitor-plugin-common");
 const resolve_document_imports_js_1 = require("./resolve-document-imports.js");
 const utils_js_1 = require("./utils.js");
@@ -24,6 +23,87 @@ function extractDefinitions(document) {
     }
     return definitions;
 }
+/**
+ * Check if a document actually needs type imports from the schema.
+ * Only returns true if the document uses:
+ * - Enums
+ * - Custom scalars (not built-in)
+ * - Input types (in variables)
+ *
+ * Does NOT return true for just referencing object types.
+ */
+function needsSchemaTypesImport(document, schema) {
+    const builtInScalars = ['String', 'Int', 'Float', 'Boolean', 'ID'];
+    let needsImport = false;
+    // Collect all type names referenced in the document
+    const referencedTypeNames = new Set();
+    (0, graphql_1.visit)(document, {
+        // Check variable types for input types or custom scalars
+        VariableDefinition: (node) => {
+            const typeName = getBaseTypeName(node.type);
+            referencedTypeNames.add(typeName);
+        },
+        // Collect fragment type conditions
+        FragmentDefinition: (node) => {
+            referencedTypeNames.add(node.typeCondition.name.value);
+        },
+        // We need to traverse into nested fields, so we'll collect all types
+        // This is a simplified approach - we'll check all types that might be used
+    });
+    // Helper to recursively check if a type needs importing
+    const checkType = (type) => {
+        if (!type)
+            return false;
+        // Unwrap lists and non-null
+        while ('ofType' in type && type.ofType) {
+            type = type.ofType;
+        }
+        // Enums need to be imported
+        if ((0, graphql_1.isEnumType)(type)) {
+            return true;
+        }
+        // Custom scalars (not built-in) need to be imported
+        if ((0, graphql_1.isScalarType)(type) && !builtInScalars.includes(type.name)) {
+            return true;
+        }
+        // Input types need to be imported
+        if ((0, graphql_1.isInputObjectType)(type)) {
+            return true;
+        }
+        return false;
+    };
+    // Check variable types
+    for (const typeName of referencedTypeNames) {
+        const type = schema.getType(typeName);
+        if (checkType(type)) {
+            return true;
+        }
+    }
+    // Now we need to check all fields in the document to see if any return enums/custom scalars
+    // We'll do a more thorough traversal with TypeInfo
+    const typeInfo = new graphql_1.TypeInfo(schema);
+    (0, graphql_1.visit)(document, (0, graphql_1.visitWithTypeInfo)(typeInfo, {
+        Field: () => {
+            const fieldType = typeInfo.getType();
+            if (checkType(fieldType)) {
+                needsImport = true;
+            }
+        },
+    }));
+    return needsImport;
+}
+/**
+ * Extract the base type name from a type node
+ */
+function getBaseTypeName(type) {
+    if (type.kind === 'NamedType') {
+        return type.name.value;
+    }
+    if (type.kind === 'ListType' || type.kind === 'NonNullType') {
+        return getBaseTypeName(type.type);
+    }
+    return '';
+}
 exports.preset = {
     buildGeneratesSection: options => {
         var _a, _b;
@@ -84,7 +164,7 @@ exports.preset = {
                         ...source.externalFragments.map(fragment => fragment.node),
                     ],
                 };
-                const needsTypesImport = (0, plugin_helpers_1.isUsingTypes)(singleDefDocumentWithFragments, [], schemaObject);
+                const needsTypesImport = needsSchemaTypesImport(singleDefDocumentWithFragments, schemaObject);
                 // Generate the types import statement if needed
                 const importStatements = [];
                 if (needsTypesImport && !options.config.globalNamespace) {

package/esm/index.js

@@ -1,7 +1,6 @@
 import { join } from 'path';
-import { buildASTSchema, Kind } from 'graphql';
+import { buildASTSchema, isEnumType, isInputObjectType, isScalarType, Kind, TypeInfo, visit, visitWithTypeInfo } from 'graphql';
 import addPlugin from '@graphql-codegen/add';
-import { isUsingTypes } from '@graphql-codegen/plugin-helpers';
 import { generateImportStatement, getConfigValue, resolveImportSource, } from '@graphql-codegen/visitor-plugin-common';
 import { resolveDocumentImports } from './resolve-document-imports.js';
 import { generateOperationFilePath } from './utils.js';
@@ -20,6 +19,87 @@ function extractDefinitions(document) {
     }
     return definitions;
 }
+/**
+ * Check if a document actually needs type imports from the schema.
+ * Only returns true if the document uses:
+ * - Enums
+ * - Custom scalars (not built-in)
+ * - Input types (in variables)
+ *
+ * Does NOT return true for just referencing object types.
+ */
+function needsSchemaTypesImport(document, schema) {
+    const builtInScalars = ['String', 'Int', 'Float', 'Boolean', 'ID'];
+    let needsImport = false;
+    // Collect all type names referenced in the document
+    const referencedTypeNames = new Set();
+    visit(document, {
+        // Check variable types for input types or custom scalars
+        VariableDefinition: (node) => {
+            const typeName = getBaseTypeName(node.type);
+            referencedTypeNames.add(typeName);
+        },
+        // Collect fragment type conditions
+        FragmentDefinition: (node) => {
+            referencedTypeNames.add(node.typeCondition.name.value);
+        },
+        // We need to traverse into nested fields, so we'll collect all types
+        // This is a simplified approach - we'll check all types that might be used
+    });
+    // Helper to recursively check if a type needs importing
+    const checkType = (type) => {
+        if (!type)
+            return false;
+        // Unwrap lists and non-null
+        while ('ofType' in type && type.ofType) {
+            type = type.ofType;
+        }
+        // Enums need to be imported
+        if (isEnumType(type)) {
+            return true;
+        }
+        // Custom scalars (not built-in) need to be imported
+        if (isScalarType(type) && !builtInScalars.includes(type.name)) {
+            return true;
+        }
+        // Input types need to be imported
+        if (isInputObjectType(type)) {
+            return true;
+        }
+        return false;
+    };
+    // Check variable types
+    for (const typeName of referencedTypeNames) {
+        const type = schema.getType(typeName);
+        if (checkType(type)) {
+            return true;
+        }
+    }
+    // Now we need to check all fields in the document to see if any return enums/custom scalars
+    // We'll do a more thorough traversal with TypeInfo
+    const typeInfo = new TypeInfo(schema);
+    visit(document, visitWithTypeInfo(typeInfo, {
+        Field: () => {
+            const fieldType = typeInfo.getType();
+            if (checkType(fieldType)) {
+                needsImport = true;
+            }
+        },
+    }));
+    return needsImport;
+}
+/**
+ * Extract the base type name from a type node
+ */
+function getBaseTypeName(type) {
+    if (type.kind === 'NamedType') {
+        return type.name.value;
+    }
+    if (type.kind === 'ListType' || type.kind === 'NonNullType') {
+        return getBaseTypeName(type.type);
+    }
+    return '';
+}
 export const preset = {
     buildGeneratesSection: options => {
         var _a, _b;
@@ -80,7 +160,7 @@ export const preset = {
                         ...source.externalFragments.map(fragment => fragment.node),
                     ],
                 };
-                const needsTypesImport = isUsingTypes(singleDefDocumentWithFragments, [], schemaObject);
+                const needsTypesImport = needsSchemaTypesImport(singleDefDocumentWithFragments, schemaObject);
                 // Generate the types import statement if needed
                 const importStatements = [];
                 if (needsTypesImport && !options.config.globalNamespace) {

package/package.json

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