graphql-data-generator 0.4.1-alpha.4 → 0.4.1-alpha.6

package/esm/codegen.js

@@ -175,6 +175,7 @@ const getSelectionsType = (name, selections, definitions, fragments, references,
                 if (!fragment) {
                     throw new Error(`Could not find fragment '${selection.name.value}' in '${name}'`);
                 }
+                // Fragment is automatically considered used
                 selectionTypes.push(...getSelectionsType(fragment.typeCondition.name.value, fragment.selectionSet.selections, definitions, fragments, references, includeTypenames).map(([name, type, group]) => [
                     name,
                     type,
@@ -561,6 +562,55 @@ ${usedTypes.map(([name]) => `  ${name}: ${rename(name)};`).join("\n")}
             ? `[${type.fields?.filter((f) => usage.has(f.name.value)).map((v) => `"${v.name.value}"`).join(", ")}]`
             : "[]"}`).join(",\n")},\n} as const;`);
     }
+    // Generate types for fragments
+    const fragmentTypes = Object.entries(fragments).map(([fragmentName, fragment]) => {
+        const fragmentSelections = getSelectionsType(fragment.typeCondition.name.value, fragment.selectionSet.selections, types, fragments, references, includeTypenames);
+        const fragmentFields = fragmentSelections.reduce((fields, [name, type]) => {
+            fields[name] = type;
+            return fields;
+        }, {});
+        // Add __typename for object types  
+        const baseTypeDef = types[fragment.typeCondition.name.value];
+        if (includeTypenames && baseTypeDef?.[0].kind === "ObjectTypeDefinition") {
+            Object.defineProperty(fragmentFields, "__typename", {
+                enumerable: true,
+                value: {
+                    kind: "StringLiteral",
+                    value: fragment.typeCondition.name.value,
+                    optional: false,
+                },
+            });
+        }
+        return [
+            fragmentName,
+            {
+                kind: "Object",
+                value: fragmentFields,
+                optional: false,
+            },
+            [...new Set(fragmentSelections.map(([name]) => name))]
+        ];
+    });
+    if (fragmentTypes.length) {
+        serializedTypes.unshift(...fragmentTypes.map(([name, type, _fields]) => `${exports.includes("types") ? "export " : ""}type ${name} = ${serializeType(type, false)};`).filter(filterOutputTypes));
+        // Update Types export to include fragments
+        const typesIndex = serializedTypes.findIndex(line => line?.startsWith("export type Types = {"));
+        if (typesIndex !== -1) {
+            const existingTypesExport = serializedTypes[typesIndex];
+            const updatedTypesExport = existingTypesExport.replace("export type Types = {", `export type Types = {
+${fragmentTypes.map(([name]) => `  ${name}: ${name};`).join("\n")}${usedTypes.length ? "\n" : ""}`);
+            serializedTypes[typesIndex] = updatedTypesExport;
+        }
+        // Update types const export to include fragments  
+        const typesConstIndex = serializedTypes.findIndex(line => line?.startsWith("export const types = {"));
+        if (typesConstIndex !== -1) {
+            const existingTypesConstExport = serializedTypes[typesConstIndex];
+            const fragmentTypesConst = fragmentTypes.map(([name, , fields]) => `  ${name}: [${fields.map(f => `"${f}"`).join(", ")}]`).join(",\n");
+            const updatedTypesConstExport = existingTypesConstExport.replace("export const types = {", `export const types = {
+${fragmentTypesConst}${usedTypes.length && fragmentTypes.length ? "," : ""}${usedTypes.length ? "\n" : ""}`);
+            serializedTypes[typesConstIndex] = updatedTypesConstExport;
+        }
+    }
     const usedReferences = Object.values(references).filter((r) => r[1]).map((r) => r[0]);
     serializedTypes.unshift(...usedReferences.map((r) => {
         // TODO: warn if missing and use unknown instead

package/esm/init.js

@@ -56,7 +56,7 @@ const getOperationContent = (path, operationName) => {
 // Helper: Unwraps non-null and list wrappers to get the named type.
 const getNamedType = (type) => type.kind === Kind.NAMED_TYPE ? type.name.value : getNamedType(type.type);
 // Helper: Find a type definition in the document by name.
-const getTypeDef = (doc, typeName) => doc.definitions.find((def) => "name" in def && def.name?.value === typeName);
+const getTypeDef = (definitions, typeName) => definitions.find((def) => "name" in def && def.name?.value === typeName);
 /**
  * Initialize the data builder.
  * @param schema The plain text of your schema.
@@ -69,6 +69,32 @@ const getTypeDef = (doc, typeName) => doc.definitions.find((def) => "name" in de
  */
 export const init = (schema, queries, mutations, subscriptions, types, inputs, scalars, options) => (fn) => {
     const doc = parse(schema);
+    // Collect all fragment definitions from operation files
+    const fragmentDefinitions = [];
+    const collectFragments = (filePath, operationName) => {
+        try {
+            // If we have an operation name, use it; otherwise try to parse the file directly
+            let document;
+            if (operationName) {
+                document = getOperationContent(filePath, operationName);
+            }
+            else {
+                // Parse the file directly to get all definitions including fragments
+                const fileContent = loadFile(filePath);
+                document = parse(fileContent);
+            }
+            fragmentDefinitions.push(...document.definitions.filter((def) => def.kind === Kind.FRAGMENT_DEFINITION));
+        }
+        catch {
+            // Ignore files that can't be parsed
+        }
+    };
+    // Collect fragments from all operation files (parse entire files to get all fragments)
+    Object.values(queries).forEach(path => collectFragments(path));
+    Object.values(mutations).forEach(path => collectFragments(path));
+    Object.values(subscriptions).forEach(path => collectFragments(path));
+    // Combine schema definitions with fragment definitions
+    const allDefinitions = [...doc.definitions, ...fragmentDefinitions];
     const build = {};
     const transforms = fn(build);
     const addObjectTransforms = (type, obj) => {
@@ -94,7 +120,7 @@ export const init = (schema, queries, mutations, subscriptions, types, inputs, s
         const fields = types[type];
         if (!fields)
             return;
-        const typeDef = getTypeDef(doc, type);
+        const typeDef = getTypeDef(allDefinitions, type);
         if (!typeDef || !("fields" in typeDef))
             return;
         const selectionSet = {
@@ -113,7 +139,7 @@ export const init = (schema, queries, mutations, subscriptions, types, inputs, s
             if (fieldDef) {
                 // Get the inner (named) type of the field.
                 const fieldTypeName = getNamedType(fieldDef.type);
-                const fieldTypeDef = getTypeDef(doc, fieldTypeName);
+                const fieldTypeDef = getTypeDef(allDefinitions, fieldTypeName);
                 // If the field is an Object, build its selection set recursively.
                 if (fieldTypeDef &&
                     fieldTypeDef.kind === Kind.OBJECT_TYPE_DEFINITION) {
@@ -123,7 +149,7 @@ export const init = (schema, queries, mutations, subscriptions, types, inputs, s
                 } // If the field is an Interface, treat it like a union:
                 // find all Object types that implement this interface and build inline fragments.
                 else if (fieldTypeDef?.kind === Kind.INTERFACE_TYPE_DEFINITION) {
-                    const implementingTypes = doc.definitions.filter((def) => def.kind === Kind.OBJECT_TYPE_DEFINITION &&
+                    const implementingTypes = allDefinitions.filter((def) => def.kind === Kind.OBJECT_TYPE_DEFINITION &&
                         (def.interfaces?.some((iface) => iface.name.value === fieldTypeName) ?? false));
                     const inlineFragments = implementingTypes.map((impl) => ({
                         kind: Kind.INLINE_FRAGMENT,
@@ -164,7 +190,7 @@ export const init = (schema, queries, mutations, subscriptions, types, inputs, s
         });
         return selectionSet;
     };
-    const wrap = (type, patches) => withGetDefaultPatch((type) => transforms[type]?.default, () => toObject(_proxy(doc.definitions, scalars, type, patches, {
+    const wrap = (type, patches) => withGetDefaultPatch((type) => transforms[type]?.default, () => toObject(_proxy(allDefinitions, scalars, type, patches, {
         selectionSet: getSelectionSet(type),
     })));
     const objectBuilder = (type) => addObjectTransforms(type, (...patches) => {
@@ -274,7 +300,7 @@ export const init = (schema, queries, mutations, subscriptions, types, inputs, s
                 patches = [transforms[name].default, ...patches];
             }
             const { mock, parsedQuery } = withGetDefaultPatch((type) => transforms[type]?.default, () => {
-                const { request: { query: parsedQuery, ...request }, ...raw } = operation(doc.definitions, scalars, query, ...patches);
+                const { request: { query: parsedQuery, ...request }, ...raw } = operation(allDefinitions, scalars, query, ...patches);
                 const mock = toObject({
                     request: { ...request },
                     ...raw,

package/esm/proxy.js

@@ -43,10 +43,24 @@ const resolveType = (definitions, path) => {
                     name: { kind: Kind.NAME, value: name },
                 };
             }
-            type = {
-                kind: Kind.NON_NULL_TYPE,
-                type: { kind: Kind.NAMED_TYPE, name: { kind: Kind.NAME, value: name } },
-            };
+            // Check if this is a fragment type
+            if (!definition) {
+                const fragment = definitions.find((d) => d.kind === Kind.FRAGMENT_DEFINITION && d.name.value === name);
+                if (fragment) {
+                    // Use the fragment definition directly
+                    definition = fragment;
+                    type = {
+                        kind: Kind.NON_NULL_TYPE,
+                        type: { kind: Kind.NAMED_TYPE, name: { kind: Kind.NAME, value: name } },
+                    };
+                }
+            }
+            if (!type) {
+                type = {
+                    kind: Kind.NON_NULL_TYPE,
+                    type: { kind: Kind.NAMED_TYPE, name: { kind: Kind.NAME, value: name } },
+                };
+            }
         }
         else {
             parent = definition.name.value;
@@ -594,6 +608,15 @@ export const _proxy = (definitions, scalars, path, patches, { prev, resolvedType
                 return prev;
             return definition.values?.[0]?.name.value;
         }
+        case Kind.FRAGMENT_DEFINITION: {
+            // For fragments, create a proxy for the base type with the fragment's selection set
+            const baseTypeName = definition.typeCondition.name.value;
+            return _proxy(definitions, scalars, baseTypeName, patches, {
+                prev,
+                selectionSet: definition.selectionSet,
+                nonNull: true,
+            });
+        }
         default:
             throw new Error(`Unhandled definition kind '${definition.kind}'`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql-data-generator",
-  "version": "0.4.1-alpha.4",
+  "version": "0.4.1-alpha.6",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/voces/graphql-data-generator.git"

package/script/codegen.js

@@ -181,6 +181,7 @@ const getSelectionsType = (name, selections, definitions, fragments, references,
                 if (!fragment) {
                     throw new Error(`Could not find fragment '${selection.name.value}' in '${name}'`);
                 }
+                // Fragment is automatically considered used
                 selectionTypes.push(...getSelectionsType(fragment.typeCondition.name.value, fragment.selectionSet.selections, definitions, fragments, references, includeTypenames).map(([name, type, group]) => [
                     name,
                     type,
@@ -567,6 +568,55 @@ ${usedTypes.map(([name]) => `  ${name}: ${rename(name)};`).join("\n")}
             ? `[${type.fields?.filter((f) => usage.has(f.name.value)).map((v) => `"${v.name.value}"`).join(", ")}]`
             : "[]"}`).join(",\n")},\n} as const;`);
     }
+    // Generate types for fragments
+    const fragmentTypes = Object.entries(fragments).map(([fragmentName, fragment]) => {
+        const fragmentSelections = getSelectionsType(fragment.typeCondition.name.value, fragment.selectionSet.selections, types, fragments, references, includeTypenames);
+        const fragmentFields = fragmentSelections.reduce((fields, [name, type]) => {
+            fields[name] = type;
+            return fields;
+        }, {});
+        // Add __typename for object types  
+        const baseTypeDef = types[fragment.typeCondition.name.value];
+        if (includeTypenames && baseTypeDef?.[0].kind === "ObjectTypeDefinition") {
+            Object.defineProperty(fragmentFields, "__typename", {
+                enumerable: true,
+                value: {
+                    kind: "StringLiteral",
+                    value: fragment.typeCondition.name.value,
+                    optional: false,
+                },
+            });
+        }
+        return [
+            fragmentName,
+            {
+                kind: "Object",
+                value: fragmentFields,
+                optional: false,
+            },
+            [...new Set(fragmentSelections.map(([name]) => name))]
+        ];
+    });
+    if (fragmentTypes.length) {
+        serializedTypes.unshift(...fragmentTypes.map(([name, type, _fields]) => `${exports.includes("types") ? "export " : ""}type ${name} = ${serializeType(type, false)};`).filter(filterOutputTypes));
+        // Update Types export to include fragments
+        const typesIndex = serializedTypes.findIndex(line => line?.startsWith("export type Types = {"));
+        if (typesIndex !== -1) {
+            const existingTypesExport = serializedTypes[typesIndex];
+            const updatedTypesExport = existingTypesExport.replace("export type Types = {", `export type Types = {
+${fragmentTypes.map(([name]) => `  ${name}: ${name};`).join("\n")}${usedTypes.length ? "\n" : ""}`);
+            serializedTypes[typesIndex] = updatedTypesExport;
+        }
+        // Update types const export to include fragments  
+        const typesConstIndex = serializedTypes.findIndex(line => line?.startsWith("export const types = {"));
+        if (typesConstIndex !== -1) {
+            const existingTypesConstExport = serializedTypes[typesConstIndex];
+            const fragmentTypesConst = fragmentTypes.map(([name, , fields]) => `  ${name}: [${fields.map(f => `"${f}"`).join(", ")}]`).join(",\n");
+            const updatedTypesConstExport = existingTypesConstExport.replace("export const types = {", `export const types = {
+${fragmentTypesConst}${usedTypes.length && fragmentTypes.length ? "," : ""}${usedTypes.length ? "\n" : ""}`);
+            serializedTypes[typesConstIndex] = updatedTypesConstExport;
+        }
+    }
     const usedReferences = Object.values(references).filter((r) => r[1]).map((r) => r[0]);
     serializedTypes.unshift(...usedReferences.map((r) => {
         // TODO: warn if missing and use unknown instead

package/script/init.js

@@ -82,7 +82,7 @@ const getOperationContent = (path, operationName) => {
 // Helper: Unwraps non-null and list wrappers to get the named type.
 const getNamedType = (type) => type.kind === graphql_1.Kind.NAMED_TYPE ? type.name.value : getNamedType(type.type);
 // Helper: Find a type definition in the document by name.
-const getTypeDef = (doc, typeName) => doc.definitions.find((def) => "name" in def && def.name?.value === typeName);
+const getTypeDef = (definitions, typeName) => definitions.find((def) => "name" in def && def.name?.value === typeName);
 /**
  * Initialize the data builder.
  * @param schema The plain text of your schema.
@@ -95,6 +95,32 @@ const getTypeDef = (doc, typeName) => doc.definitions.find((def) => "name" in de
  */
 const init = (schema, queries, mutations, subscriptions, types, inputs, scalars, options) => (fn) => {
     const doc = (0, graphql_1.parse)(schema);
+    // Collect all fragment definitions from operation files
+    const fragmentDefinitions = [];
+    const collectFragments = (filePath, operationName) => {
+        try {
+            // If we have an operation name, use it; otherwise try to parse the file directly
+            let document;
+            if (operationName) {
+                document = getOperationContent(filePath, operationName);
+            }
+            else {
+                // Parse the file directly to get all definitions including fragments
+                const fileContent = loadFile(filePath);
+                document = (0, graphql_1.parse)(fileContent);
+            }
+            fragmentDefinitions.push(...document.definitions.filter((def) => def.kind === graphql_1.Kind.FRAGMENT_DEFINITION));
+        }
+        catch {
+            // Ignore files that can't be parsed
+        }
+    };
+    // Collect fragments from all operation files (parse entire files to get all fragments)
+    Object.values(queries).forEach(path => collectFragments(path));
+    Object.values(mutations).forEach(path => collectFragments(path));
+    Object.values(subscriptions).forEach(path => collectFragments(path));
+    // Combine schema definitions with fragment definitions
+    const allDefinitions = [...doc.definitions, ...fragmentDefinitions];
     const build = {};
     const transforms = fn(build);
     const addObjectTransforms = (type, obj) => {
@@ -120,7 +146,7 @@ const init = (schema, queries, mutations, subscriptions, types, inputs, scalars,
         const fields = types[type];
         if (!fields)
             return;
-        const typeDef = getTypeDef(doc, type);
+        const typeDef = getTypeDef(allDefinitions, type);
         if (!typeDef || !("fields" in typeDef))
             return;
         const selectionSet = {
@@ -139,7 +165,7 @@ const init = (schema, queries, mutations, subscriptions, types, inputs, scalars,
             if (fieldDef) {
                 // Get the inner (named) type of the field.
                 const fieldTypeName = getNamedType(fieldDef.type);
-                const fieldTypeDef = getTypeDef(doc, fieldTypeName);
+                const fieldTypeDef = getTypeDef(allDefinitions, fieldTypeName);
                 // If the field is an Object, build its selection set recursively.
                 if (fieldTypeDef &&
                     fieldTypeDef.kind === graphql_1.Kind.OBJECT_TYPE_DEFINITION) {
@@ -149,7 +175,7 @@ const init = (schema, queries, mutations, subscriptions, types, inputs, scalars,
                 } // If the field is an Interface, treat it like a union:
                 // find all Object types that implement this interface and build inline fragments.
                 else if (fieldTypeDef?.kind === graphql_1.Kind.INTERFACE_TYPE_DEFINITION) {
-                    const implementingTypes = doc.definitions.filter((def) => def.kind === graphql_1.Kind.OBJECT_TYPE_DEFINITION &&
+                    const implementingTypes = allDefinitions.filter((def) => def.kind === graphql_1.Kind.OBJECT_TYPE_DEFINITION &&
                         (def.interfaces?.some((iface) => iface.name.value === fieldTypeName) ?? false));
                     const inlineFragments = implementingTypes.map((impl) => ({
                         kind: graphql_1.Kind.INLINE_FRAGMENT,
@@ -190,7 +216,7 @@ const init = (schema, queries, mutations, subscriptions, types, inputs, scalars,
         });
         return selectionSet;
     };
-    const wrap = (type, patches) => (0, proxy_js_1.withGetDefaultPatch)((type) => transforms[type]?.default, () => (0, util_js_1.toObject)((0, proxy_js_1._proxy)(doc.definitions, scalars, type, patches, {
+    const wrap = (type, patches) => (0, proxy_js_1.withGetDefaultPatch)((type) => transforms[type]?.default, () => (0, util_js_1.toObject)((0, proxy_js_1._proxy)(allDefinitions, scalars, type, patches, {
         selectionSet: getSelectionSet(type),
     })));
     const objectBuilder = (type) => addObjectTransforms(type, (...patches) => {
@@ -300,7 +326,7 @@ const init = (schema, queries, mutations, subscriptions, types, inputs, scalars,
                 patches = [transforms[name].default, ...patches];
             }
             const { mock, parsedQuery } = (0, proxy_js_1.withGetDefaultPatch)((type) => transforms[type]?.default, () => {
-                const { request: { query: parsedQuery, ...request }, ...raw } = (0, proxy_js_1.operation)(doc.definitions, scalars, query, ...patches);
+                const { request: { query: parsedQuery, ...request }, ...raw } = (0, proxy_js_1.operation)(allDefinitions, scalars, query, ...patches);
                 const mock = (0, util_js_1.toObject)({
                     request: { ...request },
                     ...raw,

package/script/proxy.js

@@ -47,10 +47,24 @@ const resolveType = (definitions, path) => {
                     name: { kind: graphql_1.Kind.NAME, value: name },
                 };
             }
-            type = {
-                kind: graphql_1.Kind.NON_NULL_TYPE,
-                type: { kind: graphql_1.Kind.NAMED_TYPE, name: { kind: graphql_1.Kind.NAME, value: name } },
-            };
+            // Check if this is a fragment type
+            if (!definition) {
+                const fragment = definitions.find((d) => d.kind === graphql_1.Kind.FRAGMENT_DEFINITION && d.name.value === name);
+                if (fragment) {
+                    // Use the fragment definition directly
+                    definition = fragment;
+                    type = {
+                        kind: graphql_1.Kind.NON_NULL_TYPE,
+                        type: { kind: graphql_1.Kind.NAMED_TYPE, name: { kind: graphql_1.Kind.NAME, value: name } },
+                    };
+                }
+            }
+            if (!type) {
+                type = {
+                    kind: graphql_1.Kind.NON_NULL_TYPE,
+                    type: { kind: graphql_1.Kind.NAMED_TYPE, name: { kind: graphql_1.Kind.NAME, value: name } },
+                };
+            }
         }
         else {
             parent = definition.name.value;
@@ -598,6 +612,15 @@ const _proxy = (definitions, scalars, path, patches, { prev, resolvedType = reso
                 return prev;
             return definition.values?.[0]?.name.value;
         }
+        case graphql_1.Kind.FRAGMENT_DEFINITION: {
+            // For fragments, create a proxy for the base type with the fragment's selection set
+            const baseTypeName = definition.typeCondition.name.value;
+            return (0, exports._proxy)(definitions, scalars, baseTypeName, patches, {
+                prev,
+                selectionSet: definition.selectionSet,
+                nonNull: true,
+            });
+        }
         default:
             throw new Error(`Unhandled definition kind '${definition.kind}'`);
     }