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

package/cjs/index.js

@@ -27,14 +27,17 @@ function extractDefinitions(document) {
  * Check if a document actually needs type imports from the schema.
  * Only returns true if the document uses:
  * - Enums
- * - Custom scalars (not built-in)
+ * - Custom scalars that aren't mapped to primitives
  * - Input types (in variables)
  *
  * Does NOT return true for just referencing object types.
  */
-function needsSchemaTypesImport(document, schema) {
+function needsSchemaTypesImport(document, schema, config) {
     const builtInScalars = ['String', 'Int', 'Float', 'Boolean', 'ID'];
+    const primitiveTypes = ['any', 'string', 'number', 'boolean', 'null', 'undefined', 'void', 'never', 'unknown'];
     let needsImport = false;
+    // Get scalar mappings from config
+    const scalarMappings = config.scalars || {};
     // Collect all type names referenced in the document
     const referencedTypeNames = new Set();
     (0, graphql_1.visit)(document, {
@@ -47,8 +50,6 @@ function needsSchemaTypesImport(document, schema) {
         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) => {
@@ -58,12 +59,33 @@ function needsSchemaTypesImport(document, schema) {
         while ('ofType' in type && type.ofType) {
             type = type.ofType;
         }
-        // Enums need to be imported
+        // Enums always need to be imported
         if ((0, graphql_1.isEnumType)(type)) {
             return true;
         }
-        // Custom scalars (not built-in) need to be imported
+        // Custom scalars need to be imported UNLESS mapped to primitives
         if ((0, graphql_1.isScalarType)(type) && !builtInScalars.includes(type.name)) {
+            // Check if this scalar is mapped to a primitive type
+            const mapping = scalarMappings[type.name];
+            if (mapping) {
+                // If mapped to a primitive type string, no import needed
+                if (typeof mapping === 'string' && primitiveTypes.includes(mapping)) {
+                    return false;
+                }
+                // If mapped to an object like { input: 'any', output: 'any' }, check both
+                if (typeof mapping === 'object') {
+                    const inputMapping = mapping.input || mapping.output;
+                    const outputMapping = mapping.output || mapping.input;
+                    if (primitiveTypes.includes(inputMapping) && primitiveTypes.includes(outputMapping)) {
+                        return false;
+                    }
+                }
+            }
+            else {
+                // No mapping specified, defaults to 'any', so no import needed
+                return false;
+            }
+            // Scalar is mapped to something non-primitive, needs import
             return true;
         }
         // Input types need to be imported
@@ -164,7 +186,7 @@ exports.preset = {
                         ...source.externalFragments.map(fragment => fragment.node),
                     ],
                 };
-                const needsTypesImport = needsSchemaTypesImport(singleDefDocumentWithFragments, schemaObject);
+                const needsTypesImport = needsSchemaTypesImport(singleDefDocumentWithFragments, schemaObject, options.config);
                 // Generate the types import statement if needed
                 const importStatements = [];
                 if (needsTypesImport && !options.config.globalNamespace) {

package/esm/index.js

@@ -23,14 +23,17 @@ function extractDefinitions(document) {
  * Check if a document actually needs type imports from the schema.
  * Only returns true if the document uses:
  * - Enums
- * - Custom scalars (not built-in)
+ * - Custom scalars that aren't mapped to primitives
  * - Input types (in variables)
  *
  * Does NOT return true for just referencing object types.
  */
-function needsSchemaTypesImport(document, schema) {
+function needsSchemaTypesImport(document, schema, config) {
     const builtInScalars = ['String', 'Int', 'Float', 'Boolean', 'ID'];
+    const primitiveTypes = ['any', 'string', 'number', 'boolean', 'null', 'undefined', 'void', 'never', 'unknown'];
     let needsImport = false;
+    // Get scalar mappings from config
+    const scalarMappings = config.scalars || {};
     // Collect all type names referenced in the document
     const referencedTypeNames = new Set();
     visit(document, {
@@ -43,8 +46,6 @@ function needsSchemaTypesImport(document, schema) {
         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) => {
@@ -54,12 +55,33 @@ function needsSchemaTypesImport(document, schema) {
         while ('ofType' in type && type.ofType) {
             type = type.ofType;
         }
-        // Enums need to be imported
+        // Enums always need to be imported
         if (isEnumType(type)) {
             return true;
         }
-        // Custom scalars (not built-in) need to be imported
+        // Custom scalars need to be imported UNLESS mapped to primitives
         if (isScalarType(type) && !builtInScalars.includes(type.name)) {
+            // Check if this scalar is mapped to a primitive type
+            const mapping = scalarMappings[type.name];
+            if (mapping) {
+                // If mapped to a primitive type string, no import needed
+                if (typeof mapping === 'string' && primitiveTypes.includes(mapping)) {
+                    return false;
+                }
+                // If mapped to an object like { input: 'any', output: 'any' }, check both
+                if (typeof mapping === 'object') {
+                    const inputMapping = mapping.input || mapping.output;
+                    const outputMapping = mapping.output || mapping.input;
+                    if (primitiveTypes.includes(inputMapping) && primitiveTypes.includes(outputMapping)) {
+                        return false;
+                    }
+                }
+            }
+            else {
+                // No mapping specified, defaults to 'any', so no import needed
+                return false;
+            }
+            // Scalar is mapped to something non-primitive, needs import
             return true;
         }
         // Input types need to be imported
@@ -160,7 +182,7 @@ export const preset = {
                         ...source.externalFragments.map(fragment => fragment.node),
                     ],
                 };
-                const needsTypesImport = needsSchemaTypesImport(singleDefDocumentWithFragments, schemaObject);
+                const needsTypesImport = needsSchemaTypesImport(singleDefDocumentWithFragments, schemaObject, options.config);
                 // 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.2",
+  "version": "1.0.3",
   "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"