@constructive-io/graphql-codegen 2.17.42 → 2.17.43

package/codegen.js

@@ -206,11 +206,11 @@ async function runCodegen(opts, cwd) {
             filename: sdkFile,
             schema: schema,
             documents,
-            config: { scalars: options.scalars || {} },
+            config: { scalars: options.scalars || {}, dedupeOperationSuffix: true },
             plugins: [
                 { typescript: {} },
                 { 'typescript-operations': {} },
-                { 'typescript-graphql-request': {} }
+                { 'typescript-graphql-request': { dedupeOperationSuffix: true } }
             ],
             pluginMap: {
                 typescript: typescriptPlugin,
@@ -243,7 +243,7 @@ async function runCodegen(opts, cwd) {
             filename: reactQueryFile,
             schema: schema,
             documents,
-            config: rqConfig,
+            config: { ...rqConfig, dedupeOperationSuffix: true },
             plugins: [
                 { typescript: {} },
                 { 'typescript-operations': {} },

package/esm/codegen.js

@@ -166,11 +166,11 @@ export async function runCodegen(opts, cwd) {
             filename: sdkFile,
             schema: schema,
             documents,
-            config: { scalars: options.scalars || {} },
+            config: { scalars: options.scalars || {}, dedupeOperationSuffix: true },
             plugins: [
                 { typescript: {} },
                 { 'typescript-operations': {} },
-                { 'typescript-graphql-request': {} }
+                { 'typescript-graphql-request': { dedupeOperationSuffix: true } }
             ],
             pluginMap: {
                 typescript: typescriptPlugin,
@@ -203,7 +203,7 @@ export async function runCodegen(opts, cwd) {
             filename: reactQueryFile,
             schema: schema,
             documents,
-            config: rqConfig,
+            config: { ...rqConfig, dedupeOperationSuffix: true },
             plugins: [
                 { typescript: {} },
                 { 'typescript-operations': {} },

package/esm/gql.js

@@ -1,9 +1,7 @@
 // TODO: use inflection for all the things
 // const { singularize } = require('inflection');
 import * as t from 'gql-ast';
-// @ts-ignore
 import inflection from 'inflection';
-import plz from 'pluralize';
 const NON_MUTABLE_PROPS = [
     'id',
     'createdAt',
@@ -58,6 +56,9 @@ function extractNamedTypeName(node) {
         n = n.type;
     return n && n.name ? n.name : null;
 }
+function singularModel(name) {
+    return inflection.singularize(name);
+}
 export const createGqlMutation = ({ operationName, mutationName, selectArgs, variableDefinitions, modelName, selections, useModel = true, }) => {
     const opSel = !modelName
         ? [
@@ -425,7 +426,7 @@ export const createOne = ({ operationName, mutation, selection, }, typeNameOverr
         console.log('no input field for mutation for ' + mutationName);
         return;
     }
-    const modelName = inflection.camelize([plz.singular(mutation.model)].join('_'), true);
+    const modelName = inflection.camelize([singularModel(mutation.model)].join('_'), true);
     const allAttrs = objectToArray(mutation.properties.input.properties[modelName].properties);
     const attrs = allAttrs.filter((field) => field.name === 'id' ? Boolean(field.isNotNull) : !NON_MUTABLE_PROPS.includes(field.name));
     const useRaw = selection?.mutationInputMode === 'raw';
@@ -521,7 +522,7 @@ export const patchOne = ({ operationName, mutation, selection, }, typeNameOverri
         console.log('no input field for mutation for ' + mutationName);
         return;
     }
-    const modelName = inflection.camelize([plz.singular(mutation.model)].join('_'), true);
+    const modelName = inflection.camelize([singularModel(mutation.model)].join('_'), true);
     // @ts-ignore
     const allAttrs = objectToArray(mutation.properties.input.properties['patch']?.properties || {});
     const patchAttrs = allAttrs.filter(
@@ -530,7 +531,7 @@ export const patchOne = ({ operationName, mutation, selection, }, typeNameOverri
     const patchByAttrs = objectToArray(mutation.properties.input.properties).filter((n) => n.name !== 'patch');
     const patchers = patchByAttrs.map((p) => p.name);
     const useCollapsedOpt = selection?.mutationInputMode === 'patchCollapsed';
-    const ModelPascal = inflection.camelize(plz.singular(mutation.model), false);
+    const ModelPascal = inflection.camelize(singularModel(mutation.model), false);
     const patchTypeName = `${ModelPascal}Patch`;
     const inputTypeName = resolveTypeName('input', mutation.properties?.input?.type || mutation.properties?.input, typeNameOverrides);
     let unresolved = 0;
@@ -645,7 +646,7 @@ export const deleteOne = ({ operationName, mutation, }, typeNameOverrides, typeI
         console.log('no input field for mutation for ' + mutationName);
         return;
     }
-    const modelName = inflection.camelize([plz.singular(mutation.model)].join('_'), true);
+    const modelName = inflection.camelize([singularModel(mutation.model)].join('_'), true);
     // @ts-ignore
     const deleteAttrs = objectToArray(mutation.properties.input.properties);
     const inputTypeName = resolveTypeName('input', mutation.properties?.input?.type || mutation.properties?.input, typeNameOverrides);

package/gql.js

@@ -41,9 +41,7 @@ exports.getSelections = getSelections;
 // TODO: use inflection for all the things
 // const { singularize } = require('inflection');
 const t = __importStar(require("gql-ast"));
-// @ts-ignore
 const inflection_1 = __importDefault(require("inflection"));
-const pluralize_1 = __importDefault(require("pluralize"));
 const NON_MUTABLE_PROPS = [
     'id',
     'createdAt',
@@ -98,6 +96,9 @@ function extractNamedTypeName(node) {
         n = n.type;
     return n && n.name ? n.name : null;
 }
+function singularModel(name) {
+    return inflection_1.default.singularize(name);
+}
 const createGqlMutation = ({ operationName, mutationName, selectArgs, variableDefinitions, modelName, selections, useModel = true, }) => {
     const opSel = !modelName
         ? [
@@ -472,7 +473,7 @@ const createOne = ({ operationName, mutation, selection, }, typeNameOverrides, t
         console.log('no input field for mutation for ' + mutationName);
         return;
     }
-    const modelName = inflection_1.default.camelize([pluralize_1.default.singular(mutation.model)].join('_'), true);
+    const modelName = inflection_1.default.camelize([singularModel(mutation.model)].join('_'), true);
     const allAttrs = objectToArray(mutation.properties.input.properties[modelName].properties);
     const attrs = allAttrs.filter((field) => field.name === 'id' ? Boolean(field.isNotNull) : !NON_MUTABLE_PROPS.includes(field.name));
     const useRaw = selection?.mutationInputMode === 'raw';
@@ -569,7 +570,7 @@ const patchOne = ({ operationName, mutation, selection, }, typeNameOverrides, ty
         console.log('no input field for mutation for ' + mutationName);
         return;
     }
-    const modelName = inflection_1.default.camelize([pluralize_1.default.singular(mutation.model)].join('_'), true);
+    const modelName = inflection_1.default.camelize([singularModel(mutation.model)].join('_'), true);
     // @ts-ignore
     const allAttrs = objectToArray(mutation.properties.input.properties['patch']?.properties || {});
     const patchAttrs = allAttrs.filter(
@@ -578,7 +579,7 @@ const patchOne = ({ operationName, mutation, selection, }, typeNameOverrides, ty
     const patchByAttrs = objectToArray(mutation.properties.input.properties).filter((n) => n.name !== 'patch');
     const patchers = patchByAttrs.map((p) => p.name);
     const useCollapsedOpt = selection?.mutationInputMode === 'patchCollapsed';
-    const ModelPascal = inflection_1.default.camelize(pluralize_1.default.singular(mutation.model), false);
+    const ModelPascal = inflection_1.default.camelize(singularModel(mutation.model), false);
     const patchTypeName = `${ModelPascal}Patch`;
     const inputTypeName = resolveTypeName('input', mutation.properties?.input?.type || mutation.properties?.input, typeNameOverrides);
     let unresolved = 0;
@@ -694,7 +695,7 @@ const deleteOne = ({ operationName, mutation, }, typeNameOverrides, typeIndex) =
         console.log('no input field for mutation for ' + mutationName);
         return;
     }
-    const modelName = inflection_1.default.camelize([pluralize_1.default.singular(mutation.model)].join('_'), true);
+    const modelName = inflection_1.default.camelize([singularModel(mutation.model)].join('_'), true);
     // @ts-ignore
     const deleteAttrs = objectToArray(mutation.properties.input.properties);
     const inputTypeName = resolveTypeName('input', mutation.properties?.input?.type || mutation.properties?.input, typeNameOverrides);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructive-io/graphql-codegen",
-  "version": "2.17.42",
+  "version": "2.17.43",
   "description": "Generate queries and mutations for use with Graphile",
   "author": "Constructive <developers@constructive.io>",
   "main": "index.js",
@@ -29,9 +29,9 @@
     "test:watch": "jest --watch"
   },
   "devDependencies": {
-    "@constructive-io/graphql-test": "^2.11.35",
+    "@constructive-io/graphql-test": "^2.11.36",
     "@types/babel__generator": "^7.27.0",
-    "@types/pluralize": "0.0.33",
+    "@types/inflection": "^2.0.0",
     "makage": "^0.1.9"
   },
   "dependencies": {
@@ -48,8 +48,7 @@
     "graphql-request": "6.1.0",
     "graphql-tag": "2.12.6",
     "inflection": "^1.12.0",
-    "introspectron": "^2.14.40",
-    "pluralize": "^8.0.0"
+    "introspectron": "^2.14.41"
   },
   "keywords": [
     "graphql",
@@ -58,5 +57,5 @@
     "graphile",
     "constructive"
   ],
-  "gitHead": "324881a46912b7d15a76f864aada03ce926f9176"
+  "gitHead": "bec3240e4e0f93b8edb386734eeb560403f574da"
 }