@constructive-io/graphql-codegen 4.40.5 → 4.41.0

package/esm/core/codegen/orm/model-generator.js

@@ -7,7 +7,7 @@
 import * as t from '@babel/types';
 import { singularize } from 'inflekt';
 import { generateCode } from '../babel-ast';
-import { getCreateInputTypeName, getCreateMutationName, getDeleteInputTypeName, getDeleteMutationName, getFilterTypeName, getGeneratedFileHeader, getOrderByTypeName, getPrimaryKeyInfo, getSingleRowQueryName, getTableNames, hasValidPrimaryKey, lcFirst, ucFirst, } from '../utils';
+import { getCreateInputTypeName, getCreateMutationName, getDeleteInputTypeName, getDeleteMutationName, getFilterTypeName, getGeneratedFileHeader, getOrderByTypeName, getPrimaryKeyInfo, getTableNames, hasValidPrimaryKey, lcFirst, ucFirst, } from '../utils';
 function createImportDeclaration(moduleSpecifier, namedImports, typeOnly = false) {
     const specifiers = namedImports.map((name) => t.importSpecifier(t.identifier(name), t.identifier(name)));
     const decl = t.importDeclaration(specifiers, t.stringLiteral(moduleSpecifier));
@@ -83,7 +83,10 @@ export function generateModelFile(table, _useSharedTypes, options, allTables) {
     const pkField = pkFields[0];
     const pluralQueryName = table.query?.all ?? pluralName;
     const singleQueryName = table.query?.one;
-    const singleResultFieldName = getSingleRowQueryName(table);
+    // The unwrapped result key for findFirst/findOne — must be the friendly
+    // singular noun (e.g. "animal"), NOT the GraphQL by-id query name (e.g.
+    // "animalById"), so the surface aligns with the rest of the SDK.
+    const singleResultFieldName = singularName;
     const createMutationName = table.query?.create ?? `create${typeName}`;
     const updateMutationName = table.query?.update;
     const deleteMutationName = table.query?.delete;
@@ -96,6 +99,12 @@ export function generateModelFile(table, _useSharedTypes, options, allTables) {
         const jt = allTables?.find((tb) => tb.name === r.junctionTable);
         return jt?.query?.delete != null;
     });
+    // Detect which bulk mutations are available for this table
+    const bulkInsertMutationName = table.query?.bulkInsert ?? null;
+    const bulkUpsertMutationName = table.query?.bulkUpsert ?? null;
+    const bulkUpdateMutationName = table.query?.bulkUpdate ?? null;
+    const bulkDeleteMutationName = table.query?.bulkDelete ?? null;
+    const hasBulk = !!(bulkInsertMutationName || bulkUpsertMutationName || bulkUpdateMutationName || bulkDeleteMutationName);
     const queryBuilderImports = [
         'QueryBuilder',
         'buildFindManyDocument',
@@ -105,6 +114,10 @@ export function generateModelFile(table, _useSharedTypes, options, allTables) {
         'buildUpdateByPkDocument',
         'buildDeleteByPkDocument',
         ...(needsJunctionRemove ? ['buildJunctionRemoveDocument'] : []),
+        ...(bulkInsertMutationName ? ['buildBulkInsertDocument'] : []),
+        ...(bulkUpsertMutationName ? ['buildBulkUpsertDocument'] : []),
+        ...(bulkUpdateMutationName ? ['buildBulkUpdateDocument'] : []),
+        ...(bulkDeleteMutationName ? ['buildBulkDeleteDocument'] : []),
     ];
     statements.push(createImportDeclaration('../query-builder', queryBuilderImports));
     statements.push(createImportDeclaration('../select-types', [
@@ -114,6 +127,7 @@ export function generateModelFile(table, _useSharedTypes, options, allTables) {
         'CreateArgs',
         'UpdateArgs',
         'DeleteArgs',
+        ...(hasBulk ? ['BulkInsertArgs', 'BulkUpsertArgs', 'BulkUpdateArgs', 'BulkDeleteArgs', 'BulkMutationResult'] : []),
         'InferSelectResult',
         'StrictSelect',
     ], true));
@@ -192,15 +206,17 @@ export function generateModelFile(table, _useSharedTypes, options, allTables) {
         const findFirstTypeArgs = [
             (sel) => sel,
             () => t.tsTypeReference(t.identifier(whereTypeName)),
+            () => t.tsTypeReference(t.identifier(orderByTypeName)),
         ];
         const argsType = (sel) => t.tsTypeReference(t.identifier('FindFirstArgs'), t.tsTypeParameterInstantiation(findFirstTypeArgs.map(fn => fn(sel))));
         const retType = (sel) => t.tsTypeAnnotation(t.tsTypeReference(t.identifier('QueryBuilder'), t.tsTypeParameterInstantiation([
             t.tsTypeLiteral([
-                t.tsPropertySignature(t.identifier(pluralQueryName), t.tsTypeAnnotation(t.tsTypeLiteral([
-                    t.tsPropertySignature(t.identifier('nodes'), t.tsTypeAnnotation(t.tsArrayType(t.tsTypeReference(t.identifier('InferSelectResult'), t.tsTypeParameterInstantiation([
+                t.tsPropertySignature(t.identifier(singleResultFieldName), t.tsTypeAnnotation(t.tsUnionType([
+                    t.tsTypeReference(t.identifier('InferSelectResult'), t.tsTypeParameterInstantiation([
                         t.tsTypeReference(t.identifier(relationTypeName)),
                         sel,
-                    ]))))),
+                    ])),
+                    t.tsNullKeyword(),
                 ]))),
             ]),
         ])));
@@ -213,6 +229,10 @@ export function generateModelFile(table, _useSharedTypes, options, allTables) {
         const selectExpr = t.memberExpression(t.identifier('args'), t.identifier('select'));
         const findFirstObjProps = [
             t.objectProperty(t.identifier('where'), t.optionalMemberExpression(t.identifier('args'), t.identifier('where'), false, true)),
+            t.objectProperty(t.identifier('orderBy'), t.tsAsExpression(t.optionalMemberExpression(t.identifier('args'), t.identifier('orderBy'), false, true), t.tsUnionType([
+                t.tsArrayType(t.tsStringKeyword()),
+                t.tsUndefinedKeyword(),
+            ]))),
         ];
         const bodyArgs = [
             t.stringLiteral(typeName),
@@ -220,9 +240,23 @@ export function generateModelFile(table, _useSharedTypes, options, allTables) {
             selectExpr,
             t.objectExpression(findFirstObjProps),
             t.stringLiteral(whereTypeName),
+            t.stringLiteral(orderByTypeName),
             t.identifier('connectionFieldsMap'),
         ];
-        classBody.push(createClassMethod('findFirst', createTypeParam(selectTypeName), [implParam], retType(sRef()), buildMethodBody('buildFindFirstDocument', bodyArgs, 'query', typeName, pluralQueryName)));
+        const transformDataParam = t.identifier('data');
+        const transformedNodesProp = t.tsPropertySignature(t.identifier('nodes'), t.tsTypeAnnotation(t.tsArrayType(t.tsTypeReference(t.identifier('InferSelectResult'), t.tsTypeParameterInstantiation([
+            t.tsTypeReference(t.identifier(relationTypeName)),
+            sRef(),
+        ])))));
+        transformedNodesProp.optional = true;
+        const transformedCollectionProp = t.tsPropertySignature(t.identifier(pluralQueryName), t.tsTypeAnnotation(t.tsTypeLiteral([transformedNodesProp])));
+        transformedCollectionProp.optional = true;
+        transformDataParam.typeAnnotation = t.tsTypeAnnotation(t.tsTypeLiteral([transformedCollectionProp]));
+        const firstNodeExpr = t.optionalMemberExpression(t.optionalMemberExpression(t.memberExpression(t.identifier('data'), t.identifier(pluralQueryName)), t.identifier('nodes'), false, true), t.numericLiteral(0), true, true);
+        const transformFn = t.arrowFunctionExpression([transformDataParam], t.objectExpression([
+            t.objectProperty(t.stringLiteral(singleResultFieldName), t.logicalExpression('??', firstNodeExpr, t.nullLiteral())),
+        ]));
+        classBody.push(createClassMethod('findFirst', createTypeParam(selectTypeName), [implParam], retType(sRef()), buildMethodBody('buildFindFirstDocument', bodyArgs, 'query', typeName, singleResultFieldName, [t.objectProperty(t.identifier('transform'), transformFn)])));
     }
     // ── findOne ────────────────────────────────────────────────────────────
     if (hasValidPrimaryKey(table)) {
@@ -413,6 +447,134 @@ export function generateModelFile(table, _useSharedTypes, options, allTables) {
         ];
         classBody.push(createClassMethod('delete', createTypeParam(selectTypeName), [implParam], retType(sRef()), buildMethodBody('buildDeleteByPkDocument', bodyArgs, 'mutation', typeName, deleteMutationName)));
     }
+    // ── bulkCreate ──────────────────────────────────────────────────────────
+    if (bulkInsertMutationName) {
+        const bulkInsertInputTypeName = `BulkCreate${typeName}Input`;
+        const dataType = () => t.tsIndexedAccessType(t.tsTypeReference(t.identifier(createInputTypeName)), t.tsLiteralType(t.stringLiteral(singularName)));
+        const argsType = (sel) => t.tsTypeReference(t.identifier('BulkInsertArgs'), t.tsTypeParameterInstantiation([sel, dataType()]));
+        const retType = (sel) => t.tsTypeAnnotation(t.tsTypeReference(t.identifier('QueryBuilder'), t.tsTypeParameterInstantiation([
+            t.tsTypeReference(t.identifier('BulkMutationResult'), t.tsTypeParameterInstantiation([
+                t.tsTypeReference(t.identifier('InferSelectResult'), t.tsTypeParameterInstantiation([
+                    t.tsTypeReference(t.identifier(relationTypeName)),
+                    sel,
+                ])),
+            ])),
+        ])));
+        const implParam = t.identifier('args');
+        implParam.typeAnnotation = t.tsTypeAnnotation(t.tsIntersectionType([
+            argsType(sRef()),
+            t.tsTypeLiteral([requiredSelectProp()]),
+            strictSelectGuard(selectTypeName),
+        ]));
+        const selectExpr = t.memberExpression(t.identifier('args'), t.identifier('select'));
+        const bodyArgs = [
+            t.stringLiteral(typeName),
+            t.stringLiteral(bulkInsertMutationName),
+            selectExpr,
+            t.memberExpression(t.identifier('args'), t.identifier('data')),
+            t.stringLiteral(bulkInsertInputTypeName),
+            t.memberExpression(t.identifier('args'), t.identifier('onConflict')),
+            t.identifier('connectionFieldsMap'),
+        ];
+        classBody.push(createClassMethod('bulkCreate', createTypeParam(selectTypeName), [implParam], retType(sRef()), buildMethodBody('buildBulkInsertDocument', bodyArgs, 'mutation', typeName, bulkInsertMutationName)));
+    }
+    // ── bulkUpsert ─────────────────────────────────────────────────────────
+    if (bulkUpsertMutationName) {
+        const bulkUpsertInputTypeName = `BulkUpsert${typeName}Input`;
+        const dataType = () => t.tsIndexedAccessType(t.tsTypeReference(t.identifier(createInputTypeName)), t.tsLiteralType(t.stringLiteral(singularName)));
+        const argsType = (sel) => t.tsTypeReference(t.identifier('BulkUpsertArgs'), t.tsTypeParameterInstantiation([sel, dataType()]));
+        const retType = (sel) => t.tsTypeAnnotation(t.tsTypeReference(t.identifier('QueryBuilder'), t.tsTypeParameterInstantiation([
+            t.tsTypeReference(t.identifier('BulkMutationResult'), t.tsTypeParameterInstantiation([
+                t.tsTypeReference(t.identifier('InferSelectResult'), t.tsTypeParameterInstantiation([
+                    t.tsTypeReference(t.identifier(relationTypeName)),
+                    sel,
+                ])),
+            ])),
+        ])));
+        const implParam = t.identifier('args');
+        implParam.typeAnnotation = t.tsTypeAnnotation(t.tsIntersectionType([
+            argsType(sRef()),
+            t.tsTypeLiteral([requiredSelectProp()]),
+            strictSelectGuard(selectTypeName),
+        ]));
+        const selectExpr = t.memberExpression(t.identifier('args'), t.identifier('select'));
+        const bodyArgs = [
+            t.stringLiteral(typeName),
+            t.stringLiteral(bulkUpsertMutationName),
+            selectExpr,
+            t.memberExpression(t.identifier('args'), t.identifier('data')),
+            t.stringLiteral(bulkUpsertInputTypeName),
+            t.memberExpression(t.identifier('args'), t.identifier('onConflict')),
+            t.identifier('connectionFieldsMap'),
+        ];
+        classBody.push(createClassMethod('bulkUpsert', createTypeParam(selectTypeName), [implParam], retType(sRef()), buildMethodBody('buildBulkUpsertDocument', bodyArgs, 'mutation', typeName, bulkUpsertMutationName)));
+    }
+    // ── bulkUpdate ─────────────────────────────────────────────────────────
+    if (bulkUpdateMutationName) {
+        const bulkUpdateInputTypeName = `BulkUpdate${typeName}Input`;
+        const argsType = (sel) => t.tsTypeReference(t.identifier('BulkUpdateArgs'), t.tsTypeParameterInstantiation([
+            sel,
+            t.tsTypeReference(t.identifier(whereTypeName)),
+            t.tsTypeReference(t.identifier(patchTypeName)),
+        ]));
+        const retType = (sel) => t.tsTypeAnnotation(t.tsTypeReference(t.identifier('QueryBuilder'), t.tsTypeParameterInstantiation([
+            t.tsTypeReference(t.identifier('BulkMutationResult'), t.tsTypeParameterInstantiation([
+                t.tsTypeReference(t.identifier('InferSelectResult'), t.tsTypeParameterInstantiation([
+                    t.tsTypeReference(t.identifier(relationTypeName)),
+                    sel,
+                ])),
+            ])),
+        ])));
+        const implParam = t.identifier('args');
+        implParam.typeAnnotation = t.tsTypeAnnotation(t.tsIntersectionType([
+            argsType(sRef()),
+            t.tsTypeLiteral([requiredSelectProp()]),
+            strictSelectGuard(selectTypeName),
+        ]));
+        const selectExpr = t.memberExpression(t.identifier('args'), t.identifier('select'));
+        const bodyArgs = [
+            t.stringLiteral(typeName),
+            t.stringLiteral(bulkUpdateMutationName),
+            selectExpr,
+            t.memberExpression(t.identifier('args'), t.identifier('where')),
+            t.memberExpression(t.identifier('args'), t.identifier('data')),
+            t.stringLiteral(bulkUpdateInputTypeName),
+            t.identifier('connectionFieldsMap'),
+        ];
+        classBody.push(createClassMethod('bulkUpdate', createTypeParam(selectTypeName), [implParam], retType(sRef()), buildMethodBody('buildBulkUpdateDocument', bodyArgs, 'mutation', typeName, bulkUpdateMutationName)));
+    }
+    // ── bulkDelete ─────────────────────────────────────────────────────────
+    if (bulkDeleteMutationName) {
+        const bulkDeleteInputTypeName = `BulkDelete${typeName}Input`;
+        const argsType = (sel) => t.tsTypeReference(t.identifier('BulkDeleteArgs'), t.tsTypeParameterInstantiation([
+            sel,
+            t.tsTypeReference(t.identifier(whereTypeName)),
+        ]));
+        const retType = (sel) => t.tsTypeAnnotation(t.tsTypeReference(t.identifier('QueryBuilder'), t.tsTypeParameterInstantiation([
+            t.tsTypeReference(t.identifier('BulkMutationResult'), t.tsTypeParameterInstantiation([
+                t.tsTypeReference(t.identifier('InferSelectResult'), t.tsTypeParameterInstantiation([
+                    t.tsTypeReference(t.identifier(relationTypeName)),
+                    sel,
+                ])),
+            ])),
+        ])));
+        const implParam = t.identifier('args');
+        implParam.typeAnnotation = t.tsTypeAnnotation(t.tsIntersectionType([
+            argsType(sRef()),
+            t.tsTypeLiteral([requiredSelectProp()]),
+            strictSelectGuard(selectTypeName),
+        ]));
+        const selectExpr = t.memberExpression(t.identifier('args'), t.identifier('select'));
+        const bodyArgs = [
+            t.stringLiteral(typeName),
+            t.stringLiteral(bulkDeleteMutationName),
+            selectExpr,
+            t.memberExpression(t.identifier('args'), t.identifier('where')),
+            t.stringLiteral(bulkDeleteInputTypeName),
+            t.identifier('connectionFieldsMap'),
+        ];
+        classBody.push(createClassMethod('bulkDelete', createTypeParam(selectTypeName), [implParam], retType(sRef()), buildMethodBody('buildBulkDeleteDocument', bodyArgs, 'mutation', typeName, bulkDeleteMutationName)));
+    }
     // ── M:N add/remove methods ────────────────────────────────────────────
     for (const rel of m2nRels) {
         if (!rel.fieldName)

package/esm/core/codegen/orm/select-types.d.ts

@@ -167,9 +167,10 @@ export interface FindManyArgs<TSelect, TWhere, TOrderBy> {
 /**
  * Arguments for findFirst/findUnique operations
  */
-export interface FindFirstArgs<TSelect, TWhere> {
+export interface FindFirstArgs<TSelect, TWhere, TOrderBy> {
     select?: TSelect;
     where?: TWhere;
+    orderBy?: TOrderBy[];
 }
 /**
  * Arguments for create operations

package/esm/core/codegen/queries.js

@@ -433,7 +433,7 @@ export function generateSingleQueryHook(table, options = {}) {
             t.tsPropertySignature(t.identifier(pkFieldName), t.tsTypeAnnotation(pkTsType)),
             t.tsPropertySignature(t.identifier('selection'), t.tsTypeAnnotation(selectionConfigType(typeRef(selectTypeName)))),
         ];
-        statements.push(exportAsyncFunction(fetchFnName, null, [createFunctionParam('params', t.tsTypeLiteral(fImplProps))], fBody));
+        statements.push(exportAsyncFunction(fetchFnName, null, [createFunctionParam('params', t.tsTypeLiteral(fImplProps))], fBody, typeRef('Promise', [t.tsAnyKeyword()])));
     }
     // Prefetch function
     if (reactQueryEnabled) {

package/esm/core/codegen/utils.d.ts

@@ -101,6 +101,14 @@ export declare function getUpdateMutationName(table: Table): string;
  * Get the GraphQL mutation name for deleting
  */
 export declare function getDeleteMutationName(table: Table): string;
+export declare function getBulkCreateMutationHookName(table: Table): string;
+export declare function getBulkUpsertMutationHookName(table: Table): string;
+export declare function getBulkUpdateMutationHookName(table: Table): string;
+export declare function getBulkDeleteMutationHookName(table: Table): string;
+export declare function getBulkCreateMutationFileName(table: Table): string;
+export declare function getBulkUpsertMutationFileName(table: Table): string;
+export declare function getBulkUpdateMutationFileName(table: Table): string;
+export declare function getBulkDeleteMutationFileName(table: Table): string;
 /**
  * Get PostGraphile filter type name
  * e.g., "CarFilter"

package/esm/core/codegen/utils.js

@@ -154,6 +154,37 @@ export function getDeleteMutationName(table) {
     return table.query?.delete || `delete${table.name}`;
 }
 // ============================================================================
+// Bulk mutation naming helpers
+// ============================================================================
+export function getBulkCreateMutationHookName(table) {
+    const { typeName } = getTableNames(table);
+    return `useBulkCreate${typeName}Mutation`;
+}
+export function getBulkUpsertMutationHookName(table) {
+    const { typeName } = getTableNames(table);
+    return `useBulkUpsert${typeName}Mutation`;
+}
+export function getBulkUpdateMutationHookName(table) {
+    const { typeName } = getTableNames(table);
+    return `useBulkUpdate${typeName}Mutation`;
+}
+export function getBulkDeleteMutationHookName(table) {
+    const { typeName } = getTableNames(table);
+    return `useBulkDelete${typeName}Mutation`;
+}
+export function getBulkCreateMutationFileName(table) {
+    return `${getBulkCreateMutationHookName(table)}.ts`;
+}
+export function getBulkUpsertMutationFileName(table) {
+    return `${getBulkUpsertMutationHookName(table)}.ts`;
+}
+export function getBulkUpdateMutationFileName(table) {
+    return `${getBulkUpdateMutationHookName(table)}.ts`;
+}
+export function getBulkDeleteMutationFileName(table) {
+    return `${getBulkDeleteMutationHookName(table)}.ts`;
+}
+// ============================================================================
 // Type names
 // ============================================================================
 /**

package/esm/types/schema.d.ts

@@ -85,6 +85,14 @@ export interface TableQueryNames {
     delete: string | null;
     /** Patch field name in update mutation input (e.g., "userPatch" for UpdateUserInput) */
     patchFieldName?: string;
+    /** Bulk insert mutation name (e.g., "bulkCreateUsers") */
+    bulkInsert?: string | null;
+    /** Bulk upsert mutation name (e.g., "bulkUpsertUsers") */
+    bulkUpsert?: string | null;
+    /** Bulk update mutation name (e.g., "bulkUpdateUsers") */
+    bulkUpdate?: string | null;
+    /** Bulk delete mutation name (e.g., "bulkDeleteUsers") */
+    bulkDelete?: string | null;
 }
 /**
  * Table constraints

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructive-io/graphql-codegen",
-  "version": "4.40.5",
+  "version": "4.41.0",
   "description": "GraphQL SDK generator for Constructive databases with React Query hooks",
   "keywords": [
     "graphql",
@@ -56,7 +56,7 @@
     "@0no-co/graphql.web": "^1.1.2",
     "@babel/generator": "^7.29.1",
     "@babel/types": "^7.29.0",
-    "@constructive-io/graphql-query": "^3.23.3",
+    "@constructive-io/graphql-query": "^3.24.0",
     "@constructive-io/graphql-types": "^3.9.1",
     "@inquirerer/utils": "^3.3.5",
     "@pgpmjs/core": "^6.17.1",
@@ -64,7 +64,7 @@
     "deepmerge": "^4.3.1",
     "find-and-require-package-json": "^0.9.1",
     "gql-ast": "^3.9.1",
-    "graphile-schema": "^1.19.3",
+    "graphile-schema": "^1.19.4",
     "graphql": "16.13.0",
     "inflekt": "^0.7.1",
     "inquirerer": "^4.7.0",
@@ -100,5 +100,5 @@
     "tsx": "^4.21.0",
     "typescript": "^5.9.3"
   },
-  "gitHead": "ea590e1b9e1ee38c267f8dbbb37aa3f83a5d3fb7"
+  "gitHead": "70f9d2052fe9218c65b82e896d1660d4dc6a51c8"
 }

package/types/schema.d.ts

@@ -85,6 +85,14 @@ export interface TableQueryNames {
     delete: string | null;
     /** Patch field name in update mutation input (e.g., "userPatch" for UpdateUserInput) */
     patchFieldName?: string;
+    /** Bulk insert mutation name (e.g., "bulkCreateUsers") */
+    bulkInsert?: string | null;
+    /** Bulk upsert mutation name (e.g., "bulkUpsertUsers") */
+    bulkUpsert?: string | null;
+    /** Bulk update mutation name (e.g., "bulkUpdateUsers") */
+    bulkUpdate?: string | null;
+    /** Bulk delete mutation name (e.g., "bulkDeleteUsers") */
+    bulkDelete?: string | null;
 }
 /**
  * Table constraints