graphql-data-generator 0.2.2 → 0.2.4

package/esm/codegen.js

@@ -289,7 +289,9 @@ const defaultScalars = {
     ID: "string",
 };
 export const codegen = (schema, files, { enums = "literals", scalars, includeTypenames = true, exports = [], typesFile, namingConvention = "keep", } = {}) => {
-    const rename = convertFactory({ namingConvention });
+    const rename = typesFile
+        ? convertFactory({ namingConvention })
+        : (v) => v;
     const schemaDoc = parse(typeof schema === "string" ? schema : printSchema(schema));
     scalars = { ...defaultScalars, ...scalars };
     const types = {};
@@ -391,6 +393,10 @@ export const codegen = (schema, files, { enums = "literals", scalars, includeTyp
                         console.warn(`Skipping unnamed operation in '${path}'`);
                         continue;
                     }
+                    if (operations[definition.operation].some((o) => o.name === name)) {
+                        console.warn(`Skipping duplicate operation '${name}'`);
+                        continue;
+                    }
                     operations[definition.operation].push({
                         name,
                         path,
@@ -501,7 +507,7 @@ ${collection.map((o) => `  ${o.name}: "${relative(process.cwd(), o.path)}",`).jo
                 throw new Error(`Could not find input '${i}'`);
             return `${exports.includes("types") ? "export " : ""}type ${i} = ${serializeType(serializeInput(def.fields ?? [], false, {}, references), true)};`;
         }).filter(filterOutputTypes), `export type Inputs = {
-${Array.from(handledInputs).map((i) => `  ${i}: ${i};`).join("\n")}
+${Array.from(handledInputs).map((i) => `  ${i}: ${rename(i)};`).join("\n")}
 };`, `export const inputs = [${Array.from(handledInputs).map((i) => `"${i}"`).join(", ")}] as const;`);
     }
     const usedTypes = Object.entries(types)
@@ -549,7 +555,9 @@ ${usedTypes.map(([name]) => `  ${name}: ${rename(name)};`).join("\n")}
     }
     else if (enums.startsWith("import:") &&
         usedReferences.some((r) => r.kind === Kind.ENUM_TYPE_DEFINITION)) {
-        serializedTypes.unshift(`import { ${usedReferences.filter((r) => r.kind === Kind.ENUM_TYPE_DEFINITION).map((r) => r.name.value).join(", ")} } from "${enums.slice(7)}";`);
+        serializedTypes.unshift(`import {
+  ${usedReferences.filter((r) => r.kind === Kind.ENUM_TYPE_DEFINITION).map((r) => r.name.value).join(",\n  ")},
+} from "${enums.slice(7)}";`);
     }
     return serializedTypes.join("\n\n") + "\n";
 };

package/esm/plugin.cjs

@@ -2,6 +2,7 @@
 module.exports = {
     async plugin(schema, documents, config) {
         const { codegen } = await import("./codegen.js");
-        return (config.banner ?? "") + codegen(schema, documents.map((d) => ({ path: d.location, content: d.rawSDL })), { namingConvention: "change-case-all#pascalCase", ...config });
+        const { formatCode } = await import("./util.js");
+        return (config.banner ?? "") + await formatCode(codegen(schema, documents.map((d) => ({ path: d.location, content: d.rawSDL })), { namingConvention: "change-case-all#pascalCase", ...config }));
     },
 };

package/esm/proxy.js

@@ -62,7 +62,7 @@ const resolveType = (definitions, path) => {
                 }
                 type = argument.type;
             }
-            while (parts[i + 2]?.match(/^\d$/)) {
+            while (parts[i + 2]?.match(/^\d+$/)) {
                 if (type.kind === Kind.NON_NULL_TYPE)
                     type = type.type;
                 if (type.kind !== Kind.LIST_TYPE)

package/esm/util.js

@@ -1,4 +1,4 @@
-import { exec } from "node:child_process";
+import { spawn } from "node:child_process";
 export const raise = (error) => {
     if (typeof error === "string") {
         const err = new Error(error);
@@ -10,14 +10,28 @@ export const raise = (error) => {
 export const formatCode = async (input) => {
     try {
         return await new Promise((resolve, reject) => {
-            const process = exec("deno fmt -", (error, stdout, stderr) => {
-                if (error)
-                    return reject(error);
-                if (stderr)
-                    return reject(new Error(stderr));
-                resolve(stdout);
+            const process = spawn("deno", ["fmt", "-"], {
+                stdio: ["pipe", "pipe", "pipe"],
             });
-            process.stdin?.write(input);
+            let output = "";
+            let errorOutput = "";
+            process.stdout.on("data", (data) => {
+                output += data.toString();
+            });
+            process.stderr.on("data", (data) => {
+                errorOutput += data.toString();
+            });
+            process.on("close", (code) => {
+                if (code !== 0 || errorOutput) {
+                    reject(new Error(errorOutput || `Process exited with code ${code}`));
+                }
+                else
+                    resolve(output);
+            });
+            process.on("error", (error) => {
+                reject(error);
+            });
+            process.stdin.write(input);
             process.stdin?.end();
         });
     }

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "graphql-data-generator",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/vocesgraphql-data-generator/.git"
+    "url": "git+https://github.com/voces/graphql-data-generator.git"
   },
   "license": "MIT",
   "bugs": {