graphql-data-generator 0.3.0-alpha.8 → 0.3.0

package/esm/proxy.js

@@ -1,5 +1,14 @@
-import { Kind, Location, parse } from "graphql";
+import { Kind, parse } from "graphql";
 import { absurd } from "./util.js";
+/**
+ * Updates the value to the base value, bypassing default transformations.
+ * Useful to clear optional inputs, resulting in `undefined` rather than `null`.
+ */
+export const clear = Symbol("clear");
+/**
+ * Called to insert default patches at the front of nested objects (props &
+ * arrays). `build` will insert default patches for top-level objects.
+ */
 let getDefaultPatch = (__typename) => undefined;
 export const withGetDefaultPatch = (newGetDefaultPatch, fn) => {
     const prev = getDefaultPatch;
@@ -44,7 +53,7 @@ const resolveType = (definitions, path) => {
             type = undefined;
             if (kind === "field") {
                 const field = "fields" in definition
-                    ? definition.fields?.find((f) => f.name.value === name)
+                    ? getField(definitions, definition, name)
                     : undefined;
                 if (!field) {
                     throw new Error(`Could not find field ${name} on ${"name" in definition ? definition.name?.value : "<unknown>"}`);
@@ -91,31 +100,36 @@ const resolveType = (definitions, path) => {
     }
     return { parent, definition, type: type };
 };
-const resolveConcreteType = (definitions, definition, patch, prev) => {
-    const objectDefintions = definitions.filter((d) => d.kind === Kind.OBJECT_TYPE_DEFINITION);
-    const interfaceDefintions = definitions.filter((d) => d.kind === Kind.INTERFACE_TYPE_DEFINITION);
+const resolveConcreteType = (definitions, definition, patch, prev, selectionSet) => {
+    const objectDefinitions = definitions.filter((d) => d.kind === Kind.OBJECT_TYPE_DEFINITION);
+    const interfaceDefinitions = definitions.filter((d) => d.kind === Kind.INTERFACE_TYPE_DEFINITION);
     let options = [];
     const interfaces = [definition];
     while (interfaces.length) {
         const interfaceDefinition = interfaces.pop();
-        for (const objectDefintion of objectDefintions) {
-            if (objectDefintion.interfaces?.some((i) => i.name.value === interfaceDefinition.name.value) ||
+        for (const objectDefinition of objectDefinitions) {
+            if (objectDefinition.interfaces?.some((i) => i.name.value === interfaceDefinition.name.value) ||
                 ("types" in interfaceDefinition &&
-                    interfaceDefinition.types?.some((t) => t.name.value === objectDefintion.name.value)))
-                options.push(objectDefintion);
+                    interfaceDefinition.types?.some((t) => t.name.value === objectDefinition.name.value)))
+                options.push(objectDefinition);
         }
         // TODO: is this a thing...?
-        for (const secondOrderInterfaceDefinition of interfaceDefintions) {
+        for (const secondOrderInterfaceDefinition of interfaceDefinitions) {
             if (secondOrderInterfaceDefinition.interfaces?.some((i) => i.name.value === interfaceDefinition.name.value))
                 interfaces.push(secondOrderInterfaceDefinition);
         }
     }
     if (options.length === 1)
         return options[0];
-    for (const field in patch) {
+    for (const alias in patch) {
+        const field = selectionSet
+            ? getSelectionField(definitions, selectionSet, alias)?.name.value ?? alias
+            : alias;
         options = options.filter((o) => field === "__typename"
-            ? o.name.value === patch[field]
-            : o.fields?.some((f) => f.name.value === field));
+            ? o.name.value === patch[alias]
+            : o.fields?.some((f) => f.name.value === field) ||
+                (definition.kind === Kind.INTERFACE_TYPE_DEFINITION &&
+                    definition.fields?.some((f) => f.name.value === field)));
         if (options.length === 1)
             return options[0];
     }
@@ -131,7 +145,7 @@ const resolveConcreteType = (definitions, definition, patch, prev) => {
 };
 const resolveValue = (definitions, scalars, type, ctx) => {
     if (type.kind !== Kind.NON_NULL_TYPE)
-        return null;
+        return ctx.input ? undefined : null;
     if (type.type.kind === Kind.LIST_TYPE)
         return [];
     type = type.type;
@@ -153,36 +167,10 @@ const resolveValue = (definitions, scalars, type, ctx) => {
         (fieldTypeDefinitions[0].kind === Kind.OBJECT_TYPE_DEFINITION ||
             fieldTypeDefinitions[0].kind === Kind.INTERFACE_TYPE_DEFINITION ||
             fieldTypeDefinitions[0].kind === Kind.INPUT_OBJECT_TYPE_DEFINITION)) {
-        // const childPatches = ctx.patches.map((p) => p[ctx.prop as keyof typeof p])
-        //   .filter((v) => !!v && typeof v === "object") as Patch<T[keyof T]>[];
-        const base = _proxy(definitions, scalars, fieldTypeDefinitions[0].name.value, [], { selectionSet: ctx.selectionSet });
-        const rawDefaultPatch = getDefaultPatch(type.name.value);
-        const defaultPatch = typeof rawDefaultPatch === "function"
-            ? rawDefaultPatch(base)
-            : rawDefaultPatch;
-        if (defaultPatch) {
-            return _proxy(definitions, scalars, fieldTypeDefinitions[0].name.value, [base, defaultPatch]);
-        }
-        return base;
+        return _proxy(definitions, scalars, ctx.path ? `${ctx.path}.${ctx.prop}` : fieldTypeDefinitions[0].name.value, [], { selectionSet: ctx.selectionSet, nonNull: true });
     }
     throw new Error(`Unhandled default kind ${fieldTypeDefinitions.map((d) => d.kind)}`);
 };
-const gqlprint = (value) => {
-    if (typeof value !== "object" || !value)
-        return value;
-    // deno-lint-ignore no-explicit-any
-    if (Array.isArray(value))
-        return value.map(gqlprint);
-    const obj = {};
-    for (const field in value) {
-        if (field === "loc" && value[field] instanceof Location) {
-            continue;
-        }
-        // deno-lint-ignore no-explicit-any
-        obj[field] = gqlprint(value[field]);
-    }
-    return obj;
-};
 const getSelectionField = (definitions, selectionSet, selection, typename) => {
     for (const s of selectionSet.selections) {
         switch (s.kind) {
@@ -201,7 +189,9 @@ const getSelectionField = (definitions, selectionSet, selection, typename) => {
             case Kind.INLINE_FRAGMENT: {
                 if (!s.typeCondition || !typename ||
                     s.typeCondition.name.value === typename) {
-                    return getSelectionField(definitions, s.selectionSet, selection, typename);
+                    const value = getSelectionField(definitions, s.selectionSet, selection, typename);
+                    if (value)
+                        return value;
                 }
             }
         }
@@ -226,7 +216,9 @@ const getSelectionSetSelection = (definitions, selectionSet, selection, typename
             case Kind.INLINE_FRAGMENT: {
                 if (!s.typeCondition || !typename ||
                     s.typeCondition.name.value === typename) {
-                    return getSelectionSetSelection(definitions, s.selectionSet, selection, typename);
+                    const value = getSelectionSetSelection(definitions, s.selectionSet, selection, typename);
+                    if (value)
+                        return value;
                 }
             }
         }
@@ -258,21 +250,61 @@ const selectionSetToKeys = (definitions, selectionSet, typename) => {
     }
     return keys;
 };
-const _proxy = (definitions, scalars, path, patches, { prev, resolvedType = resolveType(definitions, path), selectionSet, } = {}) => {
+const getField = (definitions, definition, name) => {
+    const field = definition.fields?.find((f) => f.name.value === name);
+    if (field)
+        return field;
+    if (!("interfaces" in definition) ||
+        !definition.interfaces?.length)
+        return;
+    for (const interfaceName of definition.interfaces) {
+        const interfaceDefinition = definitions.find((d) => d.kind === Kind.INTERFACE_TYPE_DEFINITION &&
+            d.name.value === interfaceName.name.value);
+        if (!interfaceDefinition)
+            continue;
+        const field = interfaceDefinition.fields?.find((f) => f.name.value === name);
+        if (field)
+            return field;
+    }
+};
+const _proxy = (definitions, scalars, path, patches, { prev, resolvedType = resolveType(definitions, path), selectionSet, nonNull, } = {}) => {
     const { parent = path, definition } = resolvedType;
     let type = resolvedType.type;
-    if (!prev && patches.length) {
-        prev = _proxy(definitions, scalars, path, patches.slice(0, -1), {
-            selectionSet,
-        });
+    if (!prev) {
+        if (nonNull) {
+            const typeName = type.kind === Kind.NAMED_TYPE
+                ? type.name.value
+                : type.kind === Kind.NON_NULL_TYPE && type.type.kind === Kind.NAMED_TYPE
+                    ? type.type.name.value
+                    : undefined;
+            if (typeName) {
+                const rawDefaultPatch = getDefaultPatch(typeName);
+                if (rawDefaultPatch)
+                    patches = [rawDefaultPatch, ...patches];
+            }
+        }
+        if (patches.length) {
+            prev = _proxy(definitions, scalars, path, patches.slice(0, -1), {
+                selectionSet,
+            });
+        }
     }
     const rawPatch = patches.length > 0 ? patches[patches.length - 1] : undefined;
     const patch = typeof rawPatch === "function"
         ? prev ? rawPatch(prev) : undefined
         : rawPatch;
+    if (patch === clear) {
+        return _proxy(definitions, scalars, path, [], { selectionSet });
+    }
     if (type.kind !== Kind.NON_NULL_TYPE) {
-        if (!patches.length)
-            return (prev ?? null);
+        if (!patches.length && !nonNull) {
+            return (prev ??
+                (resolveType(definitions, path.split(".").slice(0, -1).join("."))
+                    .definition?.kind ===
+                    Kind.INPUT_OBJECT_TYPE_DEFINITION
+                    ? undefined
+                    : null));
+        }
     }
     else
         type = type.type;
@@ -280,6 +312,9 @@ const _proxy = (definitions, scalars, path, patches, { prev, resolvedType = reso
         if (!patches.length)
             return (prev ?? []);
         const value = (patches.at(-1) ?? []);
+        if (value === clear) {
+            return _proxy(definitions, scalars, path, [], { selectionSet });
+        }
         const previousArray = (prev ?? []);
         const lastIndex = Math.max(previousArray.length - 1, 0);
         const nextIndex = previousArray.length;
@@ -297,7 +332,15 @@ const _proxy = (definitions, scalars, path, patches, { prev, resolvedType = reso
         }));
         const arr = [];
         for (let i = 0; i < length; i++) {
+            const nestType = type.type.kind === Kind.NAMED_TYPE
+                ? type.type.name.value
+                : type.type.kind === Kind.NON_NULL_TYPE &&
+                    type.type.type.kind === Kind.NAMED_TYPE
+                    ? type.type.type.name.value
+                    : undefined;
             arr[i] = _proxy(definitions, scalars, `${path}.${i}`, [
+                // TODO: should be handled in _proxy
+                nestType && !previousArray[i] ? getDefaultPatch(nestType) : undefined,
                 value[i],
                 i === lastIndex ? value.last : undefined,
                 i === nextIndex ? value.next : undefined,
@@ -326,7 +369,7 @@ const _proxy = (definitions, scalars, path, patches, { prev, resolvedType = reso
                     ? getSelectionField(definitions, selectionSet, prop)
                     : undefined;
                 const unaliased = selectionField ? selectionField.name.value : prop;
-                const field = definition.fields?.find((f) => f.name.value === unaliased);
+                const field = getField(definitions, definition, unaliased);
                 if (!field)
                     return target[prop];
                 // Get from patch
@@ -335,24 +378,28 @@ const _proxy = (definitions, scalars, path, patches, { prev, resolvedType = reso
                     const value = typeof rawValue === "function"
                         ? rawValue(prev)
                         : rawValue;
+                    if (value === clear) {
+                        return target[prop] = _proxy(definitions, scalars, `${path}.${unaliased}`, [], { selectionSet });
+                    }
                     if (value && typeof value === "object") {
                         const nonNullFieldType = field.type.kind === Kind.NON_NULL_TYPE
                             ? field.type.type
                             : field.type;
                         if (nonNullFieldType.kind === Kind.LIST_TYPE) {
-                            return target[prop] = _proxy(definitions, scalars, `${path}.${prop}`, [value], {
+                            return target[prop] = _proxy(definitions, scalars, `${path}.${unaliased}`, [value], {
                                 prev: prev?.[prop],
                                 selectionSet: selectionSet
-                                    ? getSelectionSetSelection(definitions, selectionSet, prop)
+                                    ? getSelectionSetSelection(definitions, selectionSet, unaliased)
                                     : undefined,
                             });
                         }
                         const childPatches = patches.map((p) => p[prop]).filter((v) => !!v && typeof v === "object");
-                        return target[prop] = _proxy(definitions, scalars, `${path}.${prop}`, childPatches, {
+                        return target[prop] = _proxy(definitions, scalars, `${path}.${unaliased}`, childPatches, {
                             prev: prev?.[prop],
                             selectionSet: selectionSet
-                                ? getSelectionSetSelection(definitions, selectionSet, prop)
+                                ? getSelectionSetSelection(definitions, selectionSet, unaliased)
                                 : undefined,
+                            nonNull: true,
                         });
                     }
                     if (value !== undefined) {
@@ -369,10 +416,12 @@ const _proxy = (definitions, scalars, path, patches, { prev, resolvedType = reso
                 // Otherwise generate it from type
                 return target[prop] = resolveValue(definitions, scalars, field.type, {
                     hostType: definition.name.value,
-                    prop,
+                    path,
+                    prop: unaliased,
                     selectionSet: selectionSet
                         ? getSelectionSetSelection(definitions, selectionSet, prop)
                         : undefined,
+                    input: definition.kind === Kind.INPUT_OBJECT_TYPE_DEFINITION,
                 });
             };
             const keys = [
@@ -405,7 +454,7 @@ const _proxy = (definitions, scalars, path, patches, { prev, resolvedType = reso
         case Kind.UNION_TYPE_DEFINITION:
         case Kind.INTERFACE_TYPE_DEFINITION: {
             // When creating prev, we need hint the desired type...
-            const concreteType = resolveConcreteType(definitions, definition, patch, prev);
+            const concreteType = resolveConcreteType(definitions, definition, patch, prev, selectionSet);
             return _proxy(definitions, scalars, concreteType.name.value, patches, {
                 prev,
                 selectionSet,
@@ -466,7 +515,7 @@ const _proxy = (definitions, scalars, path, patches, { prev, resolvedType = reso
                     mock.variables[name] = mockPrev.variables[name];
                     continue;
                 }
-                const result = resolveValue(definitions, scalars, variableDefinition.type, { hostType: `${path}Variables`, prop: name });
+                const result = resolveValue(definitions, scalars, variableDefinition.type, { hostType: `${path}Variables`, prop: name, input: false });
                 if (result != null) {
                     if (!mock.variables)
                         mock.variables = {};
@@ -489,6 +538,10 @@ const _proxy = (definitions, scalars, path, patches, { prev, resolvedType = reso
                         // 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 != null ? [value] : [], {
                             prev: mockPrev?.data?.[prop],
                             selectionSet: selection.selectionSet,
@@ -534,6 +587,14 @@ const _proxy = (definitions, scalars, path, patches, { prev, resolvedType = reso
             const value = typeof scalar === "function" ? scalar(parent) : scalar;
             return value;
         }
+        case Kind.ENUM_TYPE_DEFINITION: {
+            const patch = patches[patches.length - 1];
+            if (patch != null)
+                return patch;
+            if (prev != null)
+                return prev;
+            return definition.values?.[0]?.name.value;
+        }
         default:
             throw new Error(`Unhandled definition kind '${definition.kind}'`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql-data-generator",
-  "version": "0.3.0-alpha.8",
+  "version": "0.3.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/voces/graphql-data-generator.git"
@@ -61,7 +61,8 @@
     "react": "*",
     "@types/react": "*",
     "@apollo/client": "*",
-    "@testing-library/dom": "*"
+    "@testing-library/dom": "*",
+    "@testing-library/react": "*"
   },
   "peerDependenciesMeta": {
     "react": {
@@ -75,6 +76,9 @@
     },
     "@testing-library/dom": {
       "optional": true
+    },
+    "@testing-library/react": {
+      "optional": true
     }
   }
 }

package/script/cli.js

@@ -27,7 +27,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-require("./_dnt.polyfills.js");
 const dntShim = __importStar(require("./_dnt.shims.js"));
 const node_fs_1 = require("node:fs");
 const fast_glob_1 = __importDefault(require("fast-glob"));

package/script/index.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toObject = exports.formatCode = exports.proxy = exports.codegen = exports.init = void 0;
-require("./_dnt.polyfills.js");
+exports.toObject = exports.formatCode = exports.proxy = exports.operation = exports.clear = exports.codegen = exports.init = void 0;
 var init_js_1 = require("./init.js");
 Object.defineProperty(exports, "init", { enumerable: true, get: function () { return init_js_1.init; } });
 var codegen_js_1 = require("./codegen.js");
 Object.defineProperty(exports, "codegen", { enumerable: true, get: function () { return codegen_js_1.codegen; } });
 var proxy_js_1 = require("./proxy.js");
+Object.defineProperty(exports, "clear", { enumerable: true, get: function () { return proxy_js_1.clear; } });
+Object.defineProperty(exports, "operation", { enumerable: true, get: function () { return proxy_js_1.operation; } });
 Object.defineProperty(exports, "proxy", { enumerable: true, get: function () { return proxy_js_1.proxy; } });
 var util_js_1 = require("./util.js");
 Object.defineProperty(exports, "formatCode", { enumerable: true, get: function () { return util_js_1.formatCode; } });

package/script/init.js

@@ -1,16 +1,50 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.init = void 0;
+const dntShim = __importStar(require("./_dnt.shims.js"));
+const node_module_1 = require("node:module");
 const node_fs_1 = require("node:fs");
 const graphql_1 = require("graphql");
-const node_path_1 = require("node:path");
 const graphql_tag_pluck_1 = require("@graphql-tools/graphql-tag-pluck");
 const proxy_js_1 = require("./proxy.js");
 const util_js_1 = require("./util.js");
+const node_path_1 = require("node:path");
+globalThis.require ??= (0, node_module_1.createRequire)(dntShim.Deno.cwd());
 const files = {};
-const loadFile = (path) => files[path] || (files[path] = (0, node_fs_1.readFileSync)(path, "utf-8").replace(/#import "(.*)"/, (_, fragmentPath) => loadFile(fragmentPath.startsWith(".")
-    ? (0, node_path_1.join)((0, node_path_1.dirname)(path), fragmentPath)
-    : new URL(fragmentPath, require("url").pathToFileURL(__filename).href).href)));
+const loadFile = (path) => {
+    if (files[path])
+        return files[path];
+    const raw = files[path] = (0, node_fs_1.readFileSync)(path, "utf-8");
+    const imports = Array.from(raw.matchAll(/#import "(.*)"/gm), ([, importPath]) => loadFile(require.resolve(importPath.startsWith(".")
+        ? (0, node_path_1.resolve)(dntShim.Deno.cwd(), (0, node_path_1.dirname)(path), importPath)
+        : importPath, { paths: [dntShim.Deno.cwd()] })));
+    if (!imports.length)
+        return raw;
+    return [raw, ...imports].join("\n\n");
+};
 const getOperationContentMap = {};
 const getOperationContent = (path, operationName) => {
     const existing = getOperationContentMap[path];
@@ -26,7 +60,7 @@ const getOperationContent = (path, operationName) => {
             const document = (0, graphql_1.parse)(s);
             const firstOp = document.definitions.find((d) => d.kind === graphql_1.Kind.OPERATION_DEFINITION);
             if (!firstOp)
-                throw new Error(`Cound not find an operation in ${path}`);
+                throw new Error(`Could not find an operation in ${path}`);
             return [firstOp.name?.value, document];
         }));
     }
@@ -35,7 +69,16 @@ const getOperationContent = (path, operationName) => {
     }
     return getOperationContent(path, operationName);
 };
-// - Types will be suffixed with their type: fooQuery or fooMutation
+/**
+ * Initialize the data builder.
+ * @param schema The plain text of your schema.
+ * @param queries List of queries exported from generated types.
+ * @param mutations List of mutations exported from generated types.
+ * @param subscriptions List of subscriptions exported from generated types.
+ * @param types List of types exported from generated types.
+ * @param inputs List of types exported from generated types.
+ * @param scalars A mapping to generate scalar values. Function values will be invoked with their `__typename`.
+ */
 const init = (schema, queries, mutations, subscriptions, types, inputs, scalars, options) => (fn) => {
     const doc = (0, graphql_1.parse)(schema);
     const build = {};
@@ -160,10 +203,13 @@ const init = (schema, queries, mutations, subscriptions, types, inputs, scalars,
             if (transforms[name] && "default" in transforms[name]) {
                 patches = [transforms[name].default, ...patches];
             }
-            const { request: { query: parsedQuery, ...request }, ...raw } = (0, proxy_js_1.operation)(doc.definitions, scalars, query, ...patches);
-            const mock = (0, util_js_1.toObject)({
-                request: { ...request },
-                ...raw,
+            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 mock = (0, util_js_1.toObject)({
+                    request: { ...request },
+                    ...raw,
+                });
+                return { mock, parsedQuery };
             });
             mock.request.query = parsedQuery;
             Error.captureStackTrace(mock, builder);