graphql-data-generator 0.4.0-alpha.4 → 0.4.0-alpha.6

package/README.md

@@ -8,6 +8,7 @@ tests.
 
 - [Example](#example-setting-up-a-builder-and-building-objects)
 - [CLI options](#cli-options)
+- [@graphql-codegen plugin](#graphql-codegen-plugin)
 - [Patches](#patches)
 - [Transforms](#transforms)
 - [Testing](#testing)

package/esm/cli.js

@@ -4,7 +4,6 @@ import { readFile } from "node:fs";
 import fg from "fast-glob";
 import { parseArgs } from "node:util";
 import { codegen, loadFiles } from "./codegen.js";
-import { formatCode } from "./util.js";
 import process from "node:process";
 (async () => {
     const args = parseArgs({
@@ -80,14 +79,14 @@ import process from "node:process";
             banner = args.banner;
     }
     try {
-        const file = banner + await formatCode(codegen(schema, operations, {
+        const file = banner + codegen(schema, operations, {
             enums: args.enums,
             includeTypenames: !args.notypenames,
             scalars,
             exports,
             typesFile: args.typesFile,
             namingConvention: args.namingConvention,
-        }));
+        });
         if (args.outfile)
             await dntShim.Deno.writeTextFile(args.outfile, file);
         else

package/esm/codegen.js

@@ -310,9 +310,9 @@ const defaultScalars = {
     Boolean: "boolean",
     ID: "string",
 };
-export const codegen = (schema, files, { enums = "literals", scalars, includeTypenames = true, exports = [], typesFile, namingConvention = "keep", } = {}) => {
-    const rename = typesFile
-        ? convertFactory({ namingConvention })
+export const codegen = (schema, files, { enums = "literals", scalars, includeTypenames = true, exports = [], typesFile, namingConvention, omitOperationSuffix = !typesFile, } = {}) => {
+    const rename = namingConvention || typesFile
+        ? convertFactory({ namingConvention: namingConvention ?? "keep" })
         : (v) => v;
     const schemaDoc = parse(typeof schema === "string" ? schema : printSchema(schema));
     scalars = { ...defaultScalars, ...scalars };
@@ -436,7 +436,7 @@ export const codegen = (schema, files, { enums = "literals", scalars, includeTyp
     }
     const operationDataName = (operation, type) => {
         const name = operation.name;
-        if (inputs[name] || types[name] || typesFile) {
+        if (inputs[name] || types[name] || !omitOperationSuffix) {
             return rename(`${name}${type[0].toUpperCase()}${type.slice(1)}`);
         }
         for (const key in operations) {
@@ -604,6 +604,6 @@ export const loadFiles = async (schemaPath, operationDirs) => {
     }
     return [
         await readFile(schemaPath, "utf-8"),
-        await Promise.all(operationPromises),
+        (await Promise.all(operationPromises)).sort((a, b) => a.path.localeCompare(b.path)),
     ];
 };

package/esm/index.js

@@ -1,4 +1,4 @@
 export { init } from "./init.js";
 export { codegen } from "./codegen.js";
 export { clear, operation, proxy } from "./proxy.js";
-export { formatCode, toObject } from "./util.js";
+export { toObject } from "./util.js";

package/esm/jest.js

@@ -207,8 +207,8 @@ export const MockedProvider = ({ mocks, stack: renderStack, children, link: pass
         });
         return ApolloLink.from([
             errorLoggingLink,
-            mockLink,
             ...(passedLink ? [passedLink] : []),
+            mockLink,
         ]);
     }, [observableMocks, renderStack]);
     if (_failRefetchWarnings) {

package/esm/plugin.cjs

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

package/esm/util.js

@@ -1,4 +1,3 @@
-import { spawn } from "node:child_process";
 export const raise = (error) => {
     if (typeof error === "string") {
         const err = new Error(error);
@@ -7,38 +6,6 @@ export const raise = (error) => {
     }
     throw error;
 };
-export const formatCode = async (input) => {
-    try {
-        return await new Promise((resolve, reject) => {
-            const process = spawn("deno", ["fmt", "-"], {
-                stdio: ["pipe", "pipe", "pipe"],
-            });
-            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();
-        });
-    }
-    catch {
-        return input;
-    }
-};
 export const absurd = (v) => {
     const error = new Error(`Unexpected value: ${v}`);
     Error.captureStackTrace(error, absurd);

package/package.json

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

package/script/cli.js

@@ -32,7 +32,6 @@ const node_fs_1 = require("node:fs");
 const fast_glob_1 = __importDefault(require("fast-glob"));
 const node_util_1 = require("node:util");
 const codegen_js_1 = require("./codegen.js");
-const util_js_1 = require("./util.js");
 const node_process_1 = __importDefault(require("node:process"));
 (async () => {
     const args = (0, node_util_1.parseArgs)({
@@ -108,14 +107,14 @@ const node_process_1 = __importDefault(require("node:process"));
             banner = args.banner;
     }
     try {
-        const file = banner + await (0, util_js_1.formatCode)((0, codegen_js_1.codegen)(schema, operations, {
+        const file = banner + (0, codegen_js_1.codegen)(schema, operations, {
             enums: args.enums,
             includeTypenames: !args.notypenames,
             scalars,
             exports,
             typesFile: args.typesFile,
             namingConvention: args.namingConvention,
-        }));
+        });
         if (args.outfile)
             await dntShim.Deno.writeTextFile(args.outfile, file);
         else

package/script/codegen.js

@@ -316,9 +316,9 @@ const defaultScalars = {
     Boolean: "boolean",
     ID: "string",
 };
-const codegen = (schema, files, { enums = "literals", scalars, includeTypenames = true, exports = [], typesFile, namingConvention = "keep", } = {}) => {
-    const rename = typesFile
-        ? (0, visitor_plugin_common_1.convertFactory)({ namingConvention })
+const codegen = (schema, files, { enums = "literals", scalars, includeTypenames = true, exports = [], typesFile, namingConvention, omitOperationSuffix = !typesFile, } = {}) => {
+    const rename = namingConvention || typesFile
+        ? (0, visitor_plugin_common_1.convertFactory)({ namingConvention: namingConvention ?? "keep" })
         : (v) => v;
     const schemaDoc = (0, graphql_1.parse)(typeof schema === "string" ? schema : (0, graphql_1.printSchema)(schema));
     scalars = { ...defaultScalars, ...scalars };
@@ -442,7 +442,7 @@ const codegen = (schema, files, { enums = "literals", scalars, includeTypenames
     }
     const operationDataName = (operation, type) => {
         const name = operation.name;
-        if (inputs[name] || types[name] || typesFile) {
+        if (inputs[name] || types[name] || !omitOperationSuffix) {
             return rename(`${name}${type[0].toUpperCase()}${type.slice(1)}`);
         }
         for (const key in operations) {
@@ -611,7 +611,7 @@ const loadFiles = async (schemaPath, operationDirs) => {
     }
     return [
         await (0, promises_1.readFile)(schemaPath, "utf-8"),
-        await Promise.all(operationPromises),
+        (await Promise.all(operationPromises)).sort((a, b) => a.path.localeCompare(b.path)),
     ];
 };
 exports.loadFiles = loadFiles;

package/script/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toObject = exports.formatCode = exports.proxy = exports.operation = exports.clear = exports.codegen = exports.init = void 0;
+exports.toObject = 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");
@@ -10,5 +10,4 @@ Object.defineProperty(exports, "clear", { enumerable: true, get: function () { r
 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; } });
 Object.defineProperty(exports, "toObject", { enumerable: true, get: function () { return util_js_1.toObject; } });

package/script/jest.js

@@ -237,8 +237,8 @@ const MockedProvider = ({ mocks, stack: renderStack, children, link: passedLink,
         });
         return client_1.ApolloLink.from([
             errorLoggingLink,
-            mockLink,
             ...(passedLink ? [passedLink] : []),
+            mockLink,
         ]);
     }, [observableMocks, renderStack]);
     if (_failRefetchWarnings) {

package/script/plugin.cjs

@@ -25,7 +25,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 module.exports = {
     async plugin(schema, documents, config) {
         const { codegen } = await Promise.resolve().then(() => __importStar(require("./codegen.js")));
-        const { formatCode } = await Promise.resolve().then(() => __importStar(require("./util.js")));
-        return (config.banner ?? "") + await formatCode(codegen(schema, documents.map((d) => ({ path: d.location, content: d.rawSDL })), { namingConvention: "change-case-all#pascalCase", ...config }));
+        return (config.banner ?? "") + codegen(schema, documents.map((d) => ({ path: d.location, content: d.rawSDL })), { namingConvention: "change-case-all#pascalCase", ...config });
     },
 };

package/script/util.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toObject = exports.absurd = exports.formatCode = exports.raise = void 0;
-const node_child_process_1 = require("node:child_process");
+exports.toObject = exports.absurd = exports.raise = void 0;
 const raise = (error) => {
     if (typeof error === "string") {
         const err = new Error(error);
@@ -11,39 +10,6 @@ const raise = (error) => {
     throw error;
 };
 exports.raise = raise;
-const formatCode = async (input) => {
-    try {
-        return await new Promise((resolve, reject) => {
-            const process = (0, node_child_process_1.spawn)("deno", ["fmt", "-"], {
-                stdio: ["pipe", "pipe", "pipe"],
-            });
-            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();
-        });
-    }
-    catch {
-        return input;
-    }
-};
-exports.formatCode = formatCode;
 const absurd = (v) => {
     const error = new Error(`Unexpected value: ${v}`);
     Error.captureStackTrace(error, exports.absurd);

package/types/codegen.d.ts

@@ -3,13 +3,14 @@ import { type NamingConvention } from "@graphql-codegen/visitor-plugin-common";
 export declare const codegen: (schema: GraphQLSchema | string, files: {
     path: string;
     content: string;
-}[], { enums, scalars, includeTypenames, exports, typesFile, namingConvention, }?: {
+}[], { enums, scalars, includeTypenames, exports, typesFile, namingConvention, omitOperationSuffix, }?: {
     enums?: string;
     scalars?: Record<string, string | undefined>;
     includeTypenames?: boolean;
     exports?: ("types" | "operations")[];
     typesFile?: string;
     namingConvention?: NamingConvention;
+    omitOperationSuffix?: boolean;
 }) => string;
 export declare const loadFiles: (schemaPath: string, operationDirs: string[]) => Promise<[schema: string, operations: {
     path: string;

package/types/index.d.ts

@@ -2,4 +2,4 @@ export { init } from "./init.js";
 export type { DeepPartial, OperationMock, Patch } from "./types.js";
 export { codegen } from "./codegen.js";
 export { clear, operation, proxy } from "./proxy.js";
-export { formatCode, toObject } from "./util.js";
+export { toObject } from "./util.js";

package/types/jest.d.ts

@@ -1,7 +1,7 @@
 import React from "react";
 import { MockedProviderProps, MockedResponse } from "@apollo/client/testing";
 import "@testing-library/react/dont-cleanup-after-each";
-type ExtendedMockedResponse = MockedResponse & {
+export type ExtendedMockedResponse = MockedResponse & {
     stack?: string;
     watch?: boolean;
     optional?: boolean;
@@ -49,4 +49,3 @@ export declare const MockedProvider: ({ mocks, stack: renderStack, children, lin
     mocks: ReadonlyArray<ExtendedMockedResponse>;
     stack?: string;
 }) => React.JSX.Element;
-export {};

package/types/util.d.ts

@@ -1,5 +1,4 @@
 export declare const raise: (error: Error | string) => never;
-export declare const formatCode: (input: string) => Promise<string>;
 export declare const absurd: (v: never) => never;
 type StripFunctions<T> = {
     [K in keyof T]: T[K] extends (...args: any[]) => any ? never : T[K] extends object ? StripFunctions<T[K]> : T[K];