fastify-auto-sqlapi 0.1.13 → 0.2.0

package/dist/lib/schema/search.js

@@ -1,5 +1,5 @@
 import { Type } from '@sinclair/typebox';
-import { ALLOWED_METHODS } from '../condition-methods.js';
+import { ALLOWED_METHODS, MAX_CONDITIONS, MAX_ORDER_BY_LENGTH } from '../condition-methods.js';
 import { readableFieldNames } from '../read-access.js';
 import { DEFAULT_MAX_ITEMS_PER_PAGE } from '../../types.js';
 /** Schema fields minus the ones hidden by `readExclude`. */
@@ -12,6 +12,112 @@ function readableFields(schema, tableConf) {
     }
     return out;
 }
+/**
+ * A `filters` map.
+ *
+ * Deliberately NOT `additionalProperties: false`, unlike the write bodies. Fastify runs Ajv
+ * with `removeAdditional: true`, so a closed schema would silently *strip* an unknown filter
+ * key before the handler ever sees it — reproducing the very bug it looks like it fixes, and
+ * leaving the engine's rejection unreachable over HTTP. Unknown keys are rejected by
+ * `assertKnownFilterKeys` in the engine instead, which also covers `sqlApi.search()`.
+ */
+function filtersObject(fields) {
+    return Type.Partial(Type.Object(fields));
+}
+/**
+ * TypeBox types declared by a table's computed fields.
+ *
+ * Each computed is dry-run with a stub context purely to read its declared `type`; the
+ * functions are pure with respect to that context. Best-effort by design — a computed that
+ * throws is skipped, because this only feeds the Swagger/body schema and the engine
+ * validates for real at request time.
+ */
+function computedFieldTypes(tableConf) {
+    const out = {};
+    for (const [name, fn] of Object.entries(tableConf?.computedFields ?? {})) {
+        try {
+            const stub = fn({
+                db: { qi: (s) => s, dialectName: 'postgres' },
+                qiCol: () => '""',
+            });
+            if (stub.type)
+                out[name] = stub.type;
+        }
+        catch {
+            // ignore — schema generation is best-effort; runtime validates.
+        }
+    }
+    return out;
+}
+function buildJoinBodyProps(dbTables, tableConf, conditionItemSchema) {
+    const props = {
+        joinMustExist: {},
+        joinMultiple: {},
+        joinGroup: {},
+        joinLeft: {},
+    };
+    for (const joinDef of tableConf.allowedReadJoins ?? []) {
+        const { joinSchema, alias, unique } = joinDef;
+        const joinTableConf = dbTables[joinSchema.tableName];
+        const joinSchemaFields = joinTableConf
+            ? { ...readableFields(joinSchema, joinTableConf), ...computedFieldTypes(joinTableConf) }
+            : { ...joinSchema.fields };
+        // `extraFilters` are only honoured where the engine delegates to the join table's
+        // own `filters()` — buildJoinRefCondition, i.e. the unique:false paths. joinLeft
+        // builds its condition inline (buildLeftJoinClauses) and handles schema and computed
+        // fields only, so advertising extraFilters there would promise a silent no-op.
+        const joinFilterFields = { ...joinSchemaFields, ...(joinTableConf?.extraFilters ?? {}) };
+        const joinRefShape = {
+            filters: Type.Optional(filtersObject(joinFilterFields)),
+            conditions: Type.Optional(Type.Array(conditionItemSchema, { maxItems: MAX_CONDITIONS })),
+        };
+        if (unique) {
+            props.joinLeft[alias] = Type.Object({
+                filters: Type.Optional(filtersObject(joinSchemaFields)),
+                conditions: Type.Optional(Type.Array(conditionItemSchema, { maxItems: MAX_CONDITIONS })),
+                selection: Type.Optional(Type.String()),
+            });
+            continue;
+        }
+        props.joinMustExist[alias] = Type.Object(joinRefShape);
+        props.joinMultiple[alias] = Type.Object({
+            ...joinRefShape,
+            selection: Type.Optional(Type.String()),
+        });
+        props.joinGroup[alias] = Type.Object({
+            aggregations: Type.Object({
+                by: Type.Optional(Type.String()),
+                distinctCount: Type.Optional(Type.Array(Type.String())),
+                min: Type.Optional(Type.Array(Type.String())),
+                max: Type.Optional(Type.Array(Type.String())),
+                sum: Type.Optional(Type.Array(Type.String())),
+                avg: Type.Optional(Type.Array(Type.String())),
+                count: Type.Optional(Type.Array(Type.String())),
+            }),
+            filters: Type.Optional(filtersObject(joinFilterFields)),
+            conditions: Type.Optional(Type.Array(conditionItemSchema, { maxItems: MAX_CONDITIONS })),
+        });
+    }
+    return props;
+}
+/** Per-alias *response* shapes: the rows each join family contributes to the result. */
+function buildJoinResponseProps(dbTables, tableConf) {
+    const joinMultipleProps = {};
+    const joinLeftProps = {};
+    const joinGroupProps = {};
+    for (const joinDef of tableConf.allowedReadJoins ?? []) {
+        const { joinSchema, alias, unique } = joinDef;
+        const itemArray = Type.Array(Type.Partial(Type.Object(readableFields(joinSchema, dbTables[joinSchema.tableName]))));
+        if (unique) {
+            joinLeftProps[alias] = itemArray;
+        }
+        else {
+            joinMultipleProps[alias] = itemArray;
+            joinGroupProps[alias] = JoinGroupResultItem;
+        }
+    }
+    return { joinMultipleProps, joinLeftProps, joinGroupProps };
+}
 const JoinGroupResultItem = Type.Object({
     sum: Type.Optional(Type.Record(Type.String(), Type.Any())),
     min: Type.Optional(Type.Record(Type.String(), Type.Any())),
@@ -30,105 +136,28 @@ export function SearchTableBodyPost(dbTables, tableName) {
         method: methodEnum,
         params: Type.Optional(Type.Array(Type.Any())),
     });
-    // Build a TypeBox map of computed-field types (declared in defineTable).
-    const computedTypes = {};
-    if (tableConf.computedFields) {
-        for (const [name, fn] of Object.entries(tableConf.computedFields)) {
-            // Cheap dry-run with a stub context to extract the declared `type`.
-            // The fn is pure-functional w.r.t. ctx — only `type` is read here.
-            try {
-                const stub = fn({
-                    db: { qi: (s) => s, dialectName: 'postgres' },
-                    qiCol: () => '""',
-                });
-                if (stub.type)
-                    computedTypes[name] = stub.type;
-            }
-            catch {
-                // ignore — Swagger schema generation is best-effort; runtime validates.
-            }
-        }
-    }
+    const computedTypes = computedFieldTypes(tableConf);
     const filterFields = {
         ...readableFields(schema, tableConf),
         ...tableConf.extraFilters,
         ...computedTypes,
     };
-    const filtersSchema = Type.Optional(Type.Partial(Type.Object(filterFields)));
-    // Per-alias entries split by unique flag:
-    //  - unique:false → joinMustExist / joinMultiple / joinGroup
-    //  - unique:true  → joinLeft
-    const joinMustExistProps = {};
-    const joinMultipleProps = {};
-    const joinGroupProps = {};
-    const joinLeftProps = {};
-    if (tableConf.allowedReadJoins) {
-        for (const joinDef of tableConf.allowedReadJoins) {
-            const { joinSchema, alias, unique } = joinDef;
-            const joinTableConf = dbTables[joinSchema.tableName];
-            const joinComputedTypes = {};
-            if (joinTableConf?.computedFields) {
-                for (const [name, fn] of Object.entries(joinTableConf.computedFields)) {
-                    try {
-                        const stub = fn({
-                            db: { qi: (s) => s, dialectName: 'postgres' },
-                            qiCol: () => '""',
-                        });
-                        if (stub.type)
-                            joinComputedTypes[name] = stub.type;
-                    }
-                    catch {
-                        // best-effort
-                    }
-                }
-            }
-            const joinFilterFields = joinTableConf
-                ? { ...readableFields(joinSchema, joinTableConf), ...joinTableConf.extraFilters, ...joinComputedTypes }
-                : { ...joinSchema.fields };
-            const joinRefShape = {
-                filters: Type.Optional(Type.Partial(Type.Object(joinFilterFields))),
-                conditions: Type.Optional(Type.Array(conditionItemSchema)),
-            };
-            const joinFetchShape = {
-                ...joinRefShape,
-                selection: Type.Optional(Type.String()),
-            };
-            if (unique) {
-                joinLeftProps[alias] = Type.Object(joinFetchShape);
-            }
-            else {
-                joinMustExistProps[alias] = Type.Object(joinRefShape);
-                joinMultipleProps[alias] = Type.Object(joinFetchShape);
-                joinGroupProps[alias] = Type.Object({
-                    aggregations: Type.Object({
-                        by: Type.Optional(Type.String()),
-                        distinctCount: Type.Optional(Type.Array(Type.String())),
-                        min: Type.Optional(Type.Array(Type.String())),
-                        max: Type.Optional(Type.Array(Type.String())),
-                        sum: Type.Optional(Type.Array(Type.String())),
-                        avg: Type.Optional(Type.Array(Type.String())),
-                        count: Type.Optional(Type.Array(Type.String())),
-                    }),
-                    filters: Type.Optional(Type.Partial(Type.Object(joinFilterFields))),
-                    conditions: Type.Optional(Type.Array(conditionItemSchema)),
-                });
-            }
-        }
-    }
+    const filtersSchema = Type.Optional(filtersObject(filterFields));
+    const joins = buildJoinBodyProps(dbTables, tableConf, conditionItemSchema);
     const bodyProperties = {
         filters: filtersSchema,
-        conditions: Type.Optional(Type.Array(conditionItemSchema)),
+        conditions: Type.Optional(Type.Array(conditionItemSchema, { maxItems: MAX_CONDITIONS })),
     };
     if (Object.keys(computedTypes).length > 0) {
         bodyProperties.selectComputed = Type.Optional(Type.Array(Type.String()));
     }
-    if (Object.keys(joinMustExistProps).length > 0) {
-        bodyProperties.joinMustExist = Type.Optional(Type.Partial(Type.Object(joinMustExistProps)));
-        bodyProperties.joinMultiple = Type.Optional(Type.Partial(Type.Object(joinMultipleProps)));
-        bodyProperties.joinGroup = Type.Optional(Type.Partial(Type.Object(joinGroupProps)));
+    if (Object.keys(joins.joinMustExist).length > 0) {
+        bodyProperties.joinMustExist = Type.Optional(Type.Partial(Type.Object(joins.joinMustExist)));
+        bodyProperties.joinMultiple = Type.Optional(Type.Partial(Type.Object(joins.joinMultiple)));
+        bodyProperties.joinGroup = Type.Optional(Type.Partial(Type.Object(joins.joinGroup)));
     }
-    if (Object.keys(joinLeftProps).length > 0) {
-        bodyProperties.joinLeft = Type.Optional(Type.Partial(Type.Object(joinLeftProps)));
+    if (Object.keys(joins.joinLeft).length > 0) {
+        bodyProperties.joinLeft = Type.Optional(Type.Partial(Type.Object(joins.joinLeft)));
     }
     return Type.Object(bodyProperties);
 }
@@ -142,7 +171,7 @@ export function SearchTableBodyPost(dbTables, tableName) {
  */
 export function SearchTableQuery(maxItemsPerPage = DEFAULT_MAX_ITEMS_PER_PAGE) {
     return Type.Object({
-        orderBy: Type.Optional(Type.String()),
+        orderBy: Type.Optional(Type.String({ maxLength: MAX_ORDER_BY_LENGTH })),
         page: Type.Optional(Type.Integer({ minimum: 1 })),
         itemsPerPage: Type.Optional(Type.Integer({
             minimum: 1,
@@ -162,42 +191,12 @@ export function SearchTableResponse(dbTables, tableName) {
     const tableConf = 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 = {};
-    if (tableConf.computedFields) {
-        for (const [name, fn] of Object.entries(tableConf.computedFields)) {
-            try {
-                const stub = fn({
-                    db: { qi: (s) => s, dialectName: 'postgres' },
-                    qiCol: () => '""',
-                });
-                if (stub.type)
-                    computedTypes[name] = stub.type;
-            }
-            catch {
-                // best-effort
-            }
-        }
-    }
+    const computedTypes = computedFieldTypes(tableConf);
     const mainReadable = readableFields(tableConf.Schema, tableConf);
     const mainItem = Object.keys(computedTypes).length > 0
         ? Type.Partial(Type.Object({ ...mainReadable, ...computedTypes }))
         : Type.Partial(Type.Object(mainReadable));
-    const joinMultipleProps = {};
-    const joinLeftProps = {};
-    const joinGroupProps = {};
-    if (tableConf.allowedReadJoins) {
-        for (const joinDef of tableConf.allowedReadJoins) {
-            const { joinSchema, alias, unique } = joinDef;
-            const itemArray = Type.Array(Type.Partial(Type.Object(readableFields(joinSchema, dbTables[joinSchema.tableName]))));
-            if (unique) {
-                joinLeftProps[alias] = itemArray;
-            }
-            else {
-                joinMultipleProps[alias] = itemArray;
-                joinGroupProps[alias] = JoinGroupResultItem;
-            }
-        }
-    }
+    const { joinMultipleProps, joinLeftProps, joinGroupProps } = buildJoinResponseProps(dbTables, tableConf);
     const responseProps = {
         table: Type.String(),
         main: Type.Array(mainItem),

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":"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"}
+{"version":3,"file":"sql-api.d.ts","sourceRoot":"","sources":["../../src/lib/sql-api.ts"],"names":[],"mappings":"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"}

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

@@ -1,5 +1,5 @@
 import { ConditionBuilder, type ConditionValueOrUndefined } from 'node-condition-builder';
-import type { TSchema, TObject } from '@sinclair/typebox';
+import { type TSchema, type TObject } from '@sinclair/typebox';
 import type { SchemaDefinition, JoinDefinition, TableFilterFn, ITable } from '../types.js';
 type ExtraProps<EF> = EF extends TObject<infer P> ? P : EF extends Record<string, TSchema> ? EF : Record<string, never>;
 export declare function exportTableInfo<F extends Record<string, TSchema>, EF extends TObject | Record<string, TSchema> = Record<never, TSchema>>(Schema: SchemaDefinition<F>, extraFilters?: EF, extendedCondition?: (condition: ConditionBuilder, filters: {
@@ -14,6 +14,21 @@ export interface BuildRelationOptions {
     alias?: string;
     selection?: string;
     unique?: boolean;
+    /**
+     * Allowlist of the target table's fields reachable through this relation.
+     *
+     * The relation is declared against a schema narrowed to these fields, so every read
+     * surface — `selection`, `filters`, `conditions`, `orderBy`, aggregations, and the
+     * generated request/response schemas — rejects anything outside the list with
+     * `400 Unknown field`. Use it to expose a table broadly while keeping some of its
+     * columns out of one relation, without hiding them from the table's own routes the way
+     * `readExclude` would.
+     *
+     * Fail-closed: a column added to the table later is not reachable through the relation
+     * until it is added here. Must include the join field, and is not allowed on a write
+     * join.
+     */
+    fields?: string[];
 }
 export declare function buildRelation<M extends Record<string, TSchema>, J extends Record<string, TSchema>>(mainSchema: SchemaDefinition<M>, mainField: string & keyof M | (string & keyof M)[], joinSchema: SchemaDefinition<J>, joinField: string & keyof J, options?: BuildRelationOptions): JoinDefinition;
 export declare function buildUpsertRule<F extends Record<string, TSchema>>(schema: SchemaDefinition<F>, columns: (string & keyof F)[]): [SchemaDefinition, string[]];

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,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC1D,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,CAMX;AAkED,MAAM,WAAW,oBAAoB;IACnC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,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,CAShB;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,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,CAOX;AAqFD,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,4 +1,5 @@
 import { ConditionBuilder } from 'node-condition-builder';
+import { Type } from '@sinclair/typebox';
 import { getDialect } from './dialect.js';
 // Quote an identifier using the given ConditionBuilder dialect (or the global
 // default when not provided). Needed so that DB columns with uppercase letters
@@ -46,10 +47,27 @@ export function exportTableInfo(Schema, extraFilters = {}, extendedCondition) {
 export function defineTable(config) {
     validateAliasUniqueness(config.allowedReadJoins, 'allowedReadJoins');
     validateAliasUniqueness(config.allowedWriteJoins, 'allowedWriteJoins');
+    validateWriteJoinsUnrestricted(config.allowedWriteJoins);
     validateComputedFields(config);
     validateReadExclude(config);
     return config;
 }
+/**
+ * `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
+ * schema object up in `upsertMap` **by identity**, and a narrowed relation carries a copy —
+ * the lookup would miss and the upsert would silently degrade to a plain insert. The
+ * narrowed schema would also drop columns the caller legitimately sends.
+ */
+function validateWriteJoinsUnrestricted(joins) {
+    for (const join of joins ?? []) {
+        if (join.fields) {
+            throw new Error(`defineTable: relation '${join.alias}' in allowedWriteJoins declares 'fields'. ` +
+                `The fields allowlist restricts reading only — remove it, and use a separate ` +
+                `buildRelation for the read side if that relation is also in allowedReadJoins.`);
+        }
+    }
+}
 function validateReadExclude(config) {
     const excluded = config.readExclude;
     if (!excluded?.length)
@@ -97,14 +115,50 @@ function validateAliasUniqueness(joins, label) {
         seen.add(j.alias);
     }
 }
+/**
+ * Copy of `schema` exposing only `fields`, in schema declaration order.
+ *
+ * `tableName`, `col` and `colMap` are carried over untouched: the engine resolves the
+ * target's configuration through `dbTables[joinSchema.tableName]`, so a narrowed relation
+ * must still answer to its real table name, and column mapping must keep working for the
+ * fields that survive.
+ */
+function narrowSchemaToFields(schema, fields, joinField) {
+    const declared = Object.keys(schema.fields);
+    for (const field of fields) {
+        if (!declared.includes(field)) {
+            throw new Error(`buildRelation: 'fields' entry '${field}' is not a field of schema ` +
+                `'${schema.tableName}'. Available: ${declared.join(', ')}.`);
+        }
+    }
+    // The join field is what ties the fetched rows back to the main result set. Dropping it
+    // from the projection would hand the caller rows it cannot match to anything.
+    if (!fields.includes(joinField)) {
+        throw new Error(`buildRelation: 'fields' must include the join field '${joinField}' on ` +
+            `'${schema.tableName}' — it is what correlates the joined rows with the main ones.`);
+    }
+    const picked = {};
+    for (const field of declared) {
+        if (fields.includes(field))
+            picked[field] = schema.fields[field];
+    }
+    return {
+        ...schema,
+        fields: picked,
+        validation: Type.Object(picked),
+        partialValidation: Type.Partial(Type.Object(picked)),
+    };
+}
 export function buildRelation(mainSchema, mainField, joinSchema, joinField, options) {
+    const fields = options?.fields;
     return {
-        joinSchema,
+        joinSchema: fields ? narrowSchemaToFields(joinSchema, fields, joinField) : joinSchema,
         joinField,
         mainField,
         alias: options?.alias ?? joinSchema.tableName,
         selection: options?.selection ?? '*',
         unique: options?.unique ?? false,
+        ...(fields ? { fields: [...fields] } : {}),
     };
 }
 export function buildUpsertRule(schema, columns) {

package/dist/lib/tenant.d.ts

@@ -4,8 +4,34 @@ import { ConditionBuilder, type ConditionValue, type ConditionValueOrUndefined }
 import type { ITable, SqlApiPluginOptions, TenantId, TenantScope, TenantScopeIndirect, TenantContext } from '../types.js';
 export declare function resolveTenant(options: SqlApiPluginOptions, tableConf: ITable, request: FastifyRequest): Promise<TenantContext | undefined>;
 export declare function buildTenantCondition(db: QueryClient, scope: TenantScope, tenantIds: TenantId[], ownTable: string): ConditionBuilder;
+/**
+ * Re-target a tenant context onto a related table: the caller's tenant ids paired with that
+ * table's OWN scope. A child table declares its own `tenantScope`, which may differ in shape
+ * from the main table's, so a write to it must be checked against its own column/through-FK.
+ *
+ * Returns undefined for the two cases that must stay unscoped — no tenant context (admin) and
+ * a table that declares no scope — mirroring `appendJoinTenantScope` on the read side.
+ */
+export declare function tenantForTable(tenant: TenantContext | undefined, tableConf: ITable | undefined): TenantContext | undefined;
+/**
+ * Tenant guard as a self-contained boolean fragment, for the positions where the scope cannot
+ * be expressed as an extra INNER JOIN: a child DELETE, a LEFT JOIN's ON clause, and the
+ * correlated subquery of an aggregation. A direct scope compares the table's own column; an
+ * indirect one tests the through table with a correlated EXISTS rather than a join.
+ *
+ * `tableRef` is the name the scoped rows go by in that statement — the table name in a DELETE,
+ * the join alias in an ON clause, the subquery alias inside a correlated SELECT. Returns
+ * undefined without a tenant context (admin).
+ */
+export declare function buildTenantRowGuard(db: QueryClient, tenant: TenantContext | undefined, tableRef: string): ConditionBuilder | undefined;
 export declare function buildTenantJoin(db: QueryClient, scope: TenantScopeIndirect, mainTableName: string): string;
+/** Writes the tenant value into a record according to its scope.
+ * @testonly Exported only so unit tests can exercise it directly.
+ */
 export declare function injectTenantValue(record: Record<string, unknown>, scope: TenantScope, tenantIds: TenantId[]): void;
+/** Checks that an indirect-scope FK really belongs to the tenant.
+ * @testonly Exported only so unit tests can exercise it directly.
+ */
 export declare function validateTenantFK(db: QueryClient, scope: TenantScopeIndirect, tenantIds: TenantId[], fkValues: unknown[]): Promise<void>;
 /**
  * Build WHERE clause for DELETE with tenant filtering.

package/dist/lib/tenant.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tenant.d.ts","sourceRoot":"","sources":["../../src/lib/tenant.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tenant.d.ts","sourceRoot":"","sources":["../../src/lib/tenant.ts"],"names":[],"mappings":"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"}

package/dist/lib/tenant.js

@@ -30,12 +30,55 @@ export function buildTenantCondition(db, scope, tenantIds, ownTable) {
     cb.isIn(qualifier, tenantIds);
     return cb;
 }
+/**
+ * Re-target a tenant context onto a related table: the caller's tenant ids paired with that
+ * table's OWN scope. A child table declares its own `tenantScope`, which may differ in shape
+ * from the main table's, so a write to it must be checked against its own column/through-FK.
+ *
+ * Returns undefined for the two cases that must stay unscoped — no tenant context (admin) and
+ * a table that declares no scope — mirroring `appendJoinTenantScope` on the read side.
+ */
+export function tenantForTable(tenant, tableConf) {
+    const scope = tableConf?.tenantScope;
+    if (!tenant || !scope)
+        return undefined;
+    return { ids: tenant.ids, scope };
+}
+/**
+ * Tenant guard as a self-contained boolean fragment, for the positions where the scope cannot
+ * be expressed as an extra INNER JOIN: a child DELETE, a LEFT JOIN's ON clause, and the
+ * correlated subquery of an aggregation. A direct scope compares the table's own column; an
+ * indirect one tests the through table with a correlated EXISTS rather than a join.
+ *
+ * `tableRef` is the name the scoped rows go by in that statement — the table name in a DELETE,
+ * the join alias in an ON clause, the subquery alias inside a correlated SELECT. Returns
+ * undefined without a tenant context (admin).
+ */
+export function buildTenantRowGuard(db, tenant, tableRef) {
+    if (!tenant)
+        return undefined;
+    const cb = new ConditionBuilder('AND', db.cbDialect);
+    if (!isIndirect(tenant.scope)) {
+        cb.append(buildTenantCondition(db, tenant.scope, tenant.ids, tableRef));
+        return cb;
+    }
+    const { through, column } = tenant.scope;
+    const throughRef = db.qi(through.schema.tableName);
+    const markers = tenant.ids.map(() => '?').join(', ');
+    cb.raw(`EXISTS (SELECT 1 FROM ${throughRef} WHERE ` +
+        `${throughRef}.${db.qi(through.foreignField)} = ${db.qi(tableRef)}.${db.qi(through.localField)} AND ` +
+        `${throughRef}.${db.qi(column)} IN (${markers}))`, tenant.ids);
+    return cb;
+}
 export function buildTenantJoin(db, scope, mainTableName) {
     const throughTable = scope.through.schema.tableName;
     const localField = scope.through.localField;
     const foreignField = scope.through.foreignField;
     return `INNER JOIN ${db.qi(throughTable)} ON ${db.qi(mainTableName)}.${db.qi(localField)} = ${db.qi(throughTable)}.${db.qi(foreignField)}`;
 }
+/** Writes the tenant value into a record according to its scope.
+ * @testonly Exported only so unit tests can exercise it directly.
+ */
 export function injectTenantValue(record, scope, tenantIds) {
     if (isIndirect(scope))
         return;
@@ -52,6 +95,9 @@ export function injectTenantValue(record, scope, tenantIds) {
     }
     throw httpError(400, 'Ambiguous tenant: specify the tenant value');
 }
+/** Checks that an indirect-scope FK really belongs to the tenant.
+ * @testonly Exported only so unit tests can exercise it directly.
+ */
 export async function validateTenantFK(db, scope, tenantIds, fkValues) {
     if (!fkValues.length)
         return;

package/dist/routes/auto/route-helpers.d.ts

@@ -1,7 +1,5 @@
 import type { FastifyInstance, FastifyRequest, FastifyReply } from 'fastify';
 import type { ITable, SqlApiPluginOptions, DbTables, TableOperation } from '../../types.js';
-type RequestHook = (request: FastifyRequest, reply: FastifyReply) => Promise<void | FastifyReply>;
-export declare function mergeOnRequests(options: SqlApiPluginOptions, tableConf: ITable): RequestHook[];
 export declare function buildWriteDescription(action: string, tableName: string, tableConf: ITable): string;
 interface RouteSchema {
     body?: any;
@@ -31,11 +29,6 @@ export interface AutoRouteSpec {
      * the registrar will reply.status(successStatus).send(returnValue). */
     handle: (fastify: FastifyInstance, tableName: string, tableConf: ITable, request: FastifyRequest, reply: FastifyReply) => Promise<unknown>;
 }
-/**
- * Iterates over every table in `options.DbTables` and registers one Fastify route for it
- * following `spec`. Centralizes onRequest hook merging, tags, schema response wrapping,
- * default reply when handler returns a value.
- */
 export declare function registerForAllTables(fastify: FastifyInstance, options: SqlApiPluginOptions, spec: AutoRouteSpec): Promise<void>;
 export {};
 //# sourceMappingURL=route-helpers.d.ts.map

package/dist/routes/auto/route-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route-helpers.d.ts","sourceRoot":"","sources":["../../../src/routes/auto/route-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAG7E,OAAO,KAAK,EAAE,MAAM,EAAE,mBAAmB,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAE5F,KAAK,WAAW,GAAG,CAAC,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,GAAG,YAAY,CAAC,CAAC;AAElG,wBAAgB,eAAe,CAAC,OAAO,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,GAAG,WAAW,EAAE,CAE9F;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAQlG;AAED,UAAU,WAAW;IAEnB,IAAI,CAAC,EAAE,GAAG,CAAC;IAEX,MAAM,CAAC,EAAE,GAAG,CAAC;IAEb,WAAW,CAAC,EAAE,GAAG,CAAC;IAElB,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB;AAED,MAAM,WAAW,aAAa;IAC5B,iGAAiG;IACjG,SAAS,EAAE,cAAc,CAAC;IAC1B;;;;;OAKG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,MAAM,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,CAAC;IAC1C,gFAAgF;IAChF,GAAG,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,MAAM,CAAC;IACnC,aAAa,EAAE,GAAG,GAAG,GAAG,CAAC;IACzB,wIAAwI;IACxI,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,WAAW,CAAC;IACnF,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,KAAK,MAAM,CAAC;IACpF;2EACuE;IACvE,MAAM,EAAE,CACN,OAAO,EAAE,eAAe,EACxB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE,YAAY,KAChB,OAAO,CAAC,OAAO,CAAC,CAAC;CACvB;AAED;;;;GAIG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,mBAAmB,EAC5B,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,IAAI,CAAC,CAkDf"}
+{"version":3,"file":"route-helpers.d.ts","sourceRoot":"","sources":["../../../src/routes/auto/route-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAG7E,OAAO,KAAK,EAAE,MAAM,EAAE,mBAAmB,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAQ5F,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAQlG;AAED,UAAU,WAAW;IAEnB,IAAI,CAAC,EAAE,GAAG,CAAC;IAEX,MAAM,CAAC,EAAE,GAAG,CAAC;IAEb,WAAW,CAAC,EAAE,GAAG,CAAC;IAElB,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB;AAED,MAAM,WAAW,aAAa;IAC5B,iGAAiG;IACjG,SAAS,EAAE,cAAc,CAAC;IAC1B;;;;;OAKG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,MAAM,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,CAAC;IAC1C,gFAAgF;IAChF,GAAG,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,MAAM,CAAC;IACnC,aAAa,EAAE,GAAG,GAAG,GAAG,CAAC;IACzB,wIAAwI;IACxI,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,WAAW,CAAC;IACnF,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,KAAK,MAAM,CAAC;IACpF;2EACuE;IACvE,MAAM,EAAE,CACN,OAAO,EAAE,eAAe,EACxB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE,YAAY,KAChB,OAAO,CAAC,OAAO,CAAC,CAAC;CACvB;AA6DD,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,mBAAmB,EAC5B,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,IAAI,CAAC,CAuBf"}