graphql-data-generator 0.4.6-alpha.4 → 0.4.7-alpha.0

package/esm/codegen.js

@@ -5,6 +5,38 @@ import { join, relative } from "node:path";
 import { raise } from "./util.js";
 import process from "node:process";
 import { convertFactory, } from "@graphql-codegen/visitor-plugin-common";
+const mergeSerializable = (existing, incoming) => {
+    if (!existing)
+        return incoming;
+    if (existing.kind === "Object" && incoming.kind === "Object") {
+        const merged = { ...existing.value };
+        for (const [k, v] of Object.entries(incoming.value)) {
+            merged[k] = mergeSerializable(merged[k], v);
+        }
+        const typenameDesc = Object.getOwnPropertyDescriptor(existing.value, "__typename") ??
+            Object.getOwnPropertyDescriptor(incoming.value, "__typename");
+        if (typenameDesc)
+            Object.defineProperty(merged, "__typename", typenameDesc);
+        return {
+            kind: "Object",
+            value: merged,
+            conditionals: [
+                ...(existing.conditionals ?? []),
+                ...(incoming.conditionals ?? []),
+            ],
+            nonExhaustive: existing.nonExhaustive ?? incoming.nonExhaustive,
+            optional: existing.optional && incoming.optional,
+        };
+    }
+    if (existing.kind === "List" && incoming.kind === "List") {
+        return {
+            kind: "List",
+            value: mergeSerializable(existing.value, incoming.value),
+            optional: existing.optional && incoming.optional,
+        };
+    }
+    return incoming;
+};
 const getType = ({ type, ...props }) => {
     if (type.kind === "NamedType") {
         if (props.selections) {
@@ -40,7 +72,7 @@ const getType = ({ type, ...props }) => {
                         },
                     });
                 }
-                union[group][name] = value;
+                union[group][name] = mergeSerializable(union[group][name], value);
                 const def = props.definitions[actualTypeName];
                 // Use originalName for tracking field usage when field is aliased
                 const fieldNameForTracking = originalName ?? name;

package/package.json

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

package/script/codegen.js

@@ -11,6 +11,38 @@ const node_path_1 = require("node:path");
 const util_js_1 = require("./util.js");
 const node_process_1 = __importDefault(require("node:process"));
 const visitor_plugin_common_1 = require("@graphql-codegen/visitor-plugin-common");
+const mergeSerializable = (existing, incoming) => {
+    if (!existing)
+        return incoming;
+    if (existing.kind === "Object" && incoming.kind === "Object") {
+        const merged = { ...existing.value };
+        for (const [k, v] of Object.entries(incoming.value)) {
+            merged[k] = mergeSerializable(merged[k], v);
+        }
+        const typenameDesc = Object.getOwnPropertyDescriptor(existing.value, "__typename") ??
+            Object.getOwnPropertyDescriptor(incoming.value, "__typename");
+        if (typenameDesc)
+            Object.defineProperty(merged, "__typename", typenameDesc);
+        return {
+            kind: "Object",
+            value: merged,
+            conditionals: [
+                ...(existing.conditionals ?? []),
+                ...(incoming.conditionals ?? []),
+            ],
+            nonExhaustive: existing.nonExhaustive ?? incoming.nonExhaustive,
+            optional: existing.optional && incoming.optional,
+        };
+    }
+    if (existing.kind === "List" && incoming.kind === "List") {
+        return {
+            kind: "List",
+            value: mergeSerializable(existing.value, incoming.value),
+            optional: existing.optional && incoming.optional,
+        };
+    }
+    return incoming;
+};
 const getType = ({ type, ...props }) => {
     if (type.kind === "NamedType") {
         if (props.selections) {
@@ -46,7 +78,7 @@ const getType = ({ type, ...props }) => {
                         },
                     });
                 }
-                union[group][name] = value;
+                union[group][name] = mergeSerializable(union[group][name], value);
                 const def = props.definitions[actualTypeName];
                 // Use originalName for tracking field usage when field is aliased
                 const fieldNameForTracking = originalName ?? name;