orchid-orm 1.70.0 → 1.71.0

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Adapter, AfterCommitStandaloneHook, AfterHook, Column, ColumnSchemaConfig, ColumnsShape, ComputedColumnsFromOptions, ComputedOptionsConfig, ComputedOptionsFactory, CreateData, CreateManyMethodsNames, CreateMethodsNames, DbSharedOptions, DbSqlMethod, DbTableOptionScopes, DefaultColumnTypes, DefaultSchemaConfig, DeleteMethodsNames, EmptyObject, FromArg, FromResult, IsQuery, IsolationLevel, JoinQueryMethod, MapTableScopesOption, MaybeArray, MergeQuery, QueryAfterHook, QueryBeforeActionHook, QueryBeforeHook, QueryData, QueryHasWhere, QueryManyTake, QueryManyTakeOptional, QueryOrExpression, QueryReturnType, QuerySchema, QueryScopes, RecordUnknown, RelationConfigBase, SelectableFromShape, ShallowSimplify, ShapeColumnPrimaryKeys, ShapeUniqueColumns, StorageOptions, TableData, TableDataFn, TableDataItem, TableDataItemsUniqueColumnTuples, TableDataItemsUniqueColumns, TableDataItemsUniqueConstraints, TableRlsConfig, TransactionOptions, UniqueConstraints, UpdateData, WhereArg } from "pqb/internal";
+import { Adapter, AfterCommitStandaloneHook, AfterHook, Column, ColumnSchemaConfig, ColumnsShape, ComputedColumnsFromOptions, ComputedOptionsConfig, ComputedOptionsFactory, CreateData, CreateManyMethodsNames, CreateMethodsNames, DbSharedOptions, DbSqlMethod, DbTableOptionScopes, DefaultColumnTypes, DefaultSchemaConfig, DeleteMethodsNames, EmptyObject, FromArg, FromResult, Grant, IsQuery, IsolationLevel, JoinQueryMethod, MapTableScopesOption, MaybeArray, MergeQuery, QueryAfterHook, QueryBeforeActionHook, QueryBeforeHook, QueryData, QueryHasWhere, QueryManyTake, QueryManyTakeOptional, QueryOrExpression, QueryReturnType, QuerySchema, QueryScopes, RecordUnknown, RelationConfigBase, Rls, SelectableFromShape, ShallowSimplify, ShapeColumnPrimaryKeys, ShapeUniqueColumns, StorageOptions, TableData, TableDataFn, TableDataItem, TableDataItemsUniqueColumnTuples, TableDataItemsUniqueColumns, TableDataItemsUniqueConstraints, TransactionOptions, UniqueConstraints, UpdateData, WhereArg } from "pqb/internal";
 import { Db, Query } from "pqb";
 export * from "pqb";
 interface RelationRefsOptions<Column extends PropertyKey = string, Shape extends Column.Shape.QueryInit = Column.Shape.QueryInit> {
@@ -175,11 +175,13 @@ interface FromQuery extends Query {
   returnType: 'all';
 }
 interface OrchidORMQueryHelper<Q extends Query, Args extends unknown[], Result> {
-  <T extends Q>(q: T, ...args: Args): Result;
+  <T extends Query>(q: T & {
+    table: Q['table'];
+  }, ...args: Args): Result extends Query ? MergeQuery<T, Result> : Result;
   isQueryHelper: true;
   table: Q['table'];
-  args: Args;
-  result: Result;
+  __args: Args;
+  __result: Result;
 }
 interface OrchidORMTableHelper<T extends Query> {
   makeHelper<Args extends unknown[], Result>(fn: (q: T, ...args: Args) => Result): OrchidORMQueryHelper<T, Args, Result>;
@@ -194,7 +196,11 @@ type OrchidORM<T extends TableClasses = TableClasses> = OrchidORMDbTables<T> & O
 /**
  * Identity helper for table row-level security configuration.
  */
-declare const defineRls: <T extends TableRlsConfig>(rls: T) => T;
+declare const defineRls: <T extends Rls.TableConfig>(rls: T) => T;
+/**
+ * Identity helper for table-local grant configuration.
+ */
+declare const setGrants: <const T extends readonly Grant.TableClassGrant[]>(grants: T) => T;
 interface OrchidORMMethods {
   /**
    * @see import('pqb').QueryTransaction.prototype.transaction
@@ -499,7 +505,11 @@ interface ORMTableInput {
   scopes?: RecordUnknown;
   readonly softDelete?: true | string;
   comment?: string;
-  rls?: TableRlsConfig;
+  rls?: Rls.TableConfig;
+  /**
+   * Table-local grants used by migration generation.
+   */
+  grants?: readonly Grant.TableClassGrant[];
   autoForeignKeys?: TableData.References.BaseOptions | boolean;
 }
 type Queryable<T extends ORMTableInput> = ShallowSimplify<{ [K in keyof T['columns']['shape']]?: T['columns']['shape'][K]['queryType'] }>;
@@ -773,4 +783,4 @@ declare const createRepo: <T extends Query, Methods extends MethodsBase<T>>(tabl
   table: T["table"];
   shape: T["shape"];
 }>(q: Q) => Query & Q & MapMethods<T, Methods>) & T, Methods>;
-export { BaseTableClass, BaseTableInstance, DefaultSelect, FromQuery, Insertable, MapMethods, MapQueryMethods, MethodsBase, ORMTableInput, OrchidORM, OrchidORMDbTables, OrchidORMTableHelper, OrchidORMTables, OrchidOrmParam, Queryable, Repo, Selectable, SetColumnsResult, Table, TableClass, TableClasses, TableInfo, TableToDb, Updatable, bundleOrchidORMTables, createBaseTable, createRepo, defineRls, makeOrchidOrmDbWithAdapter, orchidORMWithAdapter };
+export { BaseTableClass, BaseTableInstance, DefaultSelect, FromQuery, Insertable, MapMethods, MapQueryMethods, MethodsBase, ORMTableInput, OrchidORM, OrchidORMDbTables, OrchidORMTableHelper, OrchidORMTables, OrchidOrmParam, Queryable, Repo, Selectable, SetColumnsResult, Table, TableClass, TableClasses, TableInfo, TableToDb, Updatable, bundleOrchidORMTables, createBaseTable, createRepo, defineRls, makeOrchidOrmDbWithAdapter, orchidORMWithAdapter, setGrants };

package/dist/index.js

@@ -1374,6 +1374,10 @@ function afterCommit(hook) {
 * Identity helper for table row-level security configuration.
 */
 const defineRls = (rls) => rls;
+/**
+* Identity helper for table-local grant configuration.
+*/
+const setGrants = (grants) => grants;
 const orchidORMBundleMetadataKey = Symbol("orchidORMBundleMetadataKey");
 const assignTablesToOrm = (tables, result, adapter, qb, asyncStorage, commonOptions, schema) => {
 	const tableInstances = {};
@@ -1406,6 +1410,7 @@ const assignTablesToOrm = (tables, result, adapter, qb, asyncStorage, commonOpti
 		dbTable.filePath = table.filePath;
 		dbTable.name = table.constructor.name;
 		dbTable.internal.tableRls = table.rls;
+		dbTable.internal.tableGrants = table.grants;
 		result[key] = dbTable;
 	}
 	applyRelations(qb, tableInstances, result, schema);
@@ -1528,6 +1533,7 @@ exports.createRepo = createRepo;
 exports.defineRls = defineRls;
 exports.makeOrchidOrmDbWithAdapter = makeOrchidOrmDbWithAdapter;
 exports.orchidORMWithAdapter = orchidORMWithAdapter;
+exports.setGrants = setGrants;
 Object.keys(pqb).forEach(function(k) {
 	if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
 		enumerable: true,