fastify-auto-sqlapi 0.2.1 → 0.2.3

package/dist/lib/engine/write-helpers.js

@@ -1,5 +1,6 @@
 import { camelcaseObject, snakecaseRecord } from '../naming.js';
 import { runValidation } from './validate.js';
+import { removeWriteExcluded } from '../write-access.js';
 import { tenantForTable, buildTenantRowGuard, enforceTenantOnWrites, assertTenantOwnsConflicts, tenantImmutableColumns, } from '../tenant.js';
 /**
  * Resolve the write join an alias names, or undefined when the table does not declare it.
@@ -14,26 +15,11 @@ function findWriteJoin(tableConf, alias) {
     return tableConf.allowedWriteJoins?.find((j) => j.alias === alias);
 }
 /**
- * Drop `excludeFromCreation` columns from a snake_case (DB-format) record.
+ * Drop `excludeFromCreation` fields from a camelCase record, in place.
  *
- * Exclusion is a whitelist on CLIENT input: call this on the client payload only,
- * BEFORE any server-side value is assigned (beforeInsert mutations, FK auto-fill),
- * so engine/hook-generated values on those fields reach the SQL.
- */
-function removeExcludedFields(record, tableConf) {
-    if (!tableConf.excludeFromCreation?.length)
-        return record;
-    const result = { ...record };
-    for (const field of tableConf.excludeFromCreation) {
-        const col = tableConf.Schema.col(field);
-        delete result[col];
-    }
-    return result;
-}
-/**
- * Same whitelist as `removeExcludedFields`, but for a camelCase record (schema
- * field names) and in place. Used on the client payload before the beforeInsert
- * hook runs.
+ * Exclusion is a whitelist on CLIENT input: call this on the client payload only, BEFORE any
+ * server-side value is assigned (beforeInsert mutations, FK auto-fill), so engine- and
+ * hook-generated values on those fields reach the SQL (ADR 0005).
  */
 function removeExcludedFieldsCamel(record, tableConf) {
     if (!tableConf.excludeFromCreation?.length)
@@ -71,7 +57,9 @@ function resolveWriteJoinTarget(joinDef, dbTables, mainRecord, tenant) {
  *   3. drop excludeFromCreation fields (client-input whitelist; applied BEFORE the
  *      hook so values it assigns — e.g. a server-generated id — reach the INSERT)
  *   4. beforeInsert hook (caller can mutate the camelCase copy)
- *   5. snakecaseRecord → DB format
+ *   5. drop non-writable fields (generated columns, writeExclude) — AFTER the hook, because
+ *      the database refuses those values whoever assigned them
+ *   6. snakecaseRecord → DB format
  *
  * Returns both `camel` (input + hook mutations, used for FK auto-fill / afterInsert) and
  * `snake` (DB-ready record). The original `input` is left intact.
@@ -88,6 +76,7 @@ export async function prepareInsertRecord(ctx, input, secondaries, options) {
     if (ctx.tableConf.beforeInsert) {
         await ctx.tableConf.beforeInsert(ctx.db, ctx.request, camel);
     }
+    removeWriteExcluded(camel, ctx.tableConf, ctx.tableConf.Schema);
     const snake = snakecaseRecord(camel, ctx.tableConf.Schema);
     return { camel, snake };
 }
@@ -121,23 +110,33 @@ async function forEachWriteJoin(pass, payload, writeAlias) {
  * where the child is upserted, hijack one of that tenant's existing rows via the conflict key.
  */
 export function processSecondaries(pass, secondaries) {
-    const { db, tableConf } = pass;
+    const { db, tableConf, request } = pass;
     return forEachWriteJoin(pass, secondaries, async (records, target, joinDef) => {
         const { joinSchema, joinCol, mainValue, childConf, childTenant } = target;
         const childPk = childConf?.primary || joinDef.joinField;
         const childPkCol = Array.isArray(childPk)
             ? childPk.map((f) => joinSchema.col(f))
             : joinSchema.col(childPk);
-        const preparedRecords = records.map((rec) => {
-            let prepared = snakecaseRecord(rec, joinSchema);
-            // Remove excluded fields from the client payload BEFORE the FK auto-fill:
-            // an excluded FK column must not strip the engine-injected value below.
+        // Same order as `prepareInsertRecord` (ADR 0005): the client whitelist runs first, then
+        // the child's own `beforeInsert`, then the DB format — so a value the hook assigns to an
+        // excluded field still reaches the INSERT. A secondary is a write like any other, and its
+        // table's transform has to run here too or a column that table encodes on the way in is
+        // stored raw whenever its rows arrive as another table's children.
+        const preparedRecords = [];
+        for (const rec of records) {
+            const camel = { ...rec };
             if (childConf) {
-                prepared = removeExcludedFields(prepared, childConf);
+                removeExcludedFieldsCamel(camel, childConf);
+                if (childConf.beforeInsert) {
+                    await childConf.beforeInsert(db, request, camel);
+                }
             }
+            removeWriteExcluded(camel, childConf, joinSchema);
+            const prepared = snakecaseRecord(camel, joinSchema);
+            // FK auto-fill last: the engine's own value, not the client's and not the hook's.
             prepared[joinCol] = mainValue;
-            return prepared;
-        });
+            preparedRecords.push(prepared);
+        }
         // Tenant enforcement runs after the FK auto-fill: for an indirect scope the through-FK
         // the engine just injected is the value being validated.
         await enforceTenantOnWrites(db, childTenant, preparedRecords);

package/dist/lib/schema/bulk-upsert.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bulk-upsert.d.ts","sourceRoot":"","sources":["../../../src/lib/schema/bulk-upsert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,KAAK,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAEvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAS/C,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,oGAoB3F;AAED,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,oGAa5E"}
+{"version":3,"file":"bulk-upsert.d.ts","sourceRoot":"","sources":["../../../src/lib/schema/bulk-upsert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,KAAK,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAEvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAU/C,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,oGAuB3F;AAED,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,oGAa5E"}

package/dist/lib/schema/bulk-upsert.js

@@ -1,11 +1,12 @@
 import { Type } from '@sinclair/typebox';
 import { primaryAsString } from '../../types.js';
+import { writableFields } from '../write-access.js';
 import { pkSchema, applySchemaOverrides, attachWriteJoinSections, writeJoinBodyFields, writeJoinResponseFields, } from './helpers.js';
 export function BulkUpsertTableBody(dbTables, tableName, maxItems) {
     const tableConf = dbTables[tableName];
     const schema = tableConf.Schema;
     // additionalProperties:false makes the schema the real write whitelist (no mass assignment).
-    const mainSchema = Type.Partial(Type.Object(applySchemaOverrides({ ...schema.fields }, tableConf), { additionalProperties: false }));
+    const mainSchema = Type.Partial(Type.Object(writableFields(applySchemaOverrides({ ...schema.fields }, tableConf), tableConf, schema), { additionalProperties: false }));
     const itemProperties = {
         main: mainSchema,
     };

package/dist/lib/schema/get.d.ts

@@ -0,0 +1,14 @@
+import { type TObject } from '@sinclair/typebox';
+import type { DbTables } from '../../types.js';
+/**
+ * Response shape of `GET /rest/:table/:id`.
+ *
+ * Lives here rather than inline in the route so it is built from the same pieces as every
+ * other operation: it drifted while it was inline, documenting `readExclude`d fields the
+ * engine never selects.
+ *
+ * `Partial` because a record is returned column by column: a nullable column the driver
+ * reports as absent must not fail serialization.
+ */
+export declare function GetTableResponse(dbTables: DbTables, tableName: string): TObject;
+//# sourceMappingURL=get.d.ts.map

package/dist/lib/schema/get.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../src/lib/schema/get.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,KAAK,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAEvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE/C;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAK/E"}

package/dist/lib/schema/get.js

@@ -0,0 +1,18 @@
+import { Type } from '@sinclair/typebox';
+import { readableFields } from './helpers.js';
+/**
+ * Response shape of `GET /rest/:table/:id`.
+ *
+ * Lives here rather than inline in the route so it is built from the same pieces as every
+ * other operation: it drifted while it was inline, documenting `readExclude`d fields the
+ * engine never selects.
+ *
+ * `Partial` because a record is returned column by column: a nullable column the driver
+ * reports as absent must not fail serialization.
+ */
+export function GetTableResponse(dbTables, tableName) {
+    const tableConf = dbTables[tableName];
+    return Type.Object({
+        main: Type.Partial(Type.Object(readableFields(tableConf.Schema, tableConf))),
+    });
+}

package/dist/lib/schema/helpers.d.ts

@@ -5,11 +5,27 @@ import type { ITable, SchemaDefinition, DbTables, JoinDefinition } from '../../t
  * Falls back to `fallback` field if tableConf is undefined.
  */
 export declare function pkSchema(tableConf: ITable | undefined, schema: SchemaDefinition, fallback: string): Record<string, TSchema>;
+/** The same schema without the Optional modifier, i.e. as a required property. */
+export declare function asRequired(schema: TSchema): TSchema;
 /**
- * Apply schemaOverrides to a fields record.
- * Replaces matching field schemas with the override.
+ * Apply schemaOverrides to a fields record: each matching field becomes the declared schema,
+ * verbatim.
+ *
+ * Write bodies only. An override is a rule about what this API accepts **from now on**, and
+ * the rows already in the table were written before it existed — a column narrowed to
+ * `format: 'email'` today holds whatever was accepted last year, and one made mandatory today
+ * is `NULL` on every pre-existing row. Describing the response with it would publish a promise
+ * about data nobody can retroactively make true. Responses stay on the generated type.
+ *
+ * Verbatim, because on the request side the schema is the rule: an override without
+ * `Type.Optional` makes the field mandatory and one without `Nullable` rejects an explicit
+ * `null`, whatever the column allows. That is how a column the DB had to leave nullable is
+ * made mandatory going forward. Write the modifiers when you want them.
+ *
+ * Replace-only: an override naming a field the table does not have is ignored, so the
+ * declaration can never introduce a property the engine will not produce.
  */
-export declare function applySchemaOverrides(fields: Record<string, TSchema>, tableConf: ITable): Record<string, TSchema>;
+export declare function applySchemaOverrides(fields: Record<string, TSchema>, tableConf: ITable | undefined): Record<string, TSchema>;
 type JoinFieldsBuilder = (join: JoinDefinition, secondaryConf: ITable | undefined) => Record<string, TSchema>;
 /**
  * Attach `secondaries` (and optionally `deletions`) sections to the given target object,
@@ -29,5 +45,7 @@ export declare function attachWriteJoinSections(target: Record<string, TSchema>,
 export declare const writeJoinBodyFields: JoinFieldsBuilder;
 /** JoinFieldsBuilder for response schemas: PK only. */
 export declare const writeJoinResponseFields: JoinFieldsBuilder;
+/** Schema fields minus the ones hidden by `readExclude`. */
+export declare function readableFields(schema: SchemaDefinition, tableConf: ITable | undefined): Record<string, TSchema>;
 export {};
 //# sourceMappingURL=helpers.d.ts.map

package/dist/lib/schema/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/lib/schema/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,KAAK,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,MAAM,EAAE,gBAAgB,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGzF;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,EAAE,MAAM,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAQ3H;AA6BD;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,SAAS,EAAE,MAAM,GAChB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CASzB;AAED,KAAK,iBAAiB,GAAG,CACvB,IAAI,EAAE,cAAc,EACpB,aAAa,EAAE,MAAM,GAAG,SAAS,KAC9B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAwB7B;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE;IAAE,aAAa,EAAE,OAAO,CAAC;IAAC,eAAe,EAAE,iBAAiB,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE,GAC7F,IAAI,CA8BN;AAED,qGAAqG;AACrG,eAAO,MAAM,mBAAmB,EAAE,iBACmB,CAAC;AAEtD,uDAAuD;AACvD,eAAO,MAAM,uBAAuB,EAAE,iBACG,CAAC"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/lib/schema/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,KAAK,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACrE,OAAO,KAAK,EAAE,MAAM,EAAE,gBAAgB,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAKzF;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,EAAE,MAAM,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAQ3H;AAiCD,kFAAkF;AAClF,wBAAgB,UAAU,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAGnD;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,SAAS,EAAE,MAAM,GAAG,SAAS,GAC5B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CASzB;AAED,KAAK,iBAAiB,GAAG,CACvB,IAAI,EAAE,cAAc,EACpB,aAAa,EAAE,MAAM,GAAG,SAAS,KAC9B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAwB7B;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE;IAAE,aAAa,EAAE,OAAO,CAAC;IAAC,eAAe,EAAE,iBAAiB,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE,GAC7F,IAAI,CA8BN;AAED,qGAAqG;AACrG,eAAO,MAAM,mBAAmB,EAAE,iBACmB,CAAC;AAEtD,uDAAuD;AACvD,eAAO,MAAM,uBAAuB,EAAE,iBACG,CAAC;AAE1C,4DAA4D;AAC5D,wBAAgB,cAAc,CAC5B,MAAM,EAAE,gBAAgB,EACxB,SAAS,EAAE,MAAM,GAAG,SAAS,GAC5B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAOzB"}

package/dist/lib/schema/helpers.js

@@ -1,4 +1,6 @@
-import { Type } from '@sinclair/typebox';
+import { Type, OptionalKind } from '@sinclair/typebox';
+import { readableFieldNames } from '../read-access.js';
+import { writableFields } from '../write-access.js';
 import { findSecondaryTableConf } from '../engine/write-helpers.js';
 /**
  * Build a PK-only schema for response shapes (single or composite PK).
@@ -19,7 +21,7 @@ export function pkSchema(tableConf, schema, fallback) {
  * - excludeFromCreation fields become Optional
  */
 function buildSecondaryFields(joinSchema, joinField, secondaryTableConf) {
-    const fields = { ...joinSchema.fields };
+    const fields = writableFields({ ...joinSchema.fields }, secondaryTableConf, joinSchema);
     if (joinField in fields) {
         fields[joinField] = Type.Optional(fields[joinField]);
     }
@@ -32,12 +34,32 @@ function buildSecondaryFields(joinSchema, joinField, secondaryTableConf) {
     }
     return fields;
 }
+/** The same schema without the Optional modifier, i.e. as a required property. */
+export function asRequired(schema) {
+    if (!(OptionalKind in schema))
+        return schema;
+    return Type.Required(Type.Object({ value: schema })).properties.value;
+}
 /**
- * Apply schemaOverrides to a fields record.
- * Replaces matching field schemas with the override.
+ * Apply schemaOverrides to a fields record: each matching field becomes the declared schema,
+ * verbatim.
+ *
+ * Write bodies only. An override is a rule about what this API accepts **from now on**, and
+ * the rows already in the table were written before it existed — a column narrowed to
+ * `format: 'email'` today holds whatever was accepted last year, and one made mandatory today
+ * is `NULL` on every pre-existing row. Describing the response with it would publish a promise
+ * about data nobody can retroactively make true. Responses stay on the generated type.
+ *
+ * Verbatim, because on the request side the schema is the rule: an override without
+ * `Type.Optional` makes the field mandatory and one without `Nullable` rejects an explicit
+ * `null`, whatever the column allows. That is how a column the DB had to leave nullable is
+ * made mandatory going forward. Write the modifiers when you want them.
+ *
+ * Replace-only: an override naming a field the table does not have is ignored, so the
+ * declaration can never introduce a property the engine will not produce.
  */
 export function applySchemaOverrides(fields, tableConf) {
-    if (!tableConf.schemaOverrides)
+    if (!tableConf?.schemaOverrides)
         return fields;
     const result = { ...fields };
     for (const [field, schema] of Object.entries(tableConf.schemaOverrides)) {
@@ -88,3 +110,13 @@ export function attachWriteJoinSections(target, tableConf, dbTables, options) {
 export const writeJoinBodyFields = (j, sc) => buildSecondaryFields(j.joinSchema, j.joinField, sc);
 /** JoinFieldsBuilder for response schemas: PK only. */
 export const writeJoinResponseFields = (j, sc) => pkSchema(sc, j.joinSchema, j.joinField);
+/** Schema fields minus the ones hidden by `readExclude`. */
+export function readableFields(schema, tableConf) {
+    if (!tableConf?.readExclude?.length)
+        return { ...schema.fields };
+    const out = {};
+    for (const field of readableFieldNames(tableConf, schema)) {
+        out[field] = schema.fields[field];
+    }
+    return out;
+}

package/dist/lib/schema/insert.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"insert.d.ts","sourceRoot":"","sources":["../../../src/lib/schema/insert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,KAAK,OAAO,EAAgB,MAAM,mBAAmB,CAAC;AAErE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAS/C,wBAAgB,eAAe,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAyB9E;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAalF"}
+{"version":3,"file":"insert.d.ts","sourceRoot":"","sources":["../../../src/lib/schema/insert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,KAAK,OAAO,EAAgB,MAAM,mBAAmB,CAAC;AAErE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAU/C,wBAAgB,eAAe,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CA+B9E;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAalF"}

package/dist/lib/schema/insert.js

@@ -1,14 +1,18 @@
 import { Type } from '@sinclair/typebox';
 import { primaryAsString } from '../../types.js';
+import { writableFields } from '../write-access.js';
 import { pkSchema, applySchemaOverrides, attachWriteJoinSections, writeJoinBodyFields, writeJoinResponseFields, } from './helpers.js';
 export function InsertTableBody(dbTables, tableName) {
     const tableConf = dbTables[tableName];
     const schema = tableConf.Schema;
-    // Main: full validation, but excludeFromCreation fields become Optional
-    const mainFields = applySchemaOverrides({ ...schema.fields }, tableConf);
+    // Main: full validation, but excludeFromCreation fields become Optional. Fields the
+    // database computes are not offered at all — sending one is rejected here (400) rather
+    // than by the driver (500).
+    const mainFields = writableFields(applySchemaOverrides({ ...schema.fields }, tableConf), tableConf, schema);
     if (tableConf.excludeFromCreation) {
         for (const field of tableConf.excludeFromCreation) {
-            mainFields[field] = Type.Optional(mainFields[field]);
+            if (field in mainFields)
+                mainFields[field] = Type.Optional(mainFields[field]);
         }
     }
     const bodyProperties = {

package/dist/lib/schema/search.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../../src/lib/schema/search.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,KAAK,OAAO,EAAgB,MAAM,mBAAmB,CAAC;AAIrE,OAAO,KAAK,EAAE,QAAQ,EAA4B,MAAM,gBAAgB,CAAC;AA+JzE,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAyClF;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,eAAe,GAAE,MAAmC,GAAG,OAAO,CAe9F;AAED,qFAAqF;AACrF,eAAO,MAAM,sBAAsB,kDAAqB,CAAC;AAEzD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAyClF"}
+{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../../src/lib/schema/search.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,KAAK,OAAO,EAAgB,MAAM,mBAAmB,CAAC;AAIrE,OAAO,KAAK,EAAE,QAAQ,EAAU,MAAM,gBAAgB,CAAC;AAkJvD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAyClF;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,eAAe,GAAE,MAAmC,GAAG,OAAO,CAe9F;AAED,qFAAqF;AACrF,eAAO,MAAM,sBAAsB,kDAAqB,CAAC;AAEzD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CA2ClF"}

package/dist/lib/schema/search.js

@@ -1,17 +1,7 @@
 import { Type } from '@sinclair/typebox';
 import { ALLOWED_METHODS, MAX_CONDITIONS, MAX_ORDER_BY_LENGTH } from '../condition-methods.js';
-import { readableFieldNames } from '../read-access.js';
+import { readableFields } from './helpers.js';
 import { DEFAULT_MAX_ITEMS_PER_PAGE } from '../../types.js';
-/** Schema fields minus the ones hidden by `readExclude`. */
-function readableFields(schema, tableConf) {
-    if (!tableConf?.readExclude?.length)
-        return { ...schema.fields };
-    const out = {};
-    for (const field of readableFieldNames(tableConf, schema)) {
-        out[field] = schema.fields[field];
-    }
-    return out;
-}
 /**
  * A `filters` map.
  *
@@ -192,6 +182,8 @@ export function SearchTableResponse(dbTables, tableName) {
     // Computed fields are present in main rows only when explicitly listed in
     // request body's selectComputed, so they're optional/Partial here.
     const computedTypes = computedFieldTypes(tableConf);
+    // Not narrowed by schemaOverrides: an override rules what this API accepts from now on,
+    // while the rows already stored predate it (see applySchemaOverrides).
     const mainReadable = readableFields(tableConf.Schema, tableConf);
     const mainItem = Object.keys(computedTypes).length > 0
         ? Type.Partial(Type.Object({ ...mainReadable, ...computedTypes }))

package/dist/lib/schema/update.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../src/lib/schema/update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,KAAK,OAAO,EAAgB,MAAM,mBAAmB,CAAC;AAErE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAS/C,wBAAgB,eAAe,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAwB9E;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAalF"}
+{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../src/lib/schema/update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,KAAK,OAAO,EAAgB,MAAM,mBAAmB,CAAC;AAErE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAW/C,wBAAgB,eAAe,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CA+B9E;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAalF"}

package/dist/lib/schema/update.js

@@ -1,14 +1,18 @@
 import { Type } from '@sinclair/typebox';
 import { primaryAsString } from '../../types.js';
-import { pkSchema, applySchemaOverrides, attachWriteJoinSections, writeJoinBodyFields, writeJoinResponseFields, } from './helpers.js';
+import { writableFields } from '../write-access.js';
+import { pkSchema, applySchemaOverrides, asRequired, attachWriteJoinSections, writeJoinBodyFields, writeJoinResponseFields, } from './helpers.js';
 export function UpdateTableBody(dbTables, tableName) {
     const tableConf = dbTables[tableName];
     const schema = tableConf.Schema;
     // Main: PK required, all other fields optional (overrides applied before Optional wrap)
-    const baseFields = applySchemaOverrides({ ...schema.fields }, tableConf);
+    const baseFields = writableFields(applySchemaOverrides({ ...schema.fields }, tableConf), tableConf, schema);
     const mainFields = {};
+    const pk = primaryAsString(tableConf.primary);
     for (const [key, value] of Object.entries(baseFields)) {
-        mainFields[key] = key === primaryAsString(tableConf.primary) ? value : Type.Optional(value);
+        // The PK identifies the row being updated, so it is mandatory here even when the column
+        // is optional on insert (a generated id) and the override carried that optionality over.
+        mainFields[key] = key === pk ? asRequired(value) : Type.Optional(value);
     }
     const bodyProperties = {
         // additionalProperties:false makes the schema the real write whitelist — unknown keys are

package/dist/lib/sql-api.d.ts

@@ -1,4 +1,4 @@
-import type { FastifyRequest } from 'fastify';
+import type { ApiRequest } from '../types/request.js';
 import { QueryClient } from './db.js';
 import { type DialectName } from './dialect.js';
 import type { DbTables, Queryable, FilterRecord, SearchCondition, Paginator, JoinGroupRequest, JoinRefFilter, JoinFetchRequest, SearchResult, GetResult, InsertResult, UpdateResult, DeleteResult, BulkUpsertItem, BulkUpsertResult, BulkDeleteResult, TenantId } from '../types.js';
@@ -30,7 +30,7 @@ export interface SqlApiUpdateParams {
 }
 export interface SqlApiOptions {
     dialect?: DialectName;
-    getTenantId?: (request: FastifyRequest) => TenantId | TenantId[] | null | undefined | Promise<TenantId | TenantId[] | null | undefined>;
+    getTenantId?: (request: ApiRequest) => TenantId | TenantId[] | null | undefined | Promise<TenantId | TenantId[] | null | undefined>;
 }
 export declare class SqlApi {
     private dbTables;
@@ -39,13 +39,13 @@ export declare class SqlApi {
     constructor(dbOrPool: QueryClient | Queryable, dbTables: DbTables, options?: SqlApiOptions);
     private getTableConf;
     private getTenant;
-    search(tableName: string, params?: SqlApiSearchParams, request?: FastifyRequest): Promise<SearchResult>;
-    get(tableName: string, id: string | number, request?: FastifyRequest): Promise<GetResult>;
-    insert(tableName: string, params: SqlApiInsertParams, request?: FastifyRequest): Promise<InsertResult>;
-    update(tableName: string, params: SqlApiUpdateParams, request?: FastifyRequest): Promise<UpdateResult>;
-    delete(tableName: string, id: string | number, request?: FastifyRequest): Promise<DeleteResult>;
-    bulkUpsert(tableName: string, items: BulkUpsertItem[], request?: FastifyRequest): Promise<BulkUpsertResult[]>;
-    bulkDelete(tableName: string, ids: (string | number)[], request?: FastifyRequest): Promise<BulkDeleteResult[]>;
+    search(tableName: string, params?: SqlApiSearchParams, request?: ApiRequest): Promise<SearchResult>;
+    get(tableName: string, id: string | number, request?: ApiRequest): Promise<GetResult>;
+    insert(tableName: string, params: SqlApiInsertParams, request?: ApiRequest): Promise<InsertResult>;
+    update(tableName: string, params: SqlApiUpdateParams, request?: ApiRequest): Promise<UpdateResult>;
+    delete(tableName: string, id: string | number, request?: ApiRequest): Promise<DeleteResult>;
+    bulkUpsert(tableName: string, items: BulkUpsertItem[], request?: ApiRequest): Promise<BulkUpsertResult[]>;
+    bulkDelete(tableName: string, ids: (string | number)[], request?: ApiRequest): Promise<BulkDeleteResult[]>;
 }
 export declare function createSqlApi(dbOrPool: QueryClient | Queryable, dbTables: DbTables, options?: SqlApiOptions): SqlApi;
 //# sourceMappingURL=sql-api.d.ts.map

package/dist/lib/sql-api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sql-api.d.ts","sourceRoot":"","sources":["../../src/lib/sql-api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAE9C,OAAO,EAAqB,WAAW,EAAE,MAAM,SAAS,CAAC;AACzD,OAAO,EAAc,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AAU5D,OAAO,KAAK,EACV,QAAQ,EACR,SAAS,EACT,YAAY,EACZ,eAAe,EACf,SAAS,EACT,gBAAgB,EAChB,aAAa,EACb,gBAAgB,EAChB,YAAY,EACZ,SAAS,EACT,YAAY,EACZ,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,gBAAgB,EAChB,gBAAgB,EAChB,QAAQ,EAET,MAAM,aAAa,CAAC;AAIrB,MAAM,WAAW,kBAAkB;IACjC,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,UAAU,CAAC,EAAE,eAAe,EAAE,CAAC;IAC/B,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IAC9C,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAChD,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAC5C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,2FAA2F;IAC3F,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;CACzD;AAED,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;IACxD,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;CACvD;AAID,MAAM,WAAW,aAAa;IAC5B,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,QAAQ,GAAG,QAAQ,EAAE,GAAG,IAAI,GAAG,SAAS,GAC/E,OAAO,CAAC,QAAQ,GAAG,QAAQ,EAAE,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC;CACvD;AAED,qBAAa,MAAM;IAKf,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,OAAO;IALjB,OAAO,CAAC,EAAE,CAAc;gBAGtB,QAAQ,EAAE,WAAW,GAAG,SAAS,EACzB,QAAQ,EAAE,QAAQ,EAClB,OAAO,GAAE,aAAkB;IAgBrC,OAAO,CAAC,YAAY;YAMN,SAAS;IAUjB,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,GAAE,kBAAuB,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,YAAY,CAAC;IAwB3G,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC;IAMzF,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,YAAY,CAAC;IActG,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,YAAY,CAAC;IAetG,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,YAAY,CAAC;IAM/F,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAa7G,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;CAKrH;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,WAAW,GAAG,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,MAAM,CAEnH"}
+{"version":3,"file":"sql-api.d.ts","sourceRoot":"","sources":["../../src/lib/sql-api.ts"],"names":[],"mappings":"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"}

package/dist/lib/sql-api.js

@@ -63,12 +63,13 @@ export class SqlApi {
             selectComputed: params.selectComputed,
             maxRows: params.maxRows,
             tenant,
+            request,
         });
     }
     async get(tableName, id, request) {
         const tableConf = this.getTableConf(tableName);
         const tenant = await this.getTenant(tableName, request);
-        return getEngine({ db: this.db, tableConf, id, tenant });
+        return getEngine({ db: this.db, tableConf, id, tenant, request });
     }
     async insert(tableName, params, request) {
         const tableConf = this.getTableConf(tableName);

package/dist/lib/table-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"table-helpers.d.ts","sourceRoot":"","sources":["../../src/lib/table-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,KAAK,yBAAyB,EAAiC,MAAM,wBAAwB,CAAC;AACzH,OAAO,EAAQ,KAAK,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACrE,OAAO,KAAK,EACV,gBAAgB,EAChB,cAAc,EACd,aAAa,EACb,MAAM,EACP,MAAM,aAAa,CAAC;AAarB,KAAK,UAAU,CAAC,EAAE,IAAI,EAAE,SAAS,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AAExH,wBAAgB,eAAe,CAC7B,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,EAAE,SAAS,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,EAErE,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAC3B,YAAY,GAAE,EAAa,EAC3B,iBAAiB,CAAC,EAAE,CAClB,SAAS,EAAE,gBAAgB,EAC3B,OAAO,EAAE;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,MAAM,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,yBAAyB;CAAE,KAC3E,IAAI,GACR;IAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAAC,OAAO,EAAE,aAAa,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,CAsChG;AAED,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC3D,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,GAChB,MAAM,CAAC,CAAC,CAAC,CAQX;AAoJD,MAAM,WAAW,oBAAoB;IACnC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;;;;;;;;;;;;OAaG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAgDD,wBAAgB,aAAa,CAC3B,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAEjC,UAAU,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAC/B,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,EAAE,EAClD,UAAU,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAC/B,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC,EAC3B,OAAO,CAAC,EAAE,oBAAoB,GAC7B,cAAc,CAWhB;AAED,wBAAgB,eAAe,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/D,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAC3B,OAAO,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,EAAE,GAC5B,CAAC,gBAAgB,EAAE,MAAM,EAAE,CAAC,CAE9B;AAED,wBAAgB,gBAAgB,CAC9B,GAAG,KAAK,EAAE,CAAC,gBAAgB,EAAE,MAAM,EAAE,CAAC,EAAE,GACvC,GAAG,CAAC,gBAAgB,EAAE,MAAM,EAAE,CAAC,CAEjC"}
+{"version":3,"file":"table-helpers.d.ts","sourceRoot":"","sources":["../../src/lib/table-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,KAAK,yBAAyB,EAAiC,MAAM,wBAAwB,CAAC;AACzH,OAAO,EAAQ,KAAK,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACrE,OAAO,KAAK,EACV,gBAAgB,EAChB,cAAc,EACd,aAAa,EACb,MAAM,EAEP,MAAM,aAAa,CAAC;AAcrB,KAAK,UAAU,CAAC,EAAE,IAAI,EAAE,SAAS,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AAExH,wBAAgB,eAAe,CAC7B,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,EAAE,SAAS,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,EAErE,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAC3B,YAAY,GAAE,EAAa,EAC3B,iBAAiB,CAAC,EAAE,CAClB,SAAS,EAAE,gBAAgB,EAC3B,OAAO,EAAE;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,MAAM,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,yBAAyB;CAAE,KAC3E,IAAI,GACR;IAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAAC,OAAO,EAAE,aAAa,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,CAsChG;AAED,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC3D,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,GAChB,MAAM,CAAC,CAAC,CAAC,CAWX;AAgSD,MAAM,WAAW,oBAAoB;IACnC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;;;;;;;;;;;;OAaG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAgDD,wBAAgB,aAAa,CAC3B,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAEjC,UAAU,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAC/B,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,EAAE,EAClD,UAAU,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAC/B,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC,EAC3B,OAAO,CAAC,EAAE,oBAAoB,GAC7B,cAAc,CAWhB;AAED,wBAAgB,eAAe,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/D,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAC3B,OAAO,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,EAAE,GAC5B,CAAC,gBAAgB,EAAE,MAAM,EAAE,CAAC,CAE9B;AAED,wBAAgB,gBAAgB,CAC9B,GAAG,KAAK,EAAE,CAAC,gBAAgB,EAAE,MAAM,EAAE,CAAC,EAAE,GACvC,GAAG,CAAC,gBAAgB,EAAE,MAAM,EAAE,CAAC,CAEjC"}

package/dist/lib/table-helpers.js

@@ -1,6 +1,7 @@
 import { ConditionBuilder } from 'node-condition-builder';
 import { Type } from '@sinclair/typebox';
 import { getDialect } from './dialect.js';
+import { hasOwnField } from './read-access.js';
 // Quote an identifier using the given ConditionBuilder dialect (or the global
 // default when not provided). Needed so that DB columns with uppercase letters
 // (e.g. betterauth "userId") are preserved on PostgreSQL (which folds unquoted
@@ -49,8 +50,11 @@ export function defineTable(config) {
     validateAliasUniqueness(config.allowedWriteJoins, 'allowedWriteJoins');
     validateWriteJoinsUnrestricted(config.allowedWriteJoins);
     validateComputedFields(config);
+    validatePrimary(config);
     validateReadExclude(config);
+    validateWriteExclude(config);
     validateTenantScope(config);
+    validateTenantColumnNames(config);
     return config;
 }
 /**
@@ -59,9 +63,35 @@ export function defineTable(config) {
  * entry reached through a parent FK would need its own join per entry — and an empty `anyOf`
  * would fail closed on every row, which looks like a broken deployment rather than a rule.
  *
- * Column *names* are not checked against the schema: a tenant column may legitimately be kept
- * out of the generated schema (see ADR 0009) while still scoping the table.
+ * The columns it names are **real DB column names**, not camelCase schema fields — the one place
+ * in `defineTable` where the convention flips. That is not an oversight: a scope is applied to
+ * the SQL, after the payload has already been converted, and `through.foreignField` belongs to a
+ * parent table that may have no config, no `colMap`, or no generated schema at all. It is the
+ * same category as `db.*` and `extendedCondition`: names that go straight to the database.
+ *
+ * So existence cannot be checked — a hand-written schema may legitimately omit the column. What
+ * *is* checked is the mistake that exception invites: naming the schema **field** whose real
+ * column is something else. Left alone that surfaces as `column "organizationId" does not exist`
+ * on every request to the table — an opaque 500 (ADR 0006), failing closed but saying nothing.
+ */
+/**
+ * Reject a tenant column that is really a schema field name mapping to a different column.
+ *
+ * The check is deliberately narrow, and it self-adjusts: on a camelCase database `col()` is the
+ * identity, so a camelCase name raises nothing. A name the schema does not carry raises nothing
+ * either — that is the hand-written-schema case, and there is nothing to compare it against.
  */
+function assertNamesColumn(schema, name, where, table) {
+    if (!hasOwnField(schema.fields, name))
+        return;
+    const column = schema.col(name);
+    if (column === name)
+        return;
+    throw new Error(`defineTable: tenantScope ${where} on table '${table}' names '${name}', which is a ` +
+        `schema field, not a column: its column is '${column}'. tenantScope names real DB ` +
+        `columns — the scope is applied to the SQL, after the payload has been converted — so ` +
+        `write '${column}' here. Clients keep sending '${name}'.`);
+}
 function validateTenantScope(config) {
     const scope = config.tenantScope;
     if (!scope)
@@ -100,6 +130,35 @@ function validateTenantScope(config) {
             `A scope with no owner column would filter nothing.`);
     }
 }
+/**
+ * Every column a scope names, checked against the schema it belongs to. Runs after
+ * `validateTenantScope`, so the shape is already known to be one of the three valid forms.
+ */
+function validateTenantColumnNames(config) {
+    const scope = config.tenantScope;
+    if (!scope)
+        return;
+    const table = config.Schema.tableName;
+    if ('anyOf' in scope) {
+        for (const entry of scope.anyOf) {
+            assertNamesColumn(config.Schema, entry, "'anyOf'", table);
+        }
+        return;
+    }
+    const direct = scope;
+    assertNamesColumn(config.Schema, direct.column, "'column'", table);
+    // `through.localField` is a column of THIS table; `through.foreignField` one of the parent's,
+    // which is why the parent schema travels in the scope.
+    const through = direct.through;
+    if (!through || typeof through !== 'object')
+        return;
+    if (typeof through.localField === 'string') {
+        assertNamesColumn(config.Schema, through.localField, "'through.localField'", table);
+    }
+    if (typeof through.foreignField === 'string' && typeof through.schema?.col === 'function') {
+        assertNamesColumn(through.schema, through.foreignField, "'through.foreignField'", table);
+    }
+}
 /**
  * `fields` narrows a relation for reading; it has no meaning on a write join and would be
  * actively harmful there. Write paths resolve the secondary's upsert rule by looking the
@@ -133,6 +192,68 @@ function validateReadExclude(config) {
         }
     }
 }
+/**
+ * Every operation but `search` addresses a row by its primary key, and a `primary` naming a
+ * field the schema does not have reaches the database as a column that may not exist — a raw
+ * SQL error, so a 500 (ADR 0006), on the first request instead of at startup. Views are where
+ * this bites: they carry no PRIMARY KEY constraint, so the generator writes a placeholder
+ * rather than inventing a key that would silently address the wrong rows.
+ *
+ * `search` is the deliberate exception: it reads `primary` only as the fallback for ordering,
+ * so a table that exposes nothing else and names its own `defaultOrder` never touches it. That
+ * is exactly the shape the generator emits for a view whose key it could not infer, and it is
+ * a working config — not a broken one waiting to be fixed.
+ */
+function validatePrimary(config) {
+    const schemaFields = Object.keys(config.Schema.fields);
+    const pkFields = Array.isArray(config.primary) ? config.primary : [config.primary];
+    const table = config.Schema.tableName;
+    const missing = pkFields.filter((f) => !schemaFields.includes(f));
+    if (missing.length === 0)
+        return;
+    const searchOnly = config.operations?.length === 1 && config.operations[0] === 'search';
+    if (searchOnly) {
+        if (config.defaultOrder)
+            return;
+        throw new Error(`defineTable: table '${table}' exposes only 'search' with an unresolved primary key ` +
+            `('${missing[0]}'), so it must declare a 'defaultOrder' — otherwise the search orders ` +
+            `by that missing column.`);
+    }
+    const exposed = config.operations
+        ? `operations [${config.operations.join(', ')}]`
+        : 'every operation (no `operations` whitelist, so all routes are exposed)';
+    throw new Error(`defineTable: primary key field '${missing[0]}' is not a schema field on table ` +
+        `'${table}', and the table exposes ${exposed} — those address rows by the primary key. ` +
+        `Name a column that is unique in this relation, or restrict the table to ` +
+        `operations: ['search'] with an explicit defaultOrder.`);
+}
+/**
+ * `writeExclude` names schema fields that no write may carry. A field outside the schema is a
+ * typo; the primary key is refused because the update body identifies the row with it; and a
+ * field that is also `readExclude`d would be neither readable nor writable, which is what
+ * removing it from the Schema means — keeping it there only grows the surface for nothing.
+ */
+function validateWriteExclude(config) {
+    const excluded = config.writeExclude;
+    if (!excluded?.length)
+        return;
+    const schemaFields = Object.keys(config.Schema.fields);
+    const pkFields = Array.isArray(config.primary) ? config.primary : [config.primary];
+    const table = config.Schema.tableName;
+    for (const field of excluded) {
+        if (!schemaFields.includes(field)) {
+            throw new Error(`defineTable: writeExclude field '${field}' is not a schema field on table '${table}'.`);
+        }
+        if (pkFields.includes(field)) {
+            throw new Error(`defineTable: writeExclude cannot cover the primary key field '${field}' on table ` +
+                `'${table}' — the update body identifies the row with it.`);
+        }
+        if (config.readExclude?.includes(field)) {
+            throw new Error(`defineTable: field '${field}' on table '${table}' is in both readExclude and ` +
+                `writeExclude, leaving it neither readable nor writable. Remove it from the Schema instead.`);
+        }
+    }
+}
 function validateComputedFields(config) {
     const computed = config.computedFields;
     if (!computed)

package/dist/lib/tenant.d.ts

@@ -1,8 +1,8 @@
-import type { FastifyRequest } from 'fastify';
+import type { ApiRequest } from '../types/request.js';
 import type { QueryClient } from './db.js';
 import { ConditionBuilder, type ConditionValue, type ConditionValueOrUndefined } from 'node-condition-builder';
 import type { ITable, SqlApiPluginOptions, TenantId, TenantScope, TenantScopeDirect, TenantScopeIndirect, TenantScopeAnyOf, TenantContext } from '../types.js';
-export declare function resolveTenant(options: SqlApiPluginOptions, tableConf: ITable, request: FastifyRequest): Promise<TenantContext | undefined>;
+export declare function resolveTenant(options: SqlApiPluginOptions, tableConf: ITable, request: ApiRequest): Promise<TenantContext | undefined>;
 /**
  * The read predicate for a scope, as a fragment every caller appends to its own WHERE.
  *