@snowtop/ent 0.1.0-alpha132 → 0.1.0-alpha134

package/graphql/graphql.js

@@ -420,15 +420,29 @@ class GQLCapture {
                 if (inter) {
                     const fields = this.customFields.get(inter.nodeName);
                     if (fields) {
+                        // check for duplicate fields
+                        // if field is already defined no need to add it
                         let objFields = this.customFields.get(obj.nodeName);
                         if (!objFields) {
                             objFields = [];
                         }
+                        let map = new Map();
+                        for (const f of objFields) {
+                            map.set(f.gqlName, f);
+                        }
                         for (const field of fields) {
-                            objFields.push({
+                            const newField = {
                                 ...field,
                                 nodeName: obj.nodeName,
-                            });
+                            };
+                            if (map.has(field.gqlName)) {
+                                const existing = map.get(field.gqlName);
+                                if (JSON.stringify(existing) !== JSON.stringify(newField)) {
+                                    throw new Error(`object ${obj.nodeName} has duplicate field ${field.gqlName} with different definition`);
+                                }
+                                continue;
+                            }
+                            objFields.push(newField);
                         }
                         this.customFields.set(obj.nodeName, objFields);
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowtop/ent",
-  "version": "0.1.0-alpha132",
+  "version": "0.1.0-alpha134",
   "description": "snowtop ent framework",
   "main": "index.js",
   "types": "index.d.ts",
@@ -8,6 +8,7 @@
     "example": "examples"
   },
   "dependencies": {
+    "@swc-node/register": "^1.6.5",
     "@types/node": "^18.11.18",
     "camel-case": "^4.1.2",
     "cosmiconfig": "^8.0.0",

package/scripts/custom_graphql.js

@@ -149,12 +149,20 @@ async function captureDynamic(filePath, gqlCapture) {
         return;
     }
     return await new Promise((resolve, reject) => {
-        // do we eventually need tsconfig-paths here or do we get it by default because child process?
-        const args = ["--swc", filePath];
-        if (process.env.DISABLE_SWC) {
-            args.shift();
+        // we seem to get tsconfig-paths by default because child process but not 100% sure...
+        const args = ["--transpileOnly"];
+        const env = {
+            ...process.env,
+        };
+        if (!process.env.DISABLE_SWC) {
+            args.push("-r", "@swc-node/register");
+            env.SWCRC = "true";
         }
-        const r = (0, child_process_1.spawn)("ts-node", args);
+        args.push(filePath);
+        console.error("running ts-node", args, env);
+        const r = (0, child_process_1.spawn)("ts-node", args, {
+            env,
+        });
         const datas = [];
         r.stdout.on("data", (data) => {
             datas.push(data.toString());