fastify-auto-sqlapi 0.0.4 → 0.1.1

package/dist/lib/schema/search.js

@@ -4,96 +4,190 @@ const JoinGroupResultItem = Type.Object({
     sum: Type.Optional(Type.Record(Type.String(), Type.Any())),
     min: Type.Optional(Type.Record(Type.String(), Type.Any())),
     max: Type.Optional(Type.Record(Type.String(), Type.Any())),
+    avg: Type.Optional(Type.Record(Type.String(), Type.Any())),
+    count: Type.Optional(Type.Record(Type.String(), Type.Any())),
     distinctCount: Type.Optional(Type.Record(Type.String(), Type.Any())),
     rows: Type.Optional(Type.Array(Type.Any())),
 });
 export function SearchTableBodyPost(dbTables, tableName) {
     const tableConf = dbTables[tableName];
     const schema = tableConf.Schema;
-    // Filters: schema fields + extraFilters
+    const methodEnum = Type.Union(ALLOWED_METHODS.map((m) => Type.Literal(m)));
+    const conditionItemSchema = Type.Object({
+        field: Type.String(),
+        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 filterFields = {
         ...schema.fields,
         ...tableConf.extraFilters,
+        ...computedTypes,
     };
     const filtersSchema = Type.Optional(Type.Partial(Type.Object(filterFields)));
-    // Joins & JoinGroups from allowedReadJoins
-    const joinProperties = {};
-    const joinFilterProperties = {};
-    const joinGroupProperties = {};
+    // 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 [joinSchema] of tableConf.allowedReadJoins) {
-            const joinTableName = joinSchema.tableName;
-            const joinTableConf = dbTables[joinTableName];
+        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
-                ? { ...joinSchema.fields, ...joinTableConf.extraFilters }
+                ? { ...joinSchema.fields, ...joinTableConf.extraFilters, ...joinComputedTypes }
                 : { ...joinSchema.fields };
-            joinProperties[joinTableName] = Type.Object({
-                filters: Type.Optional(Type.Partial(Type.Object(joinFilterFields))),
-            });
-            joinFilterProperties[joinTableName] = Type.Partial(Type.Object(joinFilterFields));
-            joinGroupProperties[joinTableName] = 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())),
-                }),
+            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)),
+                });
+            }
         }
     }
-    // Conditions: advanced filters with ConditionBuilder methods
-    const methodEnum = Type.Union(ALLOWED_METHODS.map((m) => Type.Literal(m)));
-    const conditionItemSchema = Type.Object({
-        field: Type.String(),
-        method: methodEnum,
-        params: Type.Optional(Type.Array(Type.Any())),
-    });
     const bodyProperties = {
         filters: filtersSchema,
         conditions: Type.Optional(Type.Array(conditionItemSchema)),
     };
-    if (Object.keys(joinProperties).length > 0) {
-        bodyProperties.joinFilters = Type.Optional(Type.Partial(Type.Object(joinFilterProperties)));
-        bodyProperties.joins = Type.Optional(Type.Partial(Type.Object(joinProperties)));
-        bodyProperties.joinGroups = Type.Optional(Type.Partial(Type.Object(joinGroupProperties)));
+    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(joinLeftProps).length > 0) {
+        bodyProperties.joinLeft = Type.Optional(Type.Partial(Type.Object(joinLeftProps)));
     }
     return Type.Object(bodyProperties);
 }
 export const SearchTableQueryString = Type.Object({
     orderBy: Type.Optional(Type.String()),
     page: Type.Optional(Type.Integer({ minimum: 1 })),
-    itemsPerPage: Type.Optional(Type.Integer({ minimum: 1, maximum: 5000, default: 500 })),
+    itemsPerPage: Type.Optional(Type.Integer({ minimum: 1, default: 500 })),
     computeMin: Type.Optional(Type.String()),
     computeMax: Type.Optional(Type.String()),
     computeSum: Type.Optional(Type.String()),
     computeAvg: Type.Optional(Type.String()),
+    // selectComputed list goes in the body (POST), not querystring — see SearchTableBodyPost.
 });
 export function SearchTableResponse(dbTables, tableName) {
     const tableConf = dbTables[tableName];
-    const mainItem = Type.Partial(Type.Object(tableConf.Schema.fields));
-    const joinResponseProperties = {};
-    const joinGroupResponseProperties = {};
+    // 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 mainItem = Object.keys(computedTypes).length > 0
+        ? Type.Partial(Type.Object({ ...tableConf.Schema.fields, ...computedTypes }))
+        : Type.Partial(Type.Object(tableConf.Schema.fields));
+    const joinMultipleProps = {};
+    const joinLeftProps = {};
+    const joinGroupProps = {};
     if (tableConf.allowedReadJoins) {
-        for (const [joinSchema] of tableConf.allowedReadJoins) {
-            joinResponseProperties[joinSchema.tableName] = Type.Array(Type.Partial(Type.Object(joinSchema.fields)));
-            joinGroupResponseProperties[joinSchema.tableName] = JoinGroupResultItem;
+        for (const joinDef of tableConf.allowedReadJoins) {
+            const { joinSchema, alias, unique } = joinDef;
+            const itemArray = Type.Array(Type.Partial(Type.Object(joinSchema.fields)));
+            if (unique) {
+                joinLeftProps[alias] = itemArray;
+            }
+            else {
+                joinMultipleProps[alias] = itemArray;
+                joinGroupProps[alias] = JoinGroupResultItem;
+            }
         }
     }
-    return Type.Object({
+    const responseProps = {
         table: Type.String(),
         main: Type.Array(mainItem),
-        joins: Type.Optional(Type.Partial(Type.Object(joinResponseProperties))),
-        joinGroups: Type.Optional(Type.Partial(Type.Object(joinGroupResponseProperties))),
-        pagination: Type.Optional(Type.Object({
-            total: Type.Integer(),
-            pages: Type.Integer(),
-            computed: Type.Optional(Type.Record(Type.String(), Type.Unknown())),
-            paginator: Type.Object({
-                page: Type.Integer(),
-                itemsPerPage: Type.Integer(),
-            }),
-        })),
-    });
+    };
+    if (Object.keys(joinMultipleProps).length > 0) {
+        responseProps.joinMultiple = Type.Optional(Type.Partial(Type.Object(joinMultipleProps)));
+        responseProps.joinGroup = Type.Optional(Type.Partial(Type.Object(joinGroupProps)));
+    }
+    if (Object.keys(joinLeftProps).length > 0) {
+        responseProps.joinLeft = Type.Optional(Type.Partial(Type.Object(joinLeftProps)));
+    }
+    responseProps.pagination = Type.Optional(Type.Object({
+        total: Type.Integer(),
+        pages: Type.Integer(),
+        computed: Type.Optional(Type.Record(Type.String(), Type.Unknown())),
+        paginator: Type.Object({
+            page: Type.Integer(),
+            itemsPerPage: Type.Integer(),
+        }),
+    }));
+    return Type.Object(responseProps);
 }

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;AAI/C,wBAAgB,eAAe,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAsC9E;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CA8BlF"}
+{"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,CAqB9E;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAalF"}

package/dist/lib/schema/update.js

@@ -1,7 +1,6 @@
 import { Type } from '@sinclair/typebox';
 import { primaryAsString } from '../../types.js';
-import { findSecondaryTableConf } from '../engine/write-helpers.js';
-import { pkSchema, buildSecondaryFields, applySchemaOverrides } from './helpers.js';
+import { pkSchema, applySchemaOverrides, attachWriteJoinSections, writeJoinBodyFields, writeJoinResponseFields, } from './helpers.js';
 export function UpdateTableBody(dbTables, tableName) {
     const tableConf = dbTables[tableName];
     const schema = tableConf.Schema;
@@ -14,18 +13,10 @@ export function UpdateTableBody(dbTables, tableName) {
     const bodyProperties = {
         main: Type.Object(mainFields),
     };
-    if (tableConf.allowedWriteJoins?.length) {
-        const secondaryProperties = {};
-        const deletionProperties = {};
-        for (const [joinSchema, joinField] of tableConf.allowedWriteJoins) {
-            const secondaryTableConf = findSecondaryTableConf(dbTables, joinSchema.tableName);
-            const joinFields = buildSecondaryFields(joinSchema, joinField, secondaryTableConf);
-            secondaryProperties[joinSchema.tableName] = Type.Array(Type.Object(joinFields));
-            deletionProperties[joinSchema.tableName] = Type.Array(Type.Partial(Type.Object(joinSchema.fields)));
-        }
-        bodyProperties.secondaries = Type.Optional(Type.Partial(Type.Object(secondaryProperties)));
-        bodyProperties.deletions = Type.Optional(Type.Partial(Type.Object(deletionProperties)));
-    }
+    attachWriteJoinSections(bodyProperties, tableConf, dbTables, {
+        withDeletions: true,
+        secondaryFields: writeJoinBodyFields,
+    });
     return Type.Object(bodyProperties);
 }
 export function UpdateTableResponse(dbTables, tableName) {
@@ -33,16 +24,9 @@ export function UpdateTableResponse(dbTables, tableName) {
     const responseProperties = {
         main: Type.Object(pkSchema(tableConf, tableConf.Schema, primaryAsString(tableConf.primary))),
     };
-    if (tableConf.allowedWriteJoins?.length) {
-        const secondaryProperties = {};
-        const deletionProperties = {};
-        for (const [joinSchema, joinField] of tableConf.allowedWriteJoins) {
-            const secondaryTableConf = findSecondaryTableConf(dbTables, joinSchema.tableName);
-            secondaryProperties[joinSchema.tableName] = Type.Array(Type.Object(pkSchema(secondaryTableConf, joinSchema, joinField)));
-            deletionProperties[joinSchema.tableName] = Type.Array(Type.Partial(Type.Object(joinSchema.fields)));
-        }
-        responseProperties.secondaries = Type.Optional(Type.Partial(Type.Object(secondaryProperties)));
-        responseProperties.deletions = Type.Optional(Type.Partial(Type.Object(deletionProperties)));
-    }
+    attachWriteJoinSections(responseProperties, tableConf, dbTables, {
+        withDeletions: true,
+        secondaryFields: writeJoinResponseFields,
+    });
     return Type.Object(responseProperties);
 }

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

@@ -1,21 +1,21 @@
 import type { FastifyRequest } from 'fastify';
 import { QueryClient } from './db.js';
 import { type DialectName } from './dialect.js';
-import type { DbTables, Queryable, FilterRecord, SearchCondition, Paginator, JoinGroupRequest, SearchResult, GetResult, InsertResult, UpdateResult, DeleteResult, BulkUpsertItem, BulkUpsertResult, BulkDeleteResult, TenantId } from '../types.js';
+import type { DbTables, Queryable, FilterRecord, SearchCondition, Paginator, JoinGroupRequest, JoinRefFilter, JoinFetchRequest, SearchResult, GetResult, InsertResult, UpdateResult, DeleteResult, BulkUpsertItem, BulkUpsertResult, BulkDeleteResult, TenantId } from '../types.js';
 export interface SqlApiSearchParams {
     filters?: FilterRecord;
     conditions?: SearchCondition[];
-    joinFilters?: Record<string, FilterRecord>;
-    joins?: Record<string, {
-        filters?: FilterRecord;
-    }>;
-    joinGroups?: Record<string, JoinGroupRequest>;
+    joinMustExist?: Record<string, JoinRefFilter>;
+    joinMultiple?: Record<string, JoinFetchRequest>;
+    joinGroup?: Record<string, JoinGroupRequest>;
+    joinLeft?: Record<string, JoinFetchRequest>;
     orderBy?: string;
     paginator?: Paginator;
     computeMin?: string;
     computeMax?: string;
     computeSum?: string;
     computeAvg?: string;
+    selectComputed?: string[];
 }
 export interface SqlApiInsertParams {
     record: Record<string, unknown>;

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/sql-api.js

@@ -2,6 +2,7 @@ import { ConditionBuilder } from 'node-condition-builder';
 import { createQueryClient, QueryClient } from './db.js';
 import { getDialect } from './dialect.js';
 import { resolveTenant } from './tenant.js';
+import { httpError } from './errors.js';
 import { searchEngine } from './engine/search/search.js';
 import { getEngine } from './engine/rest/get.js';
 import { insertEngine } from './engine/rest/insert.js';
@@ -31,11 +32,8 @@ export class SqlApi {
     }
     getTableConf(tableName) {
         const conf = this.dbTables[tableName];
-        if (!conf) {
-            const err = new Error(`Table "${tableName}" not found in DbTables`);
-            err.statusCode = 400;
-            throw err;
-        }
+        if (!conf)
+            throw httpError(400, `Table "${tableName}" not found in DbTables`);
         return conf;
     }
     async getTenant(tableName, request) {
@@ -52,15 +50,17 @@ export class SqlApi {
             tableConf,
             filters: params.filters,
             conditions: params.conditions,
-            joinFilters: params.joinFilters,
-            joins: params.joins,
-            joinGroups: params.joinGroups,
+            joinMustExist: params.joinMustExist,
+            joinMultiple: params.joinMultiple,
+            joinGroup: params.joinGroup,
+            joinLeft: params.joinLeft,
             orderBy: params.orderBy,
             paginator: params.paginator,
             computeMin: params.computeMin,
             computeMax: params.computeMax,
             computeSum: params.computeSum,
             computeAvg: params.computeAvg,
+            selectComputed: params.selectComputed,
             tenant,
         });
     }

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

@@ -10,7 +10,12 @@ export declare function exportTableInfo<F extends Record<string, TSchema>, EF ex
     extraFilters: Record<string, TSchema>;
 };
 export declare function defineTable<F extends Record<string, TSchema>>(config: ITable<F>): ITable<F>;
-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, selection?: string): JoinDefinition;
+export interface BuildRelationOptions {
+    alias?: string;
+    selection?: string;
+    unique?: boolean;
+}
+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[]];
 export declare function buildUpsertRules(...rules: [SchemaDefinition, string[]][]): Map<SchemaDefinition, string[]>;
 export {};

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,EAAE,MAAM,wBAAwB,CAAC;AAC1F,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;AAGrB,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,CA0BhG;AAED,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC3D,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,GAChB,MAAM,CAAC,CAAC,CAAC,CAEX;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,SAAS,GAAE,MAAY,GACtB,cAAc,CAEhB;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,EAAE,MAAM,wBAAwB,CAAC;AAC1F,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;AAYrB,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,CA0BhG;AAED,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC3D,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,GAChB,MAAM,CAAC,CAAC,CAAC,CAKX;AA2CD,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"}

package/dist/lib/table-helpers.js

@@ -1,11 +1,19 @@
 import { ConditionBuilder } from 'node-condition-builder';
+import { getDialect } from './dialect.js';
+// Quote an identifier using the current global ConditionBuilder dialect.
+// Needed so that DB columns with uppercase letters (e.g. betterauth "userId")
+// are preserved on PostgreSQL (which folds unquoted identifiers to lowercase)
+// and on MySQL (which is case-sensitive on Linux filesystems).
+function qi(field) {
+    return getDialect(ConditionBuilder.DIALECT).qi(field);
+}
 export function exportTableInfo(Schema, extraFilters = {}, extendedCondition) {
     const filters = (filterValues) => {
         const condition = new ConditionBuilder('AND');
         // Only auto-match real schema fields (DB columns)
         for (const field of Object.keys(Schema.fields)) {
             if (field in filterValues && filterValues[field] !== null && filterValues[field] !== undefined) {
-                condition.isEqual(Schema.col(field), filterValues[field]);
+                condition.isEqual(qi(Schema.col(field)), filterValues[field]);
             }
         }
         // extraFilters are handled exclusively by extendedCondition
@@ -21,10 +29,50 @@ export function exportTableInfo(Schema, extraFilters = {}, extendedCondition) {
     return { Schema, filters, extraFilters: efRecord };
 }
 export function defineTable(config) {
+    validateAliasUniqueness(config.allowedReadJoins, 'allowedReadJoins');
+    validateAliasUniqueness(config.allowedWriteJoins, 'allowedWriteJoins');
+    validateComputedFields(config);
     return config;
 }
-export function buildRelation(mainSchema, mainField, joinSchema, joinField, selection = '*') {
-    return [joinSchema, joinField, mainField, selection];
+function validateComputedFields(config) {
+    const computed = config.computedFields;
+    if (!computed)
+        return;
+    const schemaFields = Object.keys(config.Schema.fields);
+    const extraKeys = Object.keys(config.extraFilters || {});
+    for (const name of Object.keys(computed)) {
+        if (schemaFields.includes(name)) {
+            throw new Error(`defineTable: computedFields name '${name}' collides with a schema field on ` +
+                `table '${config.Schema.tableName}'. Choose a different name.`);
+        }
+        if (extraKeys.includes(name)) {
+            throw new Error(`defineTable: computedFields name '${name}' collides with an extraFilters key on ` +
+                `table '${config.Schema.tableName}'. Choose a different name.`);
+        }
+    }
+}
+function validateAliasUniqueness(joins, label) {
+    if (!joins?.length)
+        return;
+    const seen = new Set();
+    for (const j of joins) {
+        if (seen.has(j.alias)) {
+            throw new Error(`defineTable: duplicate alias '${j.alias}' in ${label}. ` +
+                `When omitted, alias defaults to joinSchema.tableName — ` +
+                `declare an explicit alias to disambiguate.`);
+        }
+        seen.add(j.alias);
+    }
+}
+export function buildRelation(mainSchema, mainField, joinSchema, joinField, options) {
+    return {
+        joinSchema,
+        joinField,
+        mainField,
+        alias: options?.alias ?? joinSchema.tableName,
+        selection: options?.selection ?? '*',
+        unique: options?.unique ?? false,
+    };
 }
 export function buildUpsertRule(schema, columns) {
     return [schema, columns];

package/dist/lib/tenant.d.ts

@@ -15,5 +15,28 @@ export declare function buildTenantDeleteWhere(db: QueryClient, tableName: strin
     where: string;
     values: unknown[];
 };
+/**
+ * Mutates `fields` in-place: removes the tenant column from a SET payload (direct scopes only).
+ * No-op for indirect or no scope.
+ */
 export declare function stripTenantColumn(fields: Record<string, unknown>, scope: TenantScope): void;
+/**
+ * For insert/bulk-upsert: enforce tenant on records that are about to be written.
+ * For direct scopes, mutates each record in-place to inject/validate the tenant column.
+ * For indirect scopes, batch-validates the FK values against the tenant scope.
+ * Throws 400 (ambiguous tenant) or 403 (mismatch) on violation. No-op when `tenant` is undefined.
+ */
+export declare function enforceTenantOnWrites(db: QueryClient, tenant: TenantContext | undefined, records: Record<string, unknown>[]): Promise<void>;
+/**
+ * For update: builds the optional `extraCondition` ConditionBuilder for direct tenants.
+ * Returns undefined for indirect or no-tenant scenarios — those are handled separately
+ * (indirect uses pre-check via `assertTenantOwnership`).
+ */
+export declare function buildTenantUpdateExtra(tenant: TenantContext | undefined): ConditionBuilder | undefined;
+/**
+ * For update with indirect tenant: pre-check ownership via `SELECT 1 ... INNER JOIN ... LIMIT 1`.
+ * Throws 404 if the record either does not exist or does not belong to the tenant.
+ * No-op for direct or no-tenant — those are enforced via `extraCondition` in the UPDATE itself.
+ */
+export declare function assertTenantOwnership(db: QueryClient, tenant: TenantContext | undefined, tableName: string, pkCol: string, pkValue: ConditionValue): Promise<void>;
 //# sourceMappingURL=tenant.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"tenant.d.ts","sourceRoot":"","sources":["../../src/lib/tenant.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAC9C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,KAAK,cAAc,EAAE,KAAK,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AAC/G,OAAO,KAAK,EACV,MAAM,EACN,mBAAmB,EACnB,QAAQ,EACR,WAAW,EACX,mBAAmB,EACnB,aAAa,EACd,MAAM,aAAa,CAAC;AAMrB,wBAAsB,aAAa,CACjC,OAAO,EAAE,mBAAmB,EAC5B,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CASpC;AAED,wBAAgB,oBAAoB,CAClC,EAAE,EAAE,WAAW,EACf,KAAK,EAAE,WAAW,EAClB,SAAS,EAAE,QAAQ,EAAE,GACpB,gBAAgB,CAclB;AAED,wBAAgB,eAAe,CAC7B,EAAE,EAAE,WAAW,EACf,KAAK,EAAE,mBAAmB,EAC1B,aAAa,EAAE,MAAM,GACpB,MAAM,CAMR;AAED,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,KAAK,EAAE,WAAW,EAClB,SAAS,EAAE,QAAQ,EAAE,GACpB,IAAI,CAqBN;AAED,wBAAsB,gBAAgB,CACpC,EAAE,EAAE,WAAW,EACf,KAAK,EAAE,mBAAmB,EAC1B,SAAS,EAAE,QAAQ,EAAE,EACrB,QAAQ,EAAE,OAAO,EAAE,GAClB,OAAO,CAAC,IAAI,CAAC,CA2Bf;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,EAAE,EAAE,WAAW,EACf,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,yBAAyB,GAAG,cAAc,EAAE,EACrD,MAAM,EAAE,aAAa,GACpB;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,EAAE,CAAA;CAAE,CAsBtC;AAED,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,KAAK,EAAE,WAAW,GACjB,IAAI,CAGN"}
+{"version":3,"file":"tenant.d.ts","sourceRoot":"","sources":["../../src/lib/tenant.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAC9C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,KAAK,cAAc,EAAE,KAAK,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AAE/G,OAAO,KAAK,EACV,MAAM,EACN,mBAAmB,EACnB,QAAQ,EACR,WAAW,EACX,mBAAmB,EACnB,aAAa,EACd,MAAM,aAAa,CAAC;AAMrB,wBAAsB,aAAa,CACjC,OAAO,EAAE,mBAAmB,EAC5B,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CASpC;AAED,wBAAgB,oBAAoB,CAClC,EAAE,EAAE,WAAW,EACf,KAAK,EAAE,WAAW,EAClB,SAAS,EAAE,QAAQ,EAAE,GACpB,gBAAgB,CAclB;AAED,wBAAgB,eAAe,CAC7B,EAAE,EAAE,WAAW,EACf,KAAK,EAAE,mBAAmB,EAC1B,aAAa,EAAE,MAAM,GACpB,MAAM,CAMR;AAED,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,KAAK,EAAE,WAAW,EAClB,SAAS,EAAE,QAAQ,EAAE,GACpB,IAAI,CAiBN;AAED,wBAAsB,gBAAgB,CACpC,EAAE,EAAE,WAAW,EACf,KAAK,EAAE,mBAAmB,EAC1B,SAAS,EAAE,QAAQ,EAAE,EACrB,QAAQ,EAAE,OAAO,EAAE,GAClB,OAAO,CAAC,IAAI,CAAC,CAyBf;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,EAAE,EAAE,WAAW,EACf,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,yBAAyB,GAAG,cAAc,EAAE,EACrD,MAAM,EAAE,aAAa,GACpB;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,EAAE,CAAA;CAAE,CAsBtC;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,KAAK,EAAE,WAAW,GACjB,IAAI,CAGN;AAED;;;;;GAKG;AACH,wBAAsB,qBAAqB,CACzC,EAAE,EAAE,WAAW,EACf,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GACjC,OAAO,CAAC,IAAI,CAAC,CAQf;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,aAAa,GAAG,SAAS,GAChC,gBAAgB,GAAG,SAAS,CAM9B;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,CACzC,EAAE,EAAE,WAAW,EACf,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,IAAI,CAAC,CAUf"}

package/dist/lib/tenant.js

@@ -1,4 +1,5 @@
 import { ConditionBuilder } from 'node-condition-builder';
+import { httpError } from './errors.js';
 function isIndirect(scope) {
     return 'through' in scope;
 }
@@ -39,9 +40,7 @@ export function injectTenantValue(record, scope, tenantIds) {
     const col = scope.column;
     if (col in record) {
         if (!tenantIds.includes(record[col])) {
-            const err = new Error('Access denied: tenant value does not match');
-            err.statusCode = 403;
-            throw err;
+            throw httpError(403, 'Access denied: tenant value does not match');
         }
         return;
     }
@@ -49,9 +48,7 @@ export function injectTenantValue(record, scope, tenantIds) {
         record[col] = tenantIds[0];
         return;
     }
-    const err = new Error('Ambiguous tenant: specify the tenant value');
-    err.statusCode = 400;
-    throw err;
+    throw httpError(400, 'Ambiguous tenant: specify the tenant value');
 }
 export async function validateTenantFK(db, scope, tenantIds, fkValues) {
     if (!fkValues.length)
@@ -71,9 +68,7 @@ export async function validateTenantFK(db, scope, tenantIds, fkValues) {
         `WHERE ${where}`;
     const result = await db.query(sql, values);
     if (result.rows.length > 0) {
-        const err = new Error('Access denied: records do not belong to tenant');
-        err.statusCode = 403;
-        throw err;
+        throw httpError(403, 'Access denied: records do not belong to tenant');
     }
 }
 /**
@@ -103,8 +98,61 @@ export function buildTenantDeleteWhere(db, tableName, pkCol, pkValue, tenant) {
     const values = cb.getValues();
     return { where, values };
 }
+/**
+ * Mutates `fields` in-place: removes the tenant column from a SET payload (direct scopes only).
+ * No-op for indirect or no scope.
+ */
 export function stripTenantColumn(fields, scope) {
     if (isIndirect(scope))
         return;
     delete fields[scope.column];
 }
+/**
+ * For insert/bulk-upsert: enforce tenant on records that are about to be written.
+ * For direct scopes, mutates each record in-place to inject/validate the tenant column.
+ * For indirect scopes, batch-validates the FK values against the tenant scope.
+ * Throws 400 (ambiguous tenant) or 403 (mismatch) on violation. No-op when `tenant` is undefined.
+ */
+export async function enforceTenantOnWrites(db, tenant, records) {
+    if (!tenant)
+        return;
+    if (isIndirect(tenant.scope)) {
+        const fkCol = tenant.scope.through.localField;
+        await validateTenantFK(db, tenant.scope, tenant.ids, records.map((r) => r[fkCol]));
+        return;
+    }
+    for (const r of records)
+        injectTenantValue(r, tenant.scope, tenant.ids);
+}
+/**
+ * For update: builds the optional `extraCondition` ConditionBuilder for direct tenants.
+ * Returns undefined for indirect or no-tenant scenarios — those are handled separately
+ * (indirect uses pre-check via `assertTenantOwnership`).
+ */
+export function buildTenantUpdateExtra(tenant) {
+    if (!tenant || isIndirect(tenant.scope))
+        return undefined;
+    const cb = new ConditionBuilder('AND');
+    if (tenant.ids.length === 1)
+        cb.isEqual(tenant.scope.column, tenant.ids[0]);
+    else
+        cb.isIn(tenant.scope.column, tenant.ids);
+    return cb;
+}
+/**
+ * For update with indirect tenant: pre-check ownership via `SELECT 1 ... INNER JOIN ... LIMIT 1`.
+ * Throws 404 if the record either does not exist or does not belong to the tenant.
+ * No-op for direct or no-tenant — those are enforced via `extraCondition` in the UPDATE itself.
+ */
+export async function assertTenantOwnership(db, tenant, tableName, pkCol, pkValue) {
+    if (!tenant || !isIndirect(tenant.scope))
+        return;
+    const cb = new ConditionBuilder('AND');
+    cb.isEqual(`${db.qi(tableName)}.${db.qi(pkCol)}`, pkValue);
+    cb.append(buildTenantCondition(db, tenant.scope, tenant.ids));
+    const sql = `SELECT 1 FROM ${db.qi(tableName)} ${buildTenantJoin(db, tenant.scope, tableName)} WHERE ${cb.build(1, db.ph)} LIMIT 1`;
+    const r = await db.query(sql, cb.getValues());
+    if (r.rows.length === 0) {
+        throw httpError(404, 'Record not found');
+    }
+}

package/dist/routes/auto/bulk-delete.routes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bulk-delete.routes.d.ts","sourceRoot":"","sources":["../../../src/routes/auto/bulk-delete.routes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAI/C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAE1D,wBAA8B,gBAAgB,CAC5C,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,IAAI,CAAC,CAyBf"}
+{"version":3,"file":"bulk-delete.routes.d.ts","sourceRoot":"","sources":["../../../src/routes/auto/bulk-delete.routes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAI/C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAE1D,wBAA8B,gBAAgB,CAC5C,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,IAAI,CAAC,CAiBf"}