@truto/ginger 2.0.1 → 2.1.0

package/dist/sql-builder.d.ts

@@ -1,5 +1,6 @@
 import { sql } from '@truto/sqlite-builder';
-import type { JoinDef, OrderBy } from './types.js';
+import { type ResolvedJoin } from './joins.js';
+import type { ExposeDef, JoinDef, OrderBy } from './types.js';
 /**
  * Coerce an untrusted value into a scalar that is safe to bind as a SQL
  * parameter, throwing on anything else.
@@ -12,25 +13,30 @@ import type { JoinDef, OrderBy } from './types.js';
  * unescaped — it is always emitted as a bound `?` placeholder instead.
  */
 export declare function toBindableValue(value: unknown): string | number | boolean | Date | null;
-/**
- * Build a SELECT query with joins and pagination.
- *
- * `joinColumnOverrides[joinName]` overrides the columns pulled from that
- * join's remote table for this query only (instead of using the join's
- * configured `remote.select`). The base service uses this to honour the
- * caller's `select: ['$alias.col', ...]` request.
- */
-export declare function buildSelect(table: string, options?: {
+export interface BuildSelectOptions {
     columns?: string[];
     where?: Record<string, unknown>;
+    /** @deprecated Use resolvedJoins instead. */
     joins?: Record<string, JoinDef>;
+    /** @deprecated Use resolvedJoins instead. */
     include?: Record<string, boolean>;
+    /** @deprecated Use resolvedJoins instead. */
     joinColumnOverrides?: Record<string, string[]>;
+    resolvedJoins?: ResolvedJoin[];
+    expose?: readonly ExposeDef[];
     orderBy?: OrderBy[];
     limit?: number;
     offset?: number;
     cursorConditions?: ReturnType<typeof sql>;
-}): ReturnType<typeof sql>;
+}
+/**
+ * Build a SELECT query with joins and pagination.
+ */
+export declare function buildSelect(table: string, options?: BuildSelectOptions): ReturnType<typeof sql>;
+/**
+ * Build a JOIN clause from the base table (legacy single-hop API).
+ */
+export declare function buildJoin(baseTable: string, joinDef: JoinDef): ReturnType<typeof sql>;
 /**
  * Build an INSERT query
  */
@@ -43,24 +49,29 @@ export declare function buildUpdate(table: string, data: Record<string, unknown>
  * Build a DELETE query
  */
 export declare function buildDelete(table: string, where: Record<string, unknown>): ReturnType<typeof sql>;
+export interface BuildCountOptions {
+    where?: Record<string, unknown>;
+    resolvedJoins?: ResolvedJoin[];
+    expose?: readonly ExposeDef[];
+    primaryKey?: string;
+}
 /**
- * Build a COUNT query
- */
-export declare function buildCount(table: string, where?: Record<string, unknown>): ReturnType<typeof sql>;
-/**
- * Build a SELECT query for a single record by primary key
+ * Build a COUNT query, optionally with the same join graph as list/get.
  */
-export declare function buildSelectById(table: string, primaryKey: string | string[], id: string | number | Record<string, unknown>, options?: {
+export declare function buildCount(table: string, whereOrOptions?: Record<string, unknown> | BuildCountOptions, legacyWhere?: Record<string, unknown>): ReturnType<typeof sql>;
+export interface BuildSelectByIdOptions {
     columns?: string[];
     joins?: Record<string, JoinDef>;
     include?: Record<string, boolean>;
     joinColumnOverrides?: Record<string, string[]>;
-    /**
-     * Optional row-level scoping filter, AND-combined with the primary-key
-     * match (used to enforce ownership / tenant isolation).
-     */
+    resolvedJoins?: ResolvedJoin[];
+    expose?: readonly ExposeDef[];
     where?: Record<string, unknown>;
-}): ReturnType<typeof sql>;
+}
+/**
+ * Build a SELECT query for a single record by primary key
+ */
+export declare function buildSelectById(table: string, primaryKey: string | string[], id: string | number | Record<string, unknown>, options?: BuildSelectByIdOptions): ReturnType<typeof sql>;
 /**
  * Escape a column name using sql.ident
  */

package/dist/sql-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sql-builder.d.ts","sourceRoot":"","sources":["../src/sql-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,GAAG,EAAE,MAAM,uBAAuB,CAAA;AAE1D,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAElD;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAC7B,KAAK,EAAE,OAAO,GACb,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,IAAI,CAWzC;AAED;;;;;;;GAOG;AACH,wBAAgB,WAAW,CACzB,KAAK,EAAE,MAAM,EACb,OAAO,GAAE;IACP,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACjC,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;IAC9C,OAAO,CAAC,EAAE,OAAO,EAAE,CAAA;IACnB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,gBAAgB,CAAC,EAAE,UAAU,CAAC,OAAO,GAAG,CAAC,CAAA;CACrC,GACL,UAAU,CAAC,OAAO,GAAG,CAAC,CA8GxB;AAqCD;;GAEG;AACH,wBAAgB,WAAW,CACzB,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,UAAU,CAAC,OAAO,GAAG,CAAC,CAyBxB;AAED;;GAEG;AACH,wBAAgB,WAAW,CACzB,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC7B,UAAU,CAAC,OAAO,GAAG,CAAC,CA2BxB;AAED;;GAEG;AACH,wBAAgB,WAAW,CACzB,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC7B,UAAU,CAAC,OAAO,GAAG,CAAC,CAgBxB;AAED;;GAEG;AACH,wBAAgB,UAAU,CACxB,KAAK,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,UAAU,CAAC,OAAO,GAAG,CAAC,CAgBxB;AAED;;GAEG;AACH,wBAAgB,eAAe,CAC7B,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,EAC7B,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7C,OAAO,GAAE;IACP,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACjC,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;IAC9C;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAC3B,GACL,UAAU,CAAC,OAAO,GAAG,CAAC,CA4CxB;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEjD"}
+{"version":3,"file":"sql-builder.d.ts","sourceRoot":"","sources":["../src/sql-builder.ts"],"names":[],"mappings":"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"}

package/dist/sql-builder.js

@@ -1,5 +1,6 @@
 import { compileFilter, sql } from '@truto/sqlite-builder';
 import { SqlBuilderError } from './errors.js';
+import { buildExposeSelectColumns, buildJoinFragments, buildJoinSelectColumns, isUnsafeObjectKey, legacyJoinColumnAlias, resolveOrderByColumn, translateWhereForJoins, } from './joins.js';
 /**
  * Coerce an untrusted value into a scalar that is safe to bind as a SQL
  * parameter, throwing on anything else.
@@ -24,41 +25,44 @@ export function toBindableValue(value) {
 }
 /**
  * Build a SELECT query with joins and pagination.
- *
- * `joinColumnOverrides[joinName]` overrides the columns pulled from that
- * join's remote table for this query only (instead of using the join's
- * configured `remote.select`). The base service uses this to honour the
- * caller's `select: ['$alias.col', ...]` request.
  */
 export function buildSelect(table, options = {}) {
     try {
-        // Build column list
         const selectColumns = [];
         if (options.columns && options.columns.length > 0) {
-            selectColumns.push(...options.columns.map((col) => 
-            // A bare '*' must be emitted as `"table".*`, not run through
-            // sql.ident('table.*') (which rejects the wildcard identifier).
-            col === '*'
+            selectColumns.push(...options.columns.map((col) => col === '*'
                 ? sql `${sql.ident(table)}.*`
                 : sql.ident(`${table}.${col}`)));
         }
         else {
             selectColumns.push(sql `${sql.ident(table)}.*`);
         }
-        if (options.joins && options.include) {
+        const resolved = options.resolvedJoins ?? [];
+        if (resolved.length > 0) {
+            selectColumns.push(...buildJoinSelectColumns(resolved));
+        }
+        else if (options.joins && options.include) {
+            // Legacy flat join path (backward compat)
             for (const [joinName, joinDef] of Object.entries(options.joins)) {
                 if (options.include[joinName]) {
                     const joinAlias = joinDef.remote.alias || joinName;
                     const cols = options.joinColumnOverrides?.[joinName] ?? joinDef.remote.select;
-                    const joinColumns = cols.map((col) => sql `${sql.ident(`${joinDef.remote.table}.${col}`)} as ${sql.ident(`${joinAlias}_${col}`)}`);
+                    const joinColumns = cols.map((col) => sql `${sql.ident(`${joinDef.remote.table}.${col}`)} as ${sql.ident(legacyJoinColumnAlias(joinAlias, col))}`);
                     selectColumns.push(...joinColumns);
                 }
             }
         }
-        // Start building the query using sql.join for the column fragments
+        if (options.expose && options.expose.length > 0) {
+            selectColumns.push(...buildExposeSelectColumns(options.expose, resolved, table));
+        }
         let query = sql `SELECT ${sql.join(selectColumns, ', ')} FROM ${sql.ident(table)}`;
-        // Add joins
-        if (options.joins && options.include) {
+        if (resolved.length > 0) {
+            const joinFragments = buildJoinFragments(resolved);
+            if (joinFragments.length > 0) {
+                query = sql.join([query, ...joinFragments], ' ');
+            }
+        }
+        else if (options.joins && options.include) {
             const joinFragments = [];
             for (const [joinName, joinDef] of Object.entries(options.joins)) {
                 if (options.include[joinName]) {
@@ -69,28 +73,25 @@ export function buildSelect(table, options = {}) {
                 query = sql.join([query, ...joinFragments], ' ');
             }
         }
-        // Build final query parts
         const finalParts = [query];
-        // Build WHERE conditions
         const whereFragments = [];
-        // Regular WHERE conditions
         if (options.where && Object.keys(options.where).length > 0) {
-            const whereFilter = compileFilter(options.where);
-            whereFragments.push(whereFilter);
+            const translated = resolved.length > 0
+                ? translateWhereForJoins(options.where, table, resolved, options.expose)
+                : options.where;
+            whereFragments.push(compileFilter(translated));
         }
-        // Cursor conditions
         if (options.cursorConditions && options.cursorConditions.text) {
             whereFragments.push(options.cursorConditions);
         }
-        // Add WHERE clause if needed
         if (whereFragments.length > 0) {
             const whereClause = sql.join(whereFragments, ' AND ');
             finalParts.push(sql `WHERE ${whereClause}`);
         }
-        // Add ORDER BY
         if (options.orderBy && options.orderBy.length > 0) {
             const orderFragments = options.orderBy.map((order) => {
-                const col = sql.ident(`${table}.${order.column}`);
+                const colRef = resolveOrderByColumn(order.column, table, resolved, options.expose);
+                const col = sql.ident(colRef);
                 switch (order.direction.toLowerCase()) {
                     case 'asc':
                         return sql `${col} ASC`;
@@ -102,15 +103,12 @@ export function buildSelect(table, options = {}) {
             });
             finalParts.push(sql `ORDER BY ${sql.join(orderFragments, ', ')}`);
         }
-        // Add LIMIT
         if (options.limit) {
             finalParts.push(sql `LIMIT ${options.limit}`);
         }
-        // Add OFFSET
         if (options.offset) {
             finalParts.push(sql `OFFSET ${options.offset}`);
         }
-        // If no WHERE conditions, just join all parts
         return sql.join(finalParts, ' ');
     }
     catch (error) {
@@ -118,13 +116,18 @@ export function buildSelect(table, options = {}) {
     }
 }
 /**
- * Build a JOIN clause
+ * Build a JOIN clause from the base table (legacy single-hop API).
  */
-function buildJoin(baseTable, joinDef) {
-    const { remote, localPk, through } = joinDef;
+export function buildJoin(baseTable, joinDef) {
+    const localCol = joinDef.localColumn ?? joinDef.localPk;
+    if (!localCol) {
+        throw new SqlBuilderError('JoinDef requires localColumn or localPk', {
+            joinDef,
+        });
+    }
+    const { remote, through } = joinDef;
     if (through) {
-        // Many-to-many join through junction table
-        const throughJoin = sql `LEFT JOIN ${sql.ident(through.table)} ON ${sql.ident(`${baseTable}.${localPk}`)} = ${sql.ident(`${through.table}.${through.from}`)}`;
+        const throughJoin = sql `LEFT JOIN ${sql.ident(through.table)} ON ${sql.ident(`${baseTable}.${localCol}`)} = ${sql.ident(`${through.table}.${through.from}`)}`;
         const remoteJoin = sql `LEFT JOIN ${sql.ident(remote.table)} ON ${sql.ident(`${through.table}.${through.to}`)} = ${sql.ident(`${remote.table}.${remote.pk}`)}`;
         const joinFragments = [throughJoin, remoteJoin];
         if (joinDef.where && Object.keys(joinDef.where).length > 0) {
@@ -132,16 +135,13 @@ function buildJoin(baseTable, joinDef) {
         }
         return sql.join(joinFragments, ' ');
     }
-    else {
-        // Direct join
-        const joinFragments = [
-            sql `LEFT JOIN ${sql.ident(remote.table)} ON ${sql.ident(`${baseTable}.${localPk}`)} = ${sql.ident(`${remote.table}.${remote.pk}`)}`,
-        ];
-        if (joinDef.where && Object.keys(joinDef.where).length > 0) {
-            joinFragments.push(sql `AND ${compileFilter(joinDef.where)}`);
-        }
-        return sql.join(joinFragments, ' ');
+    const joinFragments = [
+        sql `LEFT JOIN ${sql.ident(remote.table)} ON ${sql.ident(`${baseTable}.${localCol}`)} = ${sql.ident(`${remote.table}.${remote.pk}`)}`,
+    ];
+    if (joinDef.where && Object.keys(joinDef.where).length > 0) {
+        joinFragments.push(sql `AND ${compileFilter(joinDef.where)}`);
     }
+    return sql.join(joinFragments, ' ');
 }
 /**
  * Build an INSERT query
@@ -150,10 +150,6 @@ export function buildInsert(table, data) {
     try {
         const columns = Object.keys(data);
         const values = Object.values(data);
-        // Create individual placeholders for the VALUES clause. `toBindableValue`
-        // forces each value to be bound as a parameter and throws on non-scalar
-        // objects — preventing a `{ text, values }`-shaped value from being
-        // spliced in as a raw SQL fragment.
         const placeholderFragments = values.map((value) => sql `${toBindableValue(value)}`);
         const query = sql `
       INSERT INTO ${sql.ident(table)} (${sql.ident(columns)}) 
@@ -170,12 +166,7 @@ export function buildInsert(table, data) {
  */
 export function buildUpdate(table, data, where) {
     try {
-        // Build SET clauses using sql fragments. `toBindableValue` forces each
-        // value to be bound as a parameter (and rejects non-scalar objects),
-        // preventing a `{ text, values }`-shaped value from being spliced in as
-        // raw SQL.
         const setFragments = Object.entries(data).map(([column, value]) => sql `${sql.ident(column)} = ${toBindableValue(value)}`);
-        // Build WHERE clause
         const whereFilter = compileFilter(where);
         const queryParts = [
             sql `UPDATE ${sql.ident(table)}`,
@@ -205,19 +196,50 @@ export function buildDelete(table, where) {
     }
 }
 /**
- * Build a COUNT query
+ * Build a COUNT query, optionally with the same join graph as list/get.
  */
-export function buildCount(table, where) {
+export function buildCount(table, whereOrOptions, legacyWhere) {
     try {
-        const queryParts = [sql `SELECT COUNT(*) as count FROM ${sql.ident(table)}`];
+        let where;
+        let resolved = [];
+        let expose;
+        let primaryKey = 'id';
+        if (whereOrOptions &&
+            ('resolvedJoins' in whereOrOptions ||
+                'expose' in whereOrOptions ||
+                'primaryKey' in whereOrOptions)) {
+            const opts = whereOrOptions;
+            where = opts.where;
+            resolved = opts.resolvedJoins ?? [];
+            expose = opts.expose;
+            primaryKey = opts.primaryKey ?? 'id';
+        }
+        else {
+            where = whereOrOptions ?? legacyWhere;
+        }
+        const countExpr = resolved.length > 0
+            ? sql `COUNT(DISTINCT ${sql.ident(`${table}.${primaryKey}`)})`
+            : sql `COUNT(*)`;
+        const queryParts = [
+            sql `SELECT ${countExpr} as count FROM ${sql.ident(table)}`,
+        ];
+        if (resolved.length > 0) {
+            const joinFragments = buildJoinFragments(resolved);
+            if (joinFragments.length > 0) {
+                queryParts.push(sql.join(joinFragments, ' '));
+            }
+        }
         if (where && Object.keys(where).length > 0) {
-            const whereFilter = compileFilter(where);
+            const translated = resolved.length > 0
+                ? translateWhereForJoins(where, table, resolved, expose)
+                : where;
+            const whereFilter = compileFilter(translated);
             queryParts.push(sql `WHERE ${whereFilter}`);
         }
         return sql.join(queryParts, ' ');
     }
     catch (error) {
-        throw new SqlBuilderError(`Failed to build COUNT query: ${error instanceof Error ? error.message : 'Unknown error'}`, { table, where, error });
+        throw new SqlBuilderError(`Failed to build COUNT query: ${error instanceof Error ? error.message : 'Unknown error'}`, { table, whereOrOptions, error });
     }
 }
 /**
@@ -226,36 +248,50 @@ export function buildCount(table, where) {
 export function buildSelectById(table, primaryKey, id, options = {}) {
     const { where: scope, ...restOptions } = options;
     const where = {};
-    // Check if there are active JOINs that could cause column ambiguity
-    const hasActiveJoins = options.joins &&
-        options.include &&
-        Object.keys(options.include).some((key) => options.include[key]);
-    // The scope filter columns live on the base table, so when joins are active
-    // they must be qualified under `$table` (same as the PK) to avoid ambiguity.
+    const hasActiveJoins = (options.resolvedJoins && options.resolvedJoins.length > 0) ||
+        (options.joins &&
+            options.include &&
+            Object.keys(options.include).some((key) => options.include[key]));
     const hasScope = scope && Object.keys(scope).length > 0;
+    let baseScope = {};
+    let joinScope = {};
+    if (hasScope) {
+        const translated = hasActiveJoins
+            ? translateWhereForJoins(scope, table, options.resolvedJoins ?? [], options.expose)
+            : { ...scope };
+        for (const [key, value] of Object.entries(translated)) {
+            if (key.startsWith('$')) {
+                if (!isUnsafeObjectKey(key.slice(1)))
+                    joinScope[key] = value;
+            }
+            else if (!isUnsafeObjectKey(key)) {
+                baseScope[key] = value;
+            }
+        }
+    }
     if (Array.isArray(primaryKey)) {
         if (typeof id !== 'object' || id === null || Array.isArray(id)) {
             throw new SqlBuilderError('Composite primary key requires an object with key-value pairs', { primaryKey, id });
         }
         if (hasActiveJoins) {
-            // Use qualified table syntax to avoid column ambiguity
-            where[`$${table}`] = { ...id, ...(hasScope ? scope : {}) };
+            where[`$${table}`] = { ...id, ...baseScope };
+            Object.assign(where, joinScope);
         }
         else {
             Object.assign(where, id);
             if (hasScope)
-                Object.assign(where, scope);
+                Object.assign(where, baseScope);
         }
     }
     else {
         if (hasActiveJoins) {
-            // Use qualified table syntax to avoid column ambiguity
-            where[`$${table}`] = { [primaryKey]: id, ...(hasScope ? scope : {}) };
+            where[`$${table}`] = { [primaryKey]: id, ...baseScope };
+            Object.assign(where, joinScope);
         }
         else {
             where[primaryKey] = id;
             if (hasScope)
-                Object.assign(where, scope);
+                Object.assign(where, baseScope);
         }
     }
     return buildSelect(table, {

package/dist/sql-builder.js.map

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

package/dist/types.d.ts

@@ -153,7 +153,7 @@ export interface ListParams<TSelect extends readonly SelectField[] | undefined =
     limit?: number;
     orderBy?: OrderBy[];
     where?: Record<string, unknown>;
-    include?: Record<string, boolean>;
+    include?: IncludeMap;
     includeSecrets?: boolean;
     select?: TSelect;
 }
@@ -170,12 +170,14 @@ export interface ListResult<T> {
  */
 export interface CountParams {
     where?: Record<string, unknown>;
+    /** Join graph to use when filtering on joined / exposed columns. */
+    include?: IncludeMap;
 }
 /**
  * Get parameters
  */
 export interface GetParams<TSelect extends readonly SelectField[] | undefined = undefined> {
-    include?: Record<string, boolean>;
+    include?: IncludeMap;
     includeSecrets?: boolean;
     select?: TSelect;
     /**
@@ -190,7 +192,7 @@ export interface GetParams<TSelect extends readonly SelectField[] | undefined =
  * Create parameters
  */
 export interface CreateParams<TSelect extends readonly SelectField[] | undefined = undefined> {
-    include?: Record<string, boolean>;
+    include?: IncludeMap;
     includeSecrets?: boolean;
     select?: TSelect;
 }
@@ -198,7 +200,7 @@ export interface CreateParams<TSelect extends readonly SelectField[] | undefined
  * Update parameters
  */
 export interface UpdateParams<TSelect extends readonly SelectField[] | undefined = undefined> {
-    include?: Record<string, boolean>;
+    include?: IncludeMap;
     includeSecrets?: boolean;
     select?: TSelect;
     /**
@@ -213,7 +215,7 @@ export interface UpdateParams<TSelect extends readonly SelectField[] | undefined
  * Delete parameters
  */
 export interface DeleteParams {
-    include?: Record<string, boolean>;
+    include?: IncludeMap;
     /**
      * Additional row-level scoping filter, AND-combined with the primary-key
      * match. Use this (typically from a `before` hook) to enforce ownership /
@@ -238,12 +240,43 @@ export interface MethodOptions {
  * Join definition kinds
  */
 export type JoinKind = 'one' | 'many';
+/**
+ * Top-level column projection from a joined column.
+ *
+ * @example `{ from: '$environment_integration.environment_id', as: 'environment_id' }`
+ */
+export interface ExposeDef {
+    /** Qualified join path, e.g. `$environment_integration.environment_id`. */
+    from: string;
+    /** Top-level alias on the returned row. */
+    as: string;
+}
+/**
+ * Include spec for a single join. `true` includes default columns; an object
+ * may set `select` and/or enable nested joins by key.
+ */
+export type IncludeSpec = boolean | IncludeNode;
+export interface IncludeNode {
+    select?: string[];
+    [nestedJoin: string]: boolean | IncludeSpec | string[] | undefined;
+}
+/** Map of join names to include specs (supports nested includes). */
+export type IncludeMap = Record<string, IncludeSpec>;
 /**
  * Join definition
  */
 export interface JoinDef {
     kind: JoinKind;
-    localPk: string;
+    /**
+     * @deprecated Prefer `localColumn` for FK joins; kept for backward compat.
+     * Parent-table column used in the ON clause when `localColumn` is omitted.
+     */
+    localPk?: string;
+    /**
+     * Local FK column on the parent table (base table or parent join's remote
+     * table). Falls back to `localPk` when omitted.
+     */
+    localColumn?: string;
     through?: {
         table: string;
         from: string;
@@ -257,6 +290,8 @@ export interface JoinDef {
     };
     where?: Record<string, unknown>;
     schema: z.ZodTypeAny;
+    /** Nested joins reachable from this join's remote table. */
+    joins?: Record<string, JoinDef>;
 }
 /**
  * Secret field definition.
@@ -331,6 +366,11 @@ export interface ServiceOptions<TRow extends z.ZodTypeAny, TCreate extends z.Zod
     createSchema: TCreate;
     updateSchema: TUpdate;
     joins?: TJoins;
+    /**
+     * Project joined columns onto the top-level row, e.g.
+     * `{ from: '$environment_integration.environment_id', as: 'environment_id' }`.
+     */
+    expose?: ExposeDef[];
     secrets?: TSecrets;
     timestamps?: TimestampConfig;
     hooks?: Partial<HookMap<BaseCtx>>;
@@ -343,8 +383,17 @@ export interface ServiceOptions<TRow extends z.ZodTypeAny, TCreate extends z.Zod
 /**
  * Compute join types based on include parameter
  */
-export type ComputeJoins<TJoins extends Record<string, JoinDef>, TInclude extends Record<string, boolean> | undefined> = TInclude extends Record<string, boolean> ? {
-    [K in keyof TInclude & keyof TJoins]: TInclude[K] extends true ? TJoins[K]['kind'] extends 'one' ? z.infer<TJoins[K]['schema']> | null : z.infer<TJoins[K]['schema']>[] : never;
+type IncludeEnabled<T> = T extends true ? true : T extends Record<string, unknown> ? true : false;
+type JoinResultType<TJoin extends JoinDef> = TJoin['kind'] extends 'one' ? z.infer<TJoin['schema']> | null : z.infer<TJoin['schema']>[];
+type ComputeNestedJoins<TNested extends Record<string, JoinDef> | undefined, TInclude extends IncludeNode | undefined> = TNested extends Record<string, JoinDef> ? TInclude extends IncludeNode ? {
+    [K in keyof TNested & keyof TInclude]: K extends 'select' ? never : IncludeEnabled<TInclude[K]> extends true ? TNested[K] extends JoinDef ? JoinResultType<TNested[K]> & (TNested[K]['joins'] extends Record<string, JoinDef> ? ComputeNestedJoins<TNested[K]['joins'], TInclude[K] extends IncludeNode ? TInclude[K] : undefined> : Record<string, never>) : never : never;
+} : Record<string, never> : Record<string, never>;
+export type ComputeJoins<TJoins extends Record<string, JoinDef>, TInclude extends IncludeMap | undefined> = TInclude extends IncludeMap ? {
+    [K in keyof TInclude & keyof TJoins]: IncludeEnabled<TInclude[K]> extends true ? TJoins[K] extends JoinDef ? JoinResultType<TJoins[K]> & ComputeNestedJoins<TJoins[K]['joins'], TInclude[K] extends IncludeNode ? TInclude[K] : undefined> : never : never;
+} : Record<string, never>;
+/** Merge exposed column types onto a row type. */
+export type ComputeExposed<TExpose extends readonly ExposeDef[] | undefined> = TExpose extends readonly ExposeDef[] ? {
+    [E in TExpose[number] as E['as']]: unknown;
 } : Record<string, never>;
 /**
  * Extract row type from service
@@ -358,4 +407,5 @@ export type ServiceCreate<T> = T extends BaseService<any, infer TCreate, any, an
  * Extract update type from service
  */
 export type ServiceUpdate<T> = T extends BaseService<any, any, infer TUpdate, any, any> ? z.infer<TUpdate> : never;
+export {};
 //# sourceMappingURL=types.d.ts.map