@constructive-io/graphql-codegen 4.47.8 → 4.47.10

package/core/codegen/orm/index.js

@@ -35,7 +35,7 @@ function generateOrm(options) {
         content: selectTypesFile.content,
     });
     // 2. Generate model files
-    const modelFiles = (0, model_generator_1.generateAllModelFiles)(tables, useSharedTypes);
+    const modelFiles = (0, model_generator_1.generateAllModelFiles)(tables, useSharedTypes, typeRegistry);
     for (const modelFile of modelFiles) {
         files.push({
             path: `models/${modelFile.fileName}`,

package/core/codegen/orm/model-generator.d.ts

@@ -1,9 +1,9 @@
-import type { Table } from '../../../types/schema';
+import type { Table, TypeRegistry } from '../../../types/schema';
 export interface GeneratedModelFile {
     fileName: string;
     content: string;
     modelName: string;
     tableName: string;
 }
-export declare function generateModelFile(table: Table, _useSharedTypes: boolean, options?: Record<string, never>, allTables?: Table[]): GeneratedModelFile;
-export declare function generateAllModelFiles(tables: Table[], useSharedTypes: boolean): GeneratedModelFile[];
+export declare function generateModelFile(table: Table, _useSharedTypes: boolean, options?: Record<string, never>, allTables?: Table[], typeRegistry?: TypeRegistry): GeneratedModelFile;
+export declare function generateAllModelFiles(tables: Table[], useSharedTypes: boolean, typeRegistry?: TypeRegistry): GeneratedModelFile[];

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

@@ -103,7 +103,39 @@ function strictSelectGuard(selectTypeName) {
         t.tsTypeReference(t.identifier(selectTypeName)),
     ]));
 }
-function generateModelFile(table, _useSharedTypes, options, allTables) {
+/**
+ * Discover extra required fields on a mutation input type beyond the standard
+ * ones (clientMutationId, PK fields, patch field). PostGraphile adds these for
+ * partitioned tables (e.g. databaseId as the partition key).
+ */
+function getExtraInputKeys(inputTypeName, pkFieldNames, patchFieldName, typeRegistry) {
+    if (!typeRegistry)
+        return [];
+    const inputType = typeRegistry.get(inputTypeName);
+    if (!inputType || inputType.kind !== 'INPUT_OBJECT' || !inputType.inputFields)
+        return [];
+    const skip = new Set(['clientMutationId', ...(patchFieldName ? [patchFieldName] : [])]);
+    for (const pk of pkFieldNames)
+        skip.add(pk);
+    const extras = [];
+    for (const field of inputType.inputFields) {
+        if (skip.has(field.name))
+            continue;
+        if (field.type.kind !== 'NON_NULL')
+            continue;
+        const innerName = field.type.ofType?.name;
+        if (!innerName)
+            continue;
+        let tsType = 'string';
+        if (innerName === 'Int' || innerName === 'Float' || innerName === 'BigFloat')
+            tsType = 'number';
+        else if (innerName === 'Boolean')
+            tsType = 'boolean';
+        extras.push({ name: field.name, gqlType: innerName, tsType });
+    }
+    return extras;
+}
+function generateModelFile(table, _useSharedTypes, options, allTables, typeRegistry) {
     const { typeName, singularName, pluralName } = (0, utils_1.getTableNames)(table);
     const modelName = `${typeName}Model`;
     const baseFileName = (0, utils_1.lcFirst)(typeName);
@@ -114,7 +146,7 @@ function generateModelFile(table, _useSharedTypes, options, allTables) {
     const whereTypeName = (0, utils_1.getFilterTypeName)(table);
     const orderByTypeName = (0, utils_1.getOrderByTypeName)(table);
     const createInputTypeName = `Create${typeName}Input`;
-    const updateInputTypeName = `Update${typeName}Input`;
+    const updateInputTypeName = (0, utils_1.getUpdateInputTypeName)(table);
     const patchTypeName = `${typeName}Patch`;
     const pkFields = (0, utils_1.getPrimaryKeyInfo)(table);
     const pkField = pkFields[0];
@@ -401,12 +433,19 @@ function generateModelFile(table, _useSharedTypes, options, allTables) {
     }
     // ── update ─────────────────────────────────────────────────────────────
     if (updateMutationName) {
+        const patchFieldName = table.query?.patchFieldName ?? (0, utils_1.lcFirst)(typeName) + 'Patch';
+        const updateExtraKeys = getExtraInputKeys(updateInputTypeName, new Set(pkFields.map((pk) => pk.name)), patchFieldName, typeRegistry);
         const whereLiteral = () => t.tsTypeLiteral([
             (() => {
                 const prop = t.tsPropertySignature(t.identifier(pkField.name), t.tsTypeAnnotation(pkTsType()));
                 prop.optional = false;
                 return prop;
             })(),
+            ...updateExtraKeys.map((ek) => {
+                const prop = t.tsPropertySignature(t.identifier(ek.name), t.tsTypeAnnotation(tsTypeFromPrimitive(ek.tsType)));
+                prop.optional = false;
+                return prop;
+            }),
         ]);
         const argsType = (sel) => t.tsTypeReference(t.identifier('UpdateArgs'), t.tsTypeParameterInstantiation([
             sel,
@@ -430,7 +469,10 @@ function generateModelFile(table, _useSharedTypes, options, allTables) {
             strictSelectGuard(selectTypeName),
         ]));
         const selectExpr = t.memberExpression(t.identifier('args'), t.identifier('select'));
-        const patchFieldName = table.query?.patchFieldName ?? (0, utils_1.lcFirst)(typeName) + 'Patch';
+        // Build extraKeys object for partitioned table fields
+        const extraKeysArg = updateExtraKeys.length > 0
+            ? t.objectExpression(updateExtraKeys.map((ek) => t.objectProperty(t.identifier(ek.name), t.memberExpression(t.memberExpression(t.identifier('args'), t.identifier('where')), t.identifier(ek.name)))))
+            : t.identifier('undefined');
         const bodyArgs = [
             t.stringLiteral(typeName),
             t.stringLiteral(updateMutationName),
@@ -442,17 +484,26 @@ function generateModelFile(table, _useSharedTypes, options, allTables) {
             t.stringLiteral(pkField.name),
             t.stringLiteral(patchFieldName),
             t.identifier('connectionFieldsMap'),
+            extraKeysArg,
         ];
         classBody.push(createClassMethod('update', createTypeParam(selectTypeName), [implParam], retType(sRef()), buildMethodBody('buildUpdateByPkDocument', bodyArgs, 'mutation', typeName, updateMutationName)));
     }
     // ── delete ─────────────────────────────────────────────────────────────
     if (deleteMutationName) {
-        // Build where type with ALL PK fields (supports composite PKs)
-        const whereLiteral = () => t.tsTypeLiteral(pkFields.map((pk) => {
-            const prop = t.tsPropertySignature(t.identifier(pk.name), t.tsTypeAnnotation(tsTypeFromPrimitive(pk.tsType ?? 'string')));
-            prop.optional = false;
-            return prop;
-        }));
+        const deleteExtraKeys = getExtraInputKeys(deleteInputTypeName, new Set(pkFields.map((pk) => pk.name)), null, typeRegistry);
+        // Build where type with ALL PK fields + extra keys (supports composite PKs + partition keys)
+        const whereLiteral = () => t.tsTypeLiteral([
+            ...pkFields.map((pk) => {
+                const prop = t.tsPropertySignature(t.identifier(pk.name), t.tsTypeAnnotation(tsTypeFromPrimitive(pk.tsType ?? 'string')));
+                prop.optional = false;
+                return prop;
+            }),
+            ...deleteExtraKeys.map((ek) => {
+                const prop = t.tsPropertySignature(t.identifier(ek.name), t.tsTypeAnnotation(tsTypeFromPrimitive(ek.tsType)));
+                prop.optional = false;
+                return prop;
+            }),
+        ]);
         const argsType = (sel) => t.tsTypeReference(t.identifier('DeleteArgs'), t.tsTypeParameterInstantiation([whereLiteral(), sel]));
         const retType = (sel) => t.tsTypeAnnotation(t.tsTypeReference(t.identifier('QueryBuilder'), t.tsTypeParameterInstantiation([
             t.tsTypeLiteral([
@@ -471,8 +522,11 @@ function generateModelFile(table, _useSharedTypes, options, allTables) {
             strictSelectGuard(selectTypeName),
         ]));
         const selectExpr = t.memberExpression(t.identifier('args'), t.identifier('select'));
-        // Build keys object: { field1: args.where.field1, field2: args.where.field2, ... }
-        const keysObj = t.objectExpression(pkFields.map((pk) => t.objectProperty(t.identifier(pk.name), t.memberExpression(t.memberExpression(t.identifier('args'), t.identifier('where')), t.identifier(pk.name)))));
+        // Build keys object: { field1: args.where.field1, ... } including extra keys
+        const keysObj = t.objectExpression([
+            ...pkFields.map((pk) => t.objectProperty(t.identifier(pk.name), t.memberExpression(t.memberExpression(t.identifier('args'), t.identifier('where')), t.identifier(pk.name)))),
+            ...deleteExtraKeys.map((ek) => t.objectProperty(t.identifier(ek.name), t.memberExpression(t.memberExpression(t.identifier('args'), t.identifier('where')), t.identifier(ek.name)))),
+        ]);
         const bodyArgs = [
             t.stringLiteral(typeName),
             t.stringLiteral(deleteMutationName),
@@ -748,6 +802,6 @@ function generateModelFile(table, _useSharedTypes, options, allTables) {
         tableName: table.name,
     };
 }
-function generateAllModelFiles(tables, useSharedTypes) {
-    return tables.map((table) => generateModelFile(table, useSharedTypes, undefined, tables));
+function generateAllModelFiles(tables, useSharedTypes, typeRegistry) {
+    return tables.map((table) => generateModelFile(table, useSharedTypes, undefined, tables, typeRegistry));
 }

package/core/codegen/templates/query-builder.ts

@@ -509,6 +509,7 @@ export function buildUpdateByPkDocument<TSelect, TData>(
   idFieldName: string,
   patchFieldName: string,
   connectionFieldsMap?: Record<string, Record<string, string>>,
+  extraKeys?: Record<string, unknown>,
 ): { document: string; variables: Record<string, unknown> } {
   const selections = select
     ? buildSelections(
@@ -533,6 +534,7 @@ export function buildUpdateByPkDocument<TSelect, TData>(
     variables: {
       input: {
         [idFieldName]: id,
+        ...extraKeys,
         [patchFieldName]: data,
       },
     },

package/esm/core/codegen/orm/index.js

@@ -31,7 +31,7 @@ export function generateOrm(options) {
         content: selectTypesFile.content,
     });
     // 2. Generate model files
-    const modelFiles = generateAllModelFiles(tables, useSharedTypes);
+    const modelFiles = generateAllModelFiles(tables, useSharedTypes, typeRegistry);
     for (const modelFile of modelFiles) {
         files.push({
             path: `models/${modelFile.fileName}`,

package/esm/core/codegen/orm/model-generator.d.ts

@@ -1,9 +1,9 @@
-import type { Table } from '../../../types/schema';
+import type { Table, TypeRegistry } from '../../../types/schema';
 export interface GeneratedModelFile {
     fileName: string;
     content: string;
     modelName: string;
     tableName: string;
 }
-export declare function generateModelFile(table: Table, _useSharedTypes: boolean, options?: Record<string, never>, allTables?: Table[]): GeneratedModelFile;
-export declare function generateAllModelFiles(tables: Table[], useSharedTypes: boolean): GeneratedModelFile[];
+export declare function generateModelFile(table: Table, _useSharedTypes: boolean, options?: Record<string, never>, allTables?: Table[], typeRegistry?: TypeRegistry): GeneratedModelFile;
+export declare function generateAllModelFiles(tables: Table[], useSharedTypes: boolean, typeRegistry?: TypeRegistry): GeneratedModelFile[];

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, getTableNames, hasValidPrimaryKey, lcFirst, ucFirst, } from '../utils';
+import { getCreateInputTypeName, getCreateMutationName, getDeleteInputTypeName, getDeleteMutationName, getFilterTypeName, getGeneratedFileHeader, getOrderByTypeName, getPrimaryKeyInfo, getTableNames, getUpdateInputTypeName, 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));
@@ -66,7 +66,39 @@ function strictSelectGuard(selectTypeName) {
         t.tsTypeReference(t.identifier(selectTypeName)),
     ]));
 }
-export function generateModelFile(table, _useSharedTypes, options, allTables) {
+/**
+ * Discover extra required fields on a mutation input type beyond the standard
+ * ones (clientMutationId, PK fields, patch field). PostGraphile adds these for
+ * partitioned tables (e.g. databaseId as the partition key).
+ */
+function getExtraInputKeys(inputTypeName, pkFieldNames, patchFieldName, typeRegistry) {
+    if (!typeRegistry)
+        return [];
+    const inputType = typeRegistry.get(inputTypeName);
+    if (!inputType || inputType.kind !== 'INPUT_OBJECT' || !inputType.inputFields)
+        return [];
+    const skip = new Set(['clientMutationId', ...(patchFieldName ? [patchFieldName] : [])]);
+    for (const pk of pkFieldNames)
+        skip.add(pk);
+    const extras = [];
+    for (const field of inputType.inputFields) {
+        if (skip.has(field.name))
+            continue;
+        if (field.type.kind !== 'NON_NULL')
+            continue;
+        const innerName = field.type.ofType?.name;
+        if (!innerName)
+            continue;
+        let tsType = 'string';
+        if (innerName === 'Int' || innerName === 'Float' || innerName === 'BigFloat')
+            tsType = 'number';
+        else if (innerName === 'Boolean')
+            tsType = 'boolean';
+        extras.push({ name: field.name, gqlType: innerName, tsType });
+    }
+    return extras;
+}
+export function generateModelFile(table, _useSharedTypes, options, allTables, typeRegistry) {
     const { typeName, singularName, pluralName } = getTableNames(table);
     const modelName = `${typeName}Model`;
     const baseFileName = lcFirst(typeName);
@@ -77,7 +109,7 @@ export function generateModelFile(table, _useSharedTypes, options, allTables) {
     const whereTypeName = getFilterTypeName(table);
     const orderByTypeName = getOrderByTypeName(table);
     const createInputTypeName = `Create${typeName}Input`;
-    const updateInputTypeName = `Update${typeName}Input`;
+    const updateInputTypeName = getUpdateInputTypeName(table);
     const patchTypeName = `${typeName}Patch`;
     const pkFields = getPrimaryKeyInfo(table);
     const pkField = pkFields[0];
@@ -364,12 +396,19 @@ export function generateModelFile(table, _useSharedTypes, options, allTables) {
     }
     // ── update ─────────────────────────────────────────────────────────────
     if (updateMutationName) {
+        const patchFieldName = table.query?.patchFieldName ?? lcFirst(typeName) + 'Patch';
+        const updateExtraKeys = getExtraInputKeys(updateInputTypeName, new Set(pkFields.map((pk) => pk.name)), patchFieldName, typeRegistry);
         const whereLiteral = () => t.tsTypeLiteral([
             (() => {
                 const prop = t.tsPropertySignature(t.identifier(pkField.name), t.tsTypeAnnotation(pkTsType()));
                 prop.optional = false;
                 return prop;
             })(),
+            ...updateExtraKeys.map((ek) => {
+                const prop = t.tsPropertySignature(t.identifier(ek.name), t.tsTypeAnnotation(tsTypeFromPrimitive(ek.tsType)));
+                prop.optional = false;
+                return prop;
+            }),
         ]);
         const argsType = (sel) => t.tsTypeReference(t.identifier('UpdateArgs'), t.tsTypeParameterInstantiation([
             sel,
@@ -393,7 +432,10 @@ export function generateModelFile(table, _useSharedTypes, options, allTables) {
             strictSelectGuard(selectTypeName),
         ]));
         const selectExpr = t.memberExpression(t.identifier('args'), t.identifier('select'));
-        const patchFieldName = table.query?.patchFieldName ?? lcFirst(typeName) + 'Patch';
+        // Build extraKeys object for partitioned table fields
+        const extraKeysArg = updateExtraKeys.length > 0
+            ? t.objectExpression(updateExtraKeys.map((ek) => t.objectProperty(t.identifier(ek.name), t.memberExpression(t.memberExpression(t.identifier('args'), t.identifier('where')), t.identifier(ek.name)))))
+            : t.identifier('undefined');
         const bodyArgs = [
             t.stringLiteral(typeName),
             t.stringLiteral(updateMutationName),
@@ -405,17 +447,26 @@ export function generateModelFile(table, _useSharedTypes, options, allTables) {
             t.stringLiteral(pkField.name),
             t.stringLiteral(patchFieldName),
             t.identifier('connectionFieldsMap'),
+            extraKeysArg,
         ];
         classBody.push(createClassMethod('update', createTypeParam(selectTypeName), [implParam], retType(sRef()), buildMethodBody('buildUpdateByPkDocument', bodyArgs, 'mutation', typeName, updateMutationName)));
     }
     // ── delete ─────────────────────────────────────────────────────────────
     if (deleteMutationName) {
-        // Build where type with ALL PK fields (supports composite PKs)
-        const whereLiteral = () => t.tsTypeLiteral(pkFields.map((pk) => {
-            const prop = t.tsPropertySignature(t.identifier(pk.name), t.tsTypeAnnotation(tsTypeFromPrimitive(pk.tsType ?? 'string')));
-            prop.optional = false;
-            return prop;
-        }));
+        const deleteExtraKeys = getExtraInputKeys(deleteInputTypeName, new Set(pkFields.map((pk) => pk.name)), null, typeRegistry);
+        // Build where type with ALL PK fields + extra keys (supports composite PKs + partition keys)
+        const whereLiteral = () => t.tsTypeLiteral([
+            ...pkFields.map((pk) => {
+                const prop = t.tsPropertySignature(t.identifier(pk.name), t.tsTypeAnnotation(tsTypeFromPrimitive(pk.tsType ?? 'string')));
+                prop.optional = false;
+                return prop;
+            }),
+            ...deleteExtraKeys.map((ek) => {
+                const prop = t.tsPropertySignature(t.identifier(ek.name), t.tsTypeAnnotation(tsTypeFromPrimitive(ek.tsType)));
+                prop.optional = false;
+                return prop;
+            }),
+        ]);
         const argsType = (sel) => t.tsTypeReference(t.identifier('DeleteArgs'), t.tsTypeParameterInstantiation([whereLiteral(), sel]));
         const retType = (sel) => t.tsTypeAnnotation(t.tsTypeReference(t.identifier('QueryBuilder'), t.tsTypeParameterInstantiation([
             t.tsTypeLiteral([
@@ -434,8 +485,11 @@ export function generateModelFile(table, _useSharedTypes, options, allTables) {
             strictSelectGuard(selectTypeName),
         ]));
         const selectExpr = t.memberExpression(t.identifier('args'), t.identifier('select'));
-        // Build keys object: { field1: args.where.field1, field2: args.where.field2, ... }
-        const keysObj = t.objectExpression(pkFields.map((pk) => t.objectProperty(t.identifier(pk.name), t.memberExpression(t.memberExpression(t.identifier('args'), t.identifier('where')), t.identifier(pk.name)))));
+        // Build keys object: { field1: args.where.field1, ... } including extra keys
+        const keysObj = t.objectExpression([
+            ...pkFields.map((pk) => t.objectProperty(t.identifier(pk.name), t.memberExpression(t.memberExpression(t.identifier('args'), t.identifier('where')), t.identifier(pk.name)))),
+            ...deleteExtraKeys.map((ek) => t.objectProperty(t.identifier(ek.name), t.memberExpression(t.memberExpression(t.identifier('args'), t.identifier('where')), t.identifier(ek.name)))),
+        ]);
         const bodyArgs = [
             t.stringLiteral(typeName),
             t.stringLiteral(deleteMutationName),
@@ -711,6 +765,6 @@ export function generateModelFile(table, _useSharedTypes, options, allTables) {
         tableName: table.name,
     };
 }
-export function generateAllModelFiles(tables, useSharedTypes) {
-    return tables.map((table) => generateModelFile(table, useSharedTypes, undefined, tables));
+export function generateAllModelFiles(tables, useSharedTypes, typeRegistry) {
+    return tables.map((table) => generateModelFile(table, useSharedTypes, undefined, tables, typeRegistry));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructive-io/graphql-codegen",
-  "version": "4.47.8",
+  "version": "4.47.10",
   "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.27.6",
+    "@constructive-io/graphql-query": "^3.27.7",
     "@constructive-io/graphql-types": "^3.12.0",
     "@inquirerer/utils": "^3.3.7",
     "@pgpmjs/core": "^6.24.0",
@@ -64,7 +64,7 @@
     "deepmerge": "^4.3.1",
     "find-and-require-package-json": "^0.9.1",
     "gql-ast": "^3.11.0",
-    "graphile-schema": "^1.22.6",
+    "graphile-schema": "^1.22.7",
     "graphql": "16.13.0",
     "inflekt": "^0.7.1",
     "inquirerer": "^4.8.1",
@@ -100,5 +100,5 @@
     "tsx": "^4.21.0",
     "typescript": "^5.9.3"
   },
-  "gitHead": "2558a0cdb58c815933af8bfe6769cd59014c77cf"
+  "gitHead": "bca385f6d3d1311477e2c4ef36f9d49dec401c60"
 }