graphql-data-generator 0.4.2 → 0.4.3-alpha.0

package/esm/codegen.js

@@ -20,7 +20,7 @@ const getType = ({ type, ...props }) => {
                         def[0].types?.some((t) => v && t.name.value === v[0].name.value) ||
                         false)
                     : [];
-            const groupedValues = getSelectionsType(type.name.value, props.selections, props.definitions, props.fragments, props.references, props.includeTypenames).reduce((union, [name, value, group]) => {
+            const groupedValues = getSelectionsType(type.name.value, props.selections, props.definitions, props.fragments, props.references, props.includeTypenames).reduce((union, [name, value, group, originalName]) => {
                 group ??= type.name.value;
                 // Extract the actual type name from compound group names (e.g., "User:DelegationSubject" -> "DelegationSubject")
                 const actualTypeName = group.includes(":")
@@ -42,14 +42,16 @@ const getType = ({ type, ...props }) => {
                 }
                 union[group][name] = value;
                 const def = props.definitions[actualTypeName];
+                // Use originalName for tracking field usage when field is aliased
+                const fieldNameForTracking = originalName ?? name;
                 if (def) {
                     if (implementations.length) {
                         for (const implementation of implementations) {
-                            implementation[1].add(name);
+                            implementation[1].add(fieldNameForTracking);
                         }
                     }
                     else
-                        def[1].add(name);
+                        def[1].add(fieldNameForTracking);
                 }
                 return union;
             }, {});
@@ -144,6 +146,8 @@ const getSelectionsType = (name, selections, definitions, fragments, references,
                                 references,
                                 includeTypenames,
                             }),
+                            undefined, // group
+                            selection.alias ? selection.name.value : undefined, // originalName when aliased
                         ]);
                         break;
                     }
@@ -166,7 +170,7 @@ const getSelectionsType = (name, selections, definitions, fragments, references,
                 const group = selection.typeCondition?.name.value ??
                     selection.directives?.map((d) => d.name).join(",");
                 selectionTypes.push(...(group
-                    ? subSelection.map(([n, t, g]) => [n, t, g ? `${group}:${g}` : group])
+                    ? subSelection.map(([n, t, g, originalName]) => [n, t, g ? `${group}:${g}` : group, originalName])
                     : subSelection));
                 break;
             }
@@ -176,10 +180,11 @@ const getSelectionsType = (name, selections, definitions, fragments, references,
                     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]) => [
+                selectionTypes.push(...getSelectionsType(fragment.typeCondition.name.value, fragment.selectionSet.selections, definitions, fragments, references, includeTypenames).map(([name, type, group, originalName]) => [
                     name,
                     type,
                     group || fragment.typeCondition.name.value,
+                    originalName,
                 ]));
                 break;
             }

package/esm/init.js

@@ -3,7 +3,7 @@ import { createRequire } from "node:module";
 import { readFileSync } from "node:fs";
 import { Kind, parse, } from "graphql";
 import { gqlPluckFromCodeStringSync } from "@graphql-tools/graphql-tag-pluck";
-import { _proxy, operation, withGetDefaultPatch } from "./proxy.js";
+import { _proxy, operation, withGetDefaultPatch, } from "./proxy.js";
 import { toObject } from "./util.js";
 import { dirname, resolve } from "node:path";
 globalThis.require ??= createRequire(dntShim.Deno.cwd());
@@ -69,8 +69,8 @@ const getTypeDef = (definitions, typeName) => definitions.find((def) => "name" i
  */
 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 = [];
+    // Collect all fragment definitions from operation files, deduplicating by name
+    const fragmentDefinitionsMap = new Map();
     const collectFragments = (filePath, operationName) => {
         try {
             // If we have an operation name, use it; otherwise try to parse the file directly
@@ -83,18 +83,28 @@ export const init = (schema, queries, mutations, subscriptions, types, inputs, s
                 const fileContent = loadFile(filePath);
                 document = parse(fileContent);
             }
-            fragmentDefinitions.push(...document.definitions.filter((def) => def.kind === Kind.FRAGMENT_DEFINITION));
+            for (const def of document.definitions) {
+                if (def.kind === Kind.FRAGMENT_DEFINITION) {
+                    // Only add if not already seen (dedup by fragment name)
+                    if (!fragmentDefinitionsMap.has(def.name.value)) {
+                        fragmentDefinitionsMap.set(def.name.value, def);
+                    }
+                }
+            }
         }
         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];
+    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 deduplicated fragment definitions
+    const allDefinitions = [
+        ...doc.definitions,
+        ...fragmentDefinitionsMap.values(),
+    ];
     const build = {};
     const transforms = fn(build);
     const addObjectTransforms = (type, obj) => {

package/esm/proxy.js

@@ -161,6 +161,10 @@ const resolveConcreteType = (definitions, definition, patch, prev, selectionSet)
     if (options.length === 0) {
         throw new Error(`Could not find concrete type for ${definition.name.value}`);
     }
+    // Prefer a type that has a default patch defined
+    const typeWithDefault = options.find((o) => getDefaultPatch(o.name.value));
+    if (typeWithDefault)
+        return typeWithDefault;
     return options[0];
 };
 const resolveValue = (definitions, scalars, type, ctx) => {
@@ -563,34 +567,37 @@ export const _proxy = (definitions, scalars, path, patches, { prev, resolvedType
             const dataPatch = typeof mockPatch?.data === "function"
                 ? mockPatch.data(mockPrev)
                 : mockPatch?.data;
-            for (const selection of definition.selectionSet.selections ?? []) {
-                switch (selection.kind) {
-                    case Kind.FIELD: {
-                        const prop = selection.alias?.value ?? selection.name.value;
-                        const rawValue = dataPatch?.[prop];
-                        const value = typeof rawValue === "function"
-                            ? rawValue(mockPrev?.data)
-                            : rawValue;
-                        if (!mock.data)
-                            mock.data = {};
-                        // Query, Mutation, Subscription
-                        const operationKey = definition.operation[0].toUpperCase() +
-                            definition.operation.slice(1);
-                        if (value === clear) {
-                            mock.data[prop] = _proxy(definitions, scalars, `${operationKey}.${selection.name.value}`, [], { selectionSet: selection.selectionSet });
+            // Allow explicitly setting data to null (e.g., for error responses)
+            if (dataPatch !== null) {
+                for (const selection of definition.selectionSet.selections ?? []) {
+                    switch (selection.kind) {
+                        case Kind.FIELD: {
+                            const prop = selection.alias?.value ?? selection.name.value;
+                            const rawValue = dataPatch?.[prop];
+                            const value = typeof rawValue === "function"
+                                ? rawValue(mockPrev?.data)
+                                : rawValue;
+                            if (!mock.data)
+                                mock.data = {};
+                            // Query, Mutation, Subscription
+                            const operationKey = definition.operation[0].toUpperCase() +
+                                definition.operation.slice(1);
+                            if (value === clear) {
+                                mock.data[prop] = _proxy(definitions, scalars, `${operationKey}.${selection.name.value}`, [], { selectionSet: selection.selectionSet });
+                                continue;
+                            }
+                            mock.data[prop] = _proxy(definitions, scalars, `${operationKey}.${selection.name.value}`, value !== undefined ? [value] : [], {
+                                prev: mockPrev?.data?.[prop],
+                                selectionSet: selection.selectionSet,
+                            });
                             continue;
                         }
-                        mock.data[prop] = _proxy(definitions, scalars, `${operationKey}.${selection.name.value}`, value !== undefined ? [value] : [], {
-                            prev: mockPrev?.data?.[prop],
-                            selectionSet: selection.selectionSet,
-                        });
-                        continue;
+                        case Kind.FRAGMENT_SPREAD:
+                        case Kind.INLINE_FRAGMENT:
+                            throw new Error(`Unhandled selection kind ${selection.kind}`);
+                        default:
+                            absurd(selection);
                     }
-                    case Kind.FRAGMENT_SPREAD:
-                    case Kind.INLINE_FRAGMENT:
-                        throw new Error(`Unhandled selection kind ${selection.kind}`);
-                    default:
-                        absurd(selection);
                 }
             }
             if (patch) {
@@ -691,7 +698,7 @@ export const operation = (definitions, scalars, query, ...patches) => {
             ? error
             : Object.assign(new Error(), error);
     }
-    else if (data)
+    else if (data !== undefined)
         mock.result.data = data;
     if (errors)
         mock.result.errors = errors;

package/package.json

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

package/script/codegen.js

@@ -26,7 +26,7 @@ const getType = ({ type, ...props }) => {
                         def[0].types?.some((t) => v && t.name.value === v[0].name.value) ||
                         false)
                     : [];
-            const groupedValues = getSelectionsType(type.name.value, props.selections, props.definitions, props.fragments, props.references, props.includeTypenames).reduce((union, [name, value, group]) => {
+            const groupedValues = getSelectionsType(type.name.value, props.selections, props.definitions, props.fragments, props.references, props.includeTypenames).reduce((union, [name, value, group, originalName]) => {
                 group ??= type.name.value;
                 // Extract the actual type name from compound group names (e.g., "User:DelegationSubject" -> "DelegationSubject")
                 const actualTypeName = group.includes(":")
@@ -48,14 +48,16 @@ const getType = ({ type, ...props }) => {
                 }
                 union[group][name] = value;
                 const def = props.definitions[actualTypeName];
+                // Use originalName for tracking field usage when field is aliased
+                const fieldNameForTracking = originalName ?? name;
                 if (def) {
                     if (implementations.length) {
                         for (const implementation of implementations) {
-                            implementation[1].add(name);
+                            implementation[1].add(fieldNameForTracking);
                         }
                     }
                     else
-                        def[1].add(name);
+                        def[1].add(fieldNameForTracking);
                 }
                 return union;
             }, {});
@@ -150,6 +152,8 @@ const getSelectionsType = (name, selections, definitions, fragments, references,
                                 references,
                                 includeTypenames,
                             }),
+                            undefined, // group
+                            selection.alias ? selection.name.value : undefined, // originalName when aliased
                         ]);
                         break;
                     }
@@ -172,7 +176,7 @@ const getSelectionsType = (name, selections, definitions, fragments, references,
                 const group = selection.typeCondition?.name.value ??
                     selection.directives?.map((d) => d.name).join(",");
                 selectionTypes.push(...(group
-                    ? subSelection.map(([n, t, g]) => [n, t, g ? `${group}:${g}` : group])
+                    ? subSelection.map(([n, t, g, originalName]) => [n, t, g ? `${group}:${g}` : group, originalName])
                     : subSelection));
                 break;
             }
@@ -182,10 +186,11 @@ const getSelectionsType = (name, selections, definitions, fragments, references,
                     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]) => [
+                selectionTypes.push(...getSelectionsType(fragment.typeCondition.name.value, fragment.selectionSet.selections, definitions, fragments, references, includeTypenames).map(([name, type, group, originalName]) => [
                     name,
                     type,
                     group || fragment.typeCondition.name.value,
+                    originalName,
                 ]));
                 break;
             }

package/script/init.js

@@ -95,8 +95,8 @@ const getTypeDef = (definitions, typeName) => definitions.find((def) => "name" i
  */
 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 = [];
+    // Collect all fragment definitions from operation files, deduplicating by name
+    const fragmentDefinitionsMap = new Map();
     const collectFragments = (filePath, operationName) => {
         try {
             // If we have an operation name, use it; otherwise try to parse the file directly
@@ -109,18 +109,28 @@ const init = (schema, queries, mutations, subscriptions, types, inputs, scalars,
                 const fileContent = loadFile(filePath);
                 document = (0, graphql_1.parse)(fileContent);
             }
-            fragmentDefinitions.push(...document.definitions.filter((def) => def.kind === graphql_1.Kind.FRAGMENT_DEFINITION));
+            for (const def of document.definitions) {
+                if (def.kind === graphql_1.Kind.FRAGMENT_DEFINITION) {
+                    // Only add if not already seen (dedup by fragment name)
+                    if (!fragmentDefinitionsMap.has(def.name.value)) {
+                        fragmentDefinitionsMap.set(def.name.value, def);
+                    }
+                }
+            }
         }
         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];
+    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 deduplicated fragment definitions
+    const allDefinitions = [
+        ...doc.definitions,
+        ...fragmentDefinitionsMap.values(),
+    ];
     const build = {};
     const transforms = fn(build);
     const addObjectTransforms = (type, obj) => {

package/script/proxy.js

@@ -165,6 +165,10 @@ const resolveConcreteType = (definitions, definition, patch, prev, selectionSet)
     if (options.length === 0) {
         throw new Error(`Could not find concrete type for ${definition.name.value}`);
     }
+    // Prefer a type that has a default patch defined
+    const typeWithDefault = options.find((o) => getDefaultPatch(o.name.value));
+    if (typeWithDefault)
+        return typeWithDefault;
     return options[0];
 };
 const resolveValue = (definitions, scalars, type, ctx) => {
@@ -567,34 +571,37 @@ const _proxy = (definitions, scalars, path, patches, { prev, resolvedType = reso
             const dataPatch = typeof mockPatch?.data === "function"
                 ? mockPatch.data(mockPrev)
                 : mockPatch?.data;
-            for (const selection of definition.selectionSet.selections ?? []) {
-                switch (selection.kind) {
-                    case graphql_1.Kind.FIELD: {
-                        const prop = selection.alias?.value ?? selection.name.value;
-                        const rawValue = dataPatch?.[prop];
-                        const value = typeof rawValue === "function"
-                            ? rawValue(mockPrev?.data)
-                            : rawValue;
-                        if (!mock.data)
-                            mock.data = {};
-                        // Query, Mutation, Subscription
-                        const operationKey = definition.operation[0].toUpperCase() +
-                            definition.operation.slice(1);
-                        if (value === exports.clear) {
-                            mock.data[prop] = (0, exports._proxy)(definitions, scalars, `${operationKey}.${selection.name.value}`, [], { selectionSet: selection.selectionSet });
+            // Allow explicitly setting data to null (e.g., for error responses)
+            if (dataPatch !== null) {
+                for (const selection of definition.selectionSet.selections ?? []) {
+                    switch (selection.kind) {
+                        case graphql_1.Kind.FIELD: {
+                            const prop = selection.alias?.value ?? selection.name.value;
+                            const rawValue = dataPatch?.[prop];
+                            const value = typeof rawValue === "function"
+                                ? rawValue(mockPrev?.data)
+                                : rawValue;
+                            if (!mock.data)
+                                mock.data = {};
+                            // Query, Mutation, Subscription
+                            const operationKey = definition.operation[0].toUpperCase() +
+                                definition.operation.slice(1);
+                            if (value === exports.clear) {
+                                mock.data[prop] = (0, exports._proxy)(definitions, scalars, `${operationKey}.${selection.name.value}`, [], { selectionSet: selection.selectionSet });
+                                continue;
+                            }
+                            mock.data[prop] = (0, exports._proxy)(definitions, scalars, `${operationKey}.${selection.name.value}`, value !== undefined ? [value] : [], {
+                                prev: mockPrev?.data?.[prop],
+                                selectionSet: selection.selectionSet,
+                            });
                             continue;
                         }
-                        mock.data[prop] = (0, exports._proxy)(definitions, scalars, `${operationKey}.${selection.name.value}`, value !== undefined ? [value] : [], {
-                            prev: mockPrev?.data?.[prop],
-                            selectionSet: selection.selectionSet,
-                        });
-                        continue;
+                        case graphql_1.Kind.FRAGMENT_SPREAD:
+                        case graphql_1.Kind.INLINE_FRAGMENT:
+                            throw new Error(`Unhandled selection kind ${selection.kind}`);
+                        default:
+                            (0, util_js_1.absurd)(selection);
                     }
-                    case graphql_1.Kind.FRAGMENT_SPREAD:
-                    case graphql_1.Kind.INLINE_FRAGMENT:
-                        throw new Error(`Unhandled selection kind ${selection.kind}`);
-                    default:
-                        (0, util_js_1.absurd)(selection);
                 }
             }
             if (patch) {
@@ -697,7 +704,7 @@ const operation = (definitions, scalars, query, ...patches) => {
             ? error
             : Object.assign(new Error(), error);
     }
-    else if (data)
+    else if (data !== undefined)
         mock.result.data = data;
     if (errors)
         mock.result.errors = errors;

package/types/proxy.d.ts

@@ -22,7 +22,8 @@ export declare const _proxy: <T>(definitions: readonly DefinitionNode[], scalars
     nonNull?: boolean;
 }) => T;
 export declare const proxy: <T>(definitions: readonly DefinitionNode[], scalars: Record<string, unknown | ((typename: string) => unknown)>, type: string, ...patches: (Patch<T> | ((prev: T) => Patch<T>))[]) => T;
-export declare const operation: <O extends SimpleOperationMock, Extra = object>(definitions: readonly DefinitionNode[], scalars: Record<string, unknown | ((typename: string) => unknown)>, query: string | DocumentNode, ...patches: (Patch<Omit<O, "error" | "errors">> & {
+export declare const operation: <O extends SimpleOperationMock, Extra = object>(definitions: readonly DefinitionNode[], scalars: Record<string, unknown | ((typename: string) => unknown)>, query: string | DocumentNode, ...patches: (Patch<Omit<O, "error" | "errors" | "data">> & {
+    data?: Patch<O["data"]> | null;
     error?: Error;
     errors?: GraphQLError[];
 } & Partial<Extra>)[]) => OperationMock<O["data"], O["variables"]> & Partial<Extra>;

package/types/types.d.ts

@@ -23,7 +23,7 @@ export type OperationMock<Data extends Record<string, unknown> = Record<string,
         variables?: Variables;
     };
     result: {
-        data?: Data;
+        data?: Data | null;
         errors?: ReadonlyArray<GraphQLError>;
     };
     error?: Error;