orchid-orm 1.68.3 → 1.68.5

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, 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, 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 { Db, Query } from "pqb";
 export * from "pqb";
 interface RelationRefsOptions<Column extends PropertyKey = string, Shape extends Column.Shape.QueryInit = Column.Shape.QueryInit> {
@@ -28,7 +28,7 @@ interface HasOneInfo<T extends RelationConfigSelf, Name extends string, Rel exte
   query: Q;
   params: HasOneParams<T, Rel['options']>;
   maybeSingle: T['relations'][Name]['options']['required'] extends true ? QueryManyTake<Q> : QueryManyTakeOptional<Q>;
-  columnsForCreate: never;
+  omitForeignKeyInCreate: never;
   optionalDataForCreate: T['relations'][Name]['options'] extends RelationThroughOptions ? EmptyObject : { [P in Name]?: RelationToOneDataForCreate<{
     nestedCreateQuery: CreateData<Q>;
     table: Q;
@@ -68,7 +68,7 @@ interface HasManyInfo<T extends RelationConfigSelf, Name extends string, Rel ext
   query: Q;
   params: HasOneParams<T, Rel['options']>;
   maybeSingle: Q;
-  columnsForCreate: never;
+  omitForeignKeyInCreate: never;
   optionalDataForCreate: { [P in Name]?: T['relations'][Name]['options'] extends RelationThroughOptions ? EmptyObject : {
     create?: CreateData<Q>[];
     connect?: WhereArg<Q>[];
@@ -122,8 +122,11 @@ interface BelongsToInfo<T extends RelationConfigSelf, Name extends string, FK ex
   query: Q;
   params: BelongsToParams<T, FK>;
   maybeSingle: Required extends true ? QueryManyTake<Q> : QueryManyTakeOptional<Q>;
-  columnsForCreate: FK;
-  dataForCreate: { [Key in Name]?: RelationToOneDataForCreateSameQuery<Q> };
+  omitForeignKeyInCreate: FK;
+  dataForCreate: {
+    columns: FK;
+    nested: Required extends true ? { [Key in Name]: RelationToOneDataForCreateSameQuery<Q> } : { [Key in Name]?: RelationToOneDataForCreateSameQuery<Q> };
+  };
   optionalDataForCreate: EmptyObject;
   dataForUpdate: {
     disconnect: boolean;
@@ -174,6 +177,10 @@ interface FromQuery extends Query {
 type OrchidORM<T extends TableClasses = TableClasses> = { [K in keyof T]: T[K] extends {
   new (): infer R extends ORMTableInput;
 } ? TableToDb<R> : never } & OrchidORMMethods;
+/**
+ * Identity helper for table row-level security configuration.
+ */
+declare const defineRls: <T extends TableRlsConfig>(rls: T) => T;
 interface OrchidORMMethods {
   /**
    * @see import('pqb').QueryTransaction.prototype.transaction
@@ -358,7 +365,7 @@ interface HasAndBelongsToManyInfo<T extends RelationConfigSelf, Name extends str
   query: Q;
   params: HasAndBelongsToManyParams<T, FK>;
   maybeSingle: Q;
-  columnsForCreate: never;
+  omitForeignKeyInCreate: never;
   optionalDataForCreate: { [P in Name]?: {
     create?: CreateData<Q>[];
     connect?: WhereArg<Q>[];
@@ -479,6 +486,7 @@ interface ORMTableInput {
   scopes?: RecordUnknown;
   readonly softDelete?: true | string;
   comment?: string;
+  rls?: TableRlsConfig;
   autoForeignKeys?: TableData.References.BaseOptions | boolean;
 }
 type Queryable<T extends ORMTableInput> = ShallowSimplify<{ [K in keyof T['columns']['shape']]?: T['columns']['shape'][K]['queryType'] }>;
@@ -752,4 +760,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, OrchidOrmParam, Queryable, Repo, Selectable, SetColumnsResult, Table, TableClass, TableClasses, TableInfo, TableToDb, Updatable, createBaseTable, createRepo, orchidORMWithAdapter };
+export { BaseTableClass, BaseTableInstance, DefaultSelect, FromQuery, Insertable, MapMethods, MapQueryMethods, MethodsBase, ORMTableInput, OrchidORM, OrchidOrmParam, Queryable, Repo, Selectable, SetColumnsResult, Table, TableClass, TableClasses, TableInfo, TableToDb, Updatable, createBaseTable, createRepo, defineRls, orchidORMWithAdapter };

package/dist/index.js

@@ -1371,6 +1371,10 @@ function isInTransaction() {
 function afterCommit(hook) {
 	this.$qb.afterCommit(hook);
 }
+/**
+* Identity helper for table row-level security configuration.
+*/
+const defineRls = (rls) => rls;
 const orchidORMWithAdapter = ({ log, logger, autoPreparedStatements, noPrimaryKey = "error", schema, ...options }, tables) => {
 	const commonOptions = {
 		log,
@@ -1390,6 +1394,7 @@ const orchidORMWithAdapter = ({ log, logger, autoPreparedStatements, noPrimaryKe
 		asyncStorage = new node_async_hooks.AsyncLocalStorage();
 		qb = (0, pqb_internal._initQueryBuilder)(adapter, (0, pqb_internal.makeColumnTypes)(pqb_internal.defaultSchemaConfig), asyncStorage, commonOptions, options);
 	}
+	qb.internal.rls = options.rls;
 	const result = {
 		$transaction: transaction,
 		$ensureTransaction: ensureTransaction,
@@ -1432,6 +1437,7 @@ const orchidORMWithAdapter = ({ log, logger, autoPreparedStatements, noPrimaryKe
 		dbTable.db = result;
 		dbTable.filePath = table.filePath;
 		dbTable.name = table.constructor.name;
+		dbTable.internal.tableRls = table.rls;
 		result[key] = dbTable;
 	}
 	applyRelations(qb, tableInstances, result, schema);
@@ -1476,6 +1482,7 @@ const createRepo = (table, methods) => {
 };
 exports.createBaseTable = createBaseTable;
 exports.createRepo = createRepo;
+exports.defineRls = defineRls;
 exports.orchidORMWithAdapter = orchidORMWithAdapter;
 Object.keys(pqb).forEach(function(k) {
 	if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {