@constructive-io/graphql-codegen 2.17.38 → 2.17.39

package/README.md

@@ -86,26 +86,16 @@ Endpoint introspection:
 
 ## Selection Options
 
-Configure result field selections, mutation input style, and connection pagination shape.
+Configure mutation input style and connection pagination shape.
 
 ```ts
 selection: {
-  defaultMutationModelFields?: string[]
-  modelFields?: Record<string, string[]>
   mutationInputMode?: 'expanded' | 'model' | 'raw' | 'patchCollapsed'
   connectionStyle?: 'nodes' | 'edges'
   forceModelOutput?: boolean
 }
 ```
 
-- `defaultMutationModelFields`
-  - Sets default fields selected from the object payload returned by mutations when the mutation exposes an OBJECT output.
-  - Example: `['id']` will select only the `id` from the returned model unless overridden per model.
-
-- `modelFields`
-  - Per‑model overrides for returned object payload fields.
-  - Example: `{ domain: ['id','domain','subdomain'] }` selects those fields from the `domain` object output.
-
 - `mutationInputMode`
   - Controls how mutation variables and `input` are generated.
   - `expanded`: one variable per input property; `input` is a flat object of those variables.
@@ -119,8 +109,7 @@ selection: {
   - `edges`: emits `totalCount`, `pageInfo { ... }`, and `edges { cursor node { ... } }`.
 
 - `forceModelOutput`
-  - When `true`, ensures the object payload is selected even if `defaultMutationModelFields` is empty, defaulting to `['id']`.
-  - Useful to avoid generating mutations that only return `clientMutationId`.
+  - When `true`, ensures the object payload selection is emitted to avoid a payload with only `clientMutationId`.
 
 ### Examples
 

package/esm/gql.js

@@ -480,12 +480,27 @@ export const createOne = ({ operationName, mutation, selection, }, typeNameOverr
                 }),
             }),
         ];
-    const selections = allAttrs.map((field) => t.field({ name: 'id' }));
-    const modelFields = selection?.modelFields?.[modelName] || selection?.defaultMutationModelFields || ['id'];
-    const nested = (modelFields.length > 0)
+    let idExists = true;
+    let availableFieldNames = [];
+    if (typeIndex) {
+        const typ = typeIndex.byName?.[mutation.model];
+        const fields = (typ && Array.isArray(typ.fields)) ? typ.fields : [];
+        idExists = fields.some((f) => f && f.name === 'id');
+        availableFieldNames = fields
+            .filter((f) => {
+            let r = f.type;
+            while (r && (r.kind === 'NON_NULL' || r.kind === 'LIST'))
+                r = r.ofType;
+            const kind = r?.kind;
+            return kind === 'SCALAR' || kind === 'ENUM';
+        })
+            .map((f) => f.name);
+    }
+    const finalFields = Array.from(new Set([...(idExists ? ['id'] : []), ...availableFieldNames]));
+    const nested = (finalFields.length > 0)
         ? [t.field({
                 name: modelName,
-                selectionSet: t.selectionSet({ selections: modelFields.map((f) => t.field({ name: f })) }),
+                selectionSet: t.selectionSet({ selections: finalFields.map((f) => t.field({ name: f })) }),
             })]
         : [];
     const ast = createGqlMutation({
@@ -577,7 +592,7 @@ export const patchOne = ({ operationName, mutation, selection, }, typeNameOverri
             unresolved++;
         return t.variableDefinition({ variable: t.variable({ name }), type: gqlType });
     });
-    const mustUseRaw = useCollapsedOpt || unresolved > 0;
+    const mustUseRaw = unresolved > 0;
     const selectArgs = mustUseRaw
         ? [t.argument({ name: 'input', value: t.variable({ name: 'input' }) })]
         : [
@@ -598,11 +613,18 @@ export const patchOne = ({ operationName, mutation, selection, }, typeNameOverri
                 }),
             }),
         ];
-    const modelFields = selection?.modelFields?.[modelName] || selection?.defaultMutationModelFields || ['id'];
-    const nestedPatch = (modelFields.length > 0)
+    let idExistsPatch = true;
+    if (typeIndex) {
+        const typ = typeIndex.byName?.[mutation.model];
+        const fields = (typ && Array.isArray(typ.fields)) ? typ.fields : [];
+        idExistsPatch = fields.some((f) => f && f.name === 'id');
+    }
+    const shouldDropIdPatch = /Extension$/i.test(modelName) || !idExistsPatch;
+    const idSelection = shouldDropIdPatch ? [] : ['id'];
+    const nestedPatch = (idSelection.length > 0)
         ? [t.field({
                 name: modelName,
-                selectionSet: t.selectionSet({ selections: modelFields.map((f) => t.field({ name: f })) }),
+                selectionSet: t.selectionSet({ selections: idSelection.map((f) => t.field({ name: f })) }),
             })]
         : [];
     const ast = createGqlMutation({
@@ -729,20 +751,41 @@ export const createMutation = ({ operationName, mutation, selection, }, typeName
     const scalarOutputs = (mutation.outputs || [])
         .filter((field) => field.type.kind === 'SCALAR')
         .map((f) => f.name);
-    const objectOutput = (mutation.outputs || []).find((field) => field.type.kind === 'OBJECT');
-    const selections = [];
-    if (objectOutput?.name) {
-        const modelFieldsRaw = selection?.modelFields?.[objectOutput.name] || selection?.defaultMutationModelFields || [];
-        const shouldDropId = /Extension$/i.test(objectOutput.name);
-        const fallbackFields = shouldDropId ? [] : ['id'];
-        const modelFields = (selection?.forceModelOutput && modelFieldsRaw.length === 0) ? fallbackFields : (modelFieldsRaw.length > 0 ? modelFieldsRaw : []);
-        if (modelFields.length > 0) {
-            selections.push(t.field({
-                name: objectOutput.name,
-                selectionSet: t.selectionSet({ selections: modelFields.map((f) => t.field({ name: f })) }),
-            }));
+    let objectOutputName = (mutation.outputs || [])
+        .find((field) => field.type.kind === 'OBJECT')?.name;
+    if (!objectOutputName) {
+        const payloadTypeName = mutation?.output?.name;
+        if (typeIndex && payloadTypeName) {
+            const payloadType = typeIndex.byName?.[payloadTypeName];
+            const fields = (payloadType && Array.isArray(payloadType.fields)) ? payloadType.fields : [];
+            const match = fields
+                .filter((f) => f && f.name !== 'clientMutationId')
+                .filter((f) => (refToNamedTypeName(f.type) || f.type?.name) !== 'Query')
+                .find((f) => (refToNamedTypeName(f.type) || f.type?.name) === mutation?.model);
+            if (match)
+                objectOutputName = match.name;
         }
     }
+    const selections = [];
+    if (objectOutputName) {
+        const modelTypeName = mutation?.model;
+        const modelType = typeIndex && modelTypeName ? typeIndex.byName?.[modelTypeName] : null;
+        const fieldNames = (modelType && Array.isArray(modelType.fields))
+            ? modelType.fields
+                .filter((f) => {
+                let r = f.type;
+                while (r && (r.kind === 'NON_NULL' || r.kind === 'LIST'))
+                    r = r.ofType;
+                const kind = r?.kind;
+                return kind === 'SCALAR' || kind === 'ENUM';
+            })
+                .map((f) => f.name)
+            : [];
+        selections.push(t.field({
+            name: objectOutputName,
+            selectionSet: t.selectionSet({ selections: fieldNames.map((n) => t.field({ name: n })) }),
+        }));
+    }
     if (scalarOutputs.length > 0) {
         selections.push(...scalarOutputs.map((o) => t.field({ name: o })));
     }

package/esm/options.js

@@ -10,7 +10,7 @@ export const defaultGraphQLCodegenOptions = {
     documents: { format: 'gql', convention: 'dashed', allowQueries: [], excludeQueries: [], excludePatterns: [] },
     features: { emitTypes: true, emitOperations: true, emitSdk: true, emitReactQuery: true },
     reactQuery: { fetcher: 'graphql-request', legacyMode: false, exposeDocument: false, addInfiniteQuery: false, reactQueryVersion: 5 },
-    selection: { defaultMutationModelFields: ['id'], modelFields: {}, mutationInputMode: 'patchCollapsed', connectionStyle: 'edges', forceModelOutput: true },
+    selection: { mutationInputMode: 'patchCollapsed', connectionStyle: 'edges', forceModelOutput: true },
     scalars: {},
     typeNameOverrides: {}
 };

package/gql.d.ts

@@ -84,8 +84,6 @@ export interface CreateOneArgs {
     operationName: string;
     mutation: MutationSpec;
     selection?: {
-        defaultMutationModelFields?: string[];
-        modelFields?: Record<string, string[]>;
         mutationInputMode?: 'expanded' | 'model' | 'raw' | 'patchCollapsed';
         connectionStyle?: 'nodes' | 'edges';
         forceModelOutput?: boolean;
@@ -115,8 +113,6 @@ export interface PatchOneArgs {
     operationName: string;
     mutation: MutationSpec;
     selection?: {
-        defaultMutationModelFields?: string[];
-        modelFields?: Record<string, string[]>;
         mutationInputMode?: 'expanded' | 'model' | 'raw' | 'patchCollapsed';
         connectionStyle?: 'nodes' | 'edges';
         forceModelOutput?: boolean;
@@ -140,8 +136,6 @@ export interface CreateMutationArgs {
     operationName: string;
     mutation: MutationSpec;
     selection?: {
-        defaultMutationModelFields?: string[];
-        modelFields?: Record<string, string[]>;
         mutationInputMode?: 'expanded' | 'model' | 'raw' | 'patchCollapsed';
         connectionStyle?: 'nodes' | 'edges';
         forceModelOutput?: boolean;

package/gql.js

@@ -527,12 +527,27 @@ const createOne = ({ operationName, mutation, selection, }, typeNameOverrides, t
                 }),
             }),
         ];
-    const selections = allAttrs.map((field) => t.field({ name: 'id' }));
-    const modelFields = selection?.modelFields?.[modelName] || selection?.defaultMutationModelFields || ['id'];
-    const nested = (modelFields.length > 0)
+    let idExists = true;
+    let availableFieldNames = [];
+    if (typeIndex) {
+        const typ = typeIndex.byName?.[mutation.model];
+        const fields = (typ && Array.isArray(typ.fields)) ? typ.fields : [];
+        idExists = fields.some((f) => f && f.name === 'id');
+        availableFieldNames = fields
+            .filter((f) => {
+            let r = f.type;
+            while (r && (r.kind === 'NON_NULL' || r.kind === 'LIST'))
+                r = r.ofType;
+            const kind = r?.kind;
+            return kind === 'SCALAR' || kind === 'ENUM';
+        })
+            .map((f) => f.name);
+    }
+    const finalFields = Array.from(new Set([...(idExists ? ['id'] : []), ...availableFieldNames]));
+    const nested = (finalFields.length > 0)
         ? [t.field({
                 name: modelName,
-                selectionSet: t.selectionSet({ selections: modelFields.map((f) => t.field({ name: f })) }),
+                selectionSet: t.selectionSet({ selections: finalFields.map((f) => t.field({ name: f })) }),
             })]
         : [];
     const ast = (0, exports.createGqlMutation)({
@@ -625,7 +640,7 @@ const patchOne = ({ operationName, mutation, selection, }, typeNameOverrides, ty
             unresolved++;
         return t.variableDefinition({ variable: t.variable({ name }), type: gqlType });
     });
-    const mustUseRaw = useCollapsedOpt || unresolved > 0;
+    const mustUseRaw = unresolved > 0;
     const selectArgs = mustUseRaw
         ? [t.argument({ name: 'input', value: t.variable({ name: 'input' }) })]
         : [
@@ -646,11 +661,18 @@ const patchOne = ({ operationName, mutation, selection, }, typeNameOverrides, ty
                 }),
             }),
         ];
-    const modelFields = selection?.modelFields?.[modelName] || selection?.defaultMutationModelFields || ['id'];
-    const nestedPatch = (modelFields.length > 0)
+    let idExistsPatch = true;
+    if (typeIndex) {
+        const typ = typeIndex.byName?.[mutation.model];
+        const fields = (typ && Array.isArray(typ.fields)) ? typ.fields : [];
+        idExistsPatch = fields.some((f) => f && f.name === 'id');
+    }
+    const shouldDropIdPatch = /Extension$/i.test(modelName) || !idExistsPatch;
+    const idSelection = shouldDropIdPatch ? [] : ['id'];
+    const nestedPatch = (idSelection.length > 0)
         ? [t.field({
                 name: modelName,
-                selectionSet: t.selectionSet({ selections: modelFields.map((f) => t.field({ name: f })) }),
+                selectionSet: t.selectionSet({ selections: idSelection.map((f) => t.field({ name: f })) }),
             })]
         : [];
     const ast = (0, exports.createGqlMutation)({
@@ -779,20 +801,41 @@ const createMutation = ({ operationName, mutation, selection, }, typeNameOverrid
     const scalarOutputs = (mutation.outputs || [])
         .filter((field) => field.type.kind === 'SCALAR')
         .map((f) => f.name);
-    const objectOutput = (mutation.outputs || []).find((field) => field.type.kind === 'OBJECT');
-    const selections = [];
-    if (objectOutput?.name) {
-        const modelFieldsRaw = selection?.modelFields?.[objectOutput.name] || selection?.defaultMutationModelFields || [];
-        const shouldDropId = /Extension$/i.test(objectOutput.name);
-        const fallbackFields = shouldDropId ? [] : ['id'];
-        const modelFields = (selection?.forceModelOutput && modelFieldsRaw.length === 0) ? fallbackFields : (modelFieldsRaw.length > 0 ? modelFieldsRaw : []);
-        if (modelFields.length > 0) {
-            selections.push(t.field({
-                name: objectOutput.name,
-                selectionSet: t.selectionSet({ selections: modelFields.map((f) => t.field({ name: f })) }),
-            }));
+    let objectOutputName = (mutation.outputs || [])
+        .find((field) => field.type.kind === 'OBJECT')?.name;
+    if (!objectOutputName) {
+        const payloadTypeName = mutation?.output?.name;
+        if (typeIndex && payloadTypeName) {
+            const payloadType = typeIndex.byName?.[payloadTypeName];
+            const fields = (payloadType && Array.isArray(payloadType.fields)) ? payloadType.fields : [];
+            const match = fields
+                .filter((f) => f && f.name !== 'clientMutationId')
+                .filter((f) => (refToNamedTypeName(f.type) || f.type?.name) !== 'Query')
+                .find((f) => (refToNamedTypeName(f.type) || f.type?.name) === mutation?.model);
+            if (match)
+                objectOutputName = match.name;
         }
     }
+    const selections = [];
+    if (objectOutputName) {
+        const modelTypeName = mutation?.model;
+        const modelType = typeIndex && modelTypeName ? typeIndex.byName?.[modelTypeName] : null;
+        const fieldNames = (modelType && Array.isArray(modelType.fields))
+            ? modelType.fields
+                .filter((f) => {
+                let r = f.type;
+                while (r && (r.kind === 'NON_NULL' || r.kind === 'LIST'))
+                    r = r.ofType;
+                const kind = r?.kind;
+                return kind === 'SCALAR' || kind === 'ENUM';
+            })
+                .map((f) => f.name)
+            : [];
+        selections.push(t.field({
+            name: objectOutputName,
+            selectionSet: t.selectionSet({ selections: fieldNames.map((n) => t.field({ name: n })) }),
+        }));
+    }
     if (scalarOutputs.length > 0) {
         selections.push(...scalarOutputs.map((o) => t.field({ name: o })));
     }

package/options.d.ts

@@ -34,8 +34,6 @@ export interface GraphQLCodegenOptions {
         reactQueryVersion?: number;
     };
     selection?: {
-        defaultMutationModelFields?: string[];
-        modelFields?: Record<string, string[]>;
         mutationInputMode?: 'expanded' | 'model' | 'raw' | 'patchCollapsed';
         connectionStyle?: 'nodes' | 'edges';
         forceModelOutput?: boolean;

package/options.js

@@ -14,7 +14,7 @@ exports.defaultGraphQLCodegenOptions = {
     documents: { format: 'gql', convention: 'dashed', allowQueries: [], excludeQueries: [], excludePatterns: [] },
     features: { emitTypes: true, emitOperations: true, emitSdk: true, emitReactQuery: true },
     reactQuery: { fetcher: 'graphql-request', legacyMode: false, exposeDocument: false, addInfiniteQuery: false, reactQueryVersion: 5 },
-    selection: { defaultMutationModelFields: ['id'], modelFields: {}, mutationInputMode: 'patchCollapsed', connectionStyle: 'edges', forceModelOutput: true },
+    selection: { mutationInputMode: 'patchCollapsed', connectionStyle: 'edges', forceModelOutput: true },
     scalars: {},
     typeNameOverrides: {}
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructive-io/graphql-codegen",
-  "version": "2.17.38",
+  "version": "2.17.39",
   "description": "Generate queries and mutations for use with Graphile",
   "author": "Constructive <developers@constructive.io>",
   "main": "index.js",
@@ -29,7 +29,7 @@
     "test:watch": "jest --watch"
   },
   "devDependencies": {
-    "@constructive-io/graphql-test": "^2.11.31",
+    "@constructive-io/graphql-test": "^2.11.32",
     "@types/babel__generator": "^7.27.0",
     "@types/pluralize": "0.0.33",
     "makage": "^0.1.9"
@@ -48,7 +48,7 @@
     "graphql-request": "6.1.0",
     "graphql-tag": "2.12.6",
     "inflection": "^1.12.0",
-    "introspectron": "^2.14.36",
+    "introspectron": "^2.14.37",
     "pluralize": "^8.0.0"
   },
   "keywords": [
@@ -58,5 +58,5 @@
     "graphile",
     "constructive"
   ],
-  "gitHead": "09721f934b339bd8c55d2e633abaded6d20b0f65"
+  "gitHead": "6883e3b93da28078483bc6aa25862613ef4405b2"
 }