graphql-data-generator 0.3.1-alpha.0 → 0.3.1-alpha.2

package/esm/codegen.js

@@ -45,6 +45,28 @@ const getType = ({ type, ...props }) => {
             }, {});
             const value = groupedValues[type.name.value] ?? {};
             delete groupedValues[type.name.value];
+            if (def?.[0].kind === "UnionTypeDefinition") {
+                def[1].add(type.name.value);
+                // This is a terrible solution and we should instead produce a tree that
+                // is simplified
+                let iface = props.definitions[def[0].types?.[0]?.name.value ?? ""]?.[0];
+                if (iface && "interfaces" in iface) {
+                    iface = props.definitions[iface.interfaces?.[0]?.name.value ?? ""]?.[0];
+                }
+                const interfaceName = iface?.kind === "InterfaceTypeDefinition"
+                    ? iface.name.value
+                    : undefined;
+                if (interfaceName &&
+                    groupedValues[interfaceName] &&
+                    Object.keys(groupedValues).every((k) => k === interfaceName ||
+                        def[0].types?.some((t) => t.name.value === k))) {
+                    Object.assign(value, groupedValues[interfaceName]);
+                    delete groupedValues[interfaceName];
+                }
+            }
+            else if (def?.[0].kind === "InterfaceTypeDefinition") {
+                def[1].add(type.name.value);
+            }
             const nonExhaustive = implementations
                 .filter((o) => !(o[0].name.value in groupedValues)).map((o) => o[0].name.value);
             return {
@@ -473,7 +495,6 @@ export const codegen = (schema, files, { enums = "literals", scalars, includeTyp
                 }
                 handledInputs.add(current);
             }
-            // return `type ${type.value} = ${serializeType(inputType)};`;
         }).filter(Boolean)).filter(filterOutputTypes),
         ...collection.flatMap((o) => {
             const name = operationDataName(o, operationType);
@@ -510,13 +531,21 @@ ${collection.map((o) => `  ${o.name}: "${relative(process.cwd(), o.path)}",`).jo
 ${Array.from(handledInputs).map((i) => `  ${i}: ${rename(i)};`).join("\n")}
 };`, `export const inputs = [${Array.from(handledInputs).map((i) => `"${i}"`).join(", ")}] as const;`);
     }
+    // console.log(types["Node"]);
     const usedTypes = Object.entries(types)
         .map(([name, info]) => [name, ...info])
-        .filter((data) => data[1].kind === "ObjectTypeDefinition" && data[2].size > 0);
+        .filter((data) => (data[1].kind === "ObjectTypeDefinition" ||
+        data[1].kind === "UnionTypeDefinition" ||
+        data[1].kind === "InterfaceTypeDefinition") && data[2].size > 0);
     if (usedTypes.length) {
-        serializedTypes.unshift(...usedTypes.map(([name, type, usage]) => `${exports.includes("types") ? "export " : ""}type ${name} = {
+        serializedTypes.unshift(...usedTypes.map(([name, type, usage]) => `${exports.includes("types") ? "export " : ""}type ${name} = ${type.kind === "ObjectTypeDefinition"
+            ? `{
 ${includeTypenames ? `  __typename: "${name}";\n` : ""}${type.fields?.filter((f) => usage.has(f.name.value)).map((v) => `  ${v.name.value}: ${serializeType(simpleType(v.type, types))};`).join("\n")}
-};`).filter(filterOutputTypes), `export type Types = {
+}`
+            : type.kind === "UnionTypeDefinition"
+                ? type.types?.map((t) => t.name.value).join(" | ")
+                : usedTypes.filter(([, t]) => t.kind === Kind.OBJECT_TYPE_DEFINITION &&
+                    t.interfaces?.some((i) => i.name.value === name)).map(([name]) => name).join(" | ")};`).filter(filterOutputTypes), `export type Types = {
 ${usedTypes.map(([name]) => `  ${name}: ${rename(name)};`).join("\n")}
 };`, `export const types = [${usedTypes.map(([name]) => `"${name}"`).join(", ")}] as const;`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql-data-generator",
-  "version": "0.3.1-alpha.0",
+  "version": "0.3.1-alpha.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/voces/graphql-data-generator.git"
@@ -15,19 +15,19 @@
   "exports": {
     ".": {
       "import": "./esm/index.js",
-      "require": "./esm/index.js",
+      "require": "./script/index.js",
       "types": "./types/index.d.ts",
       "default": "./esm/index.js"
     },
     "./plugin": {
       "import": "./esm/plugin.cjs",
-      "require": "./esm/plugin.cjs",
+      "require": "./script/plugin.cjs",
       "types": "./types/plugin.cjs",
       "default": "./esm/plugin.cjs"
     },
     "./jest": {
       "import": "./esm/jest.js",
-      "require": "./esm/jest.js",
+      "require": "./script/jest.js",
       "types": "./types/jest.d.ts",
       "default": "./esm/jest.js"
     }

package/script/codegen.js

@@ -51,6 +51,28 @@ const getType = ({ type, ...props }) => {
             }, {});
             const value = groupedValues[type.name.value] ?? {};
             delete groupedValues[type.name.value];
+            if (def?.[0].kind === "UnionTypeDefinition") {
+                def[1].add(type.name.value);
+                // This is a terrible solution and we should instead produce a tree that
+                // is simplified
+                let iface = props.definitions[def[0].types?.[0]?.name.value ?? ""]?.[0];
+                if (iface && "interfaces" in iface) {
+                    iface = props.definitions[iface.interfaces?.[0]?.name.value ?? ""]?.[0];
+                }
+                const interfaceName = iface?.kind === "InterfaceTypeDefinition"
+                    ? iface.name.value
+                    : undefined;
+                if (interfaceName &&
+                    groupedValues[interfaceName] &&
+                    Object.keys(groupedValues).every((k) => k === interfaceName ||
+                        def[0].types?.some((t) => t.name.value === k))) {
+                    Object.assign(value, groupedValues[interfaceName]);
+                    delete groupedValues[interfaceName];
+                }
+            }
+            else if (def?.[0].kind === "InterfaceTypeDefinition") {
+                def[1].add(type.name.value);
+            }
             const nonExhaustive = implementations
                 .filter((o) => !(o[0].name.value in groupedValues)).map((o) => o[0].name.value);
             return {
@@ -479,7 +501,6 @@ const codegen = (schema, files, { enums = "literals", scalars, includeTypenames
                 }
                 handledInputs.add(current);
             }
-            // return `type ${type.value} = ${serializeType(inputType)};`;
         }).filter(Boolean)).filter(filterOutputTypes),
         ...collection.flatMap((o) => {
             const name = operationDataName(o, operationType);
@@ -516,13 +537,21 @@ ${collection.map((o) => `  ${o.name}: "${(0, node_path_1.relative)(node_process_
 ${Array.from(handledInputs).map((i) => `  ${i}: ${rename(i)};`).join("\n")}
 };`, `export const inputs = [${Array.from(handledInputs).map((i) => `"${i}"`).join(", ")}] as const;`);
     }
+    // console.log(types["Node"]);
     const usedTypes = Object.entries(types)
         .map(([name, info]) => [name, ...info])
-        .filter((data) => data[1].kind === "ObjectTypeDefinition" && data[2].size > 0);
+        .filter((data) => (data[1].kind === "ObjectTypeDefinition" ||
+        data[1].kind === "UnionTypeDefinition" ||
+        data[1].kind === "InterfaceTypeDefinition") && data[2].size > 0);
     if (usedTypes.length) {
-        serializedTypes.unshift(...usedTypes.map(([name, type, usage]) => `${exports.includes("types") ? "export " : ""}type ${name} = {
+        serializedTypes.unshift(...usedTypes.map(([name, type, usage]) => `${exports.includes("types") ? "export " : ""}type ${name} = ${type.kind === "ObjectTypeDefinition"
+            ? `{
 ${includeTypenames ? `  __typename: "${name}";\n` : ""}${type.fields?.filter((f) => usage.has(f.name.value)).map((v) => `  ${v.name.value}: ${serializeType(simpleType(v.type, types))};`).join("\n")}
-};`).filter(filterOutputTypes), `export type Types = {
+}`
+            : type.kind === "UnionTypeDefinition"
+                ? type.types?.map((t) => t.name.value).join(" | ")
+                : usedTypes.filter(([, t]) => t.kind === graphql_1.Kind.OBJECT_TYPE_DEFINITION &&
+                    t.interfaces?.some((i) => i.name.value === name)).map(([name]) => name).join(" | ")};`).filter(filterOutputTypes), `export type Types = {
 ${usedTypes.map(([name]) => `  ${name}: ${rename(name)};`).join("\n")}
 };`, `export const types = [${usedTypes.map(([name]) => `"${name}"`).join(", ")}] as const;`);
     }