orchid-orm 1.18.2 → 1.19.0

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Query, QueryWithTable, SetQueryTableAlias, RelationJoinQuery, WhereArg, UpdateData, CreateData, AddQueryDefaults, Db, IsolationLevel, TransactionOptions, Adapter, FromArgs, FromResult, AdapterOptions, QueryLogOptions, NoPrimaryKeyOption, RelationQuery, RelationConfigBase, RelationQueryBase, ComputedColumnsBase, QueryData, QueryBase, DbTableOptionScopes, DefaultColumnTypes, QueryBeforeHook, QueryAfterHook, AfterHook, WhereResult, MergeQuery, SetQueryReturns, QueryReturnType } from 'pqb';
+import { Query, QueryWithTable, SetQueryTableAlias, RelationJoinQuery, WhereArg, UpdateData, CreateData, AddQueryDefaults, Db, IsolationLevel, TransactionOptions, Adapter, FromArgs, FromResult, AdapterOptions, QueryLogOptions, NoPrimaryKeyOption, RelationQuery, RelationConfigBase, RelationQueryBase, ComputedColumnsBase, MapTableScopesOption, QueryData, QueryBase, DbTableOptionScopes, DefaultColumnTypes, QueryBeforeHook, QueryAfterHook, AfterHook, WhereResult, MergeQuery, SetQueryReturns, QueryReturnType } from 'pqb';
 export * from 'pqb';
 import { ColumnsShapeBase, EmptyObject, MaybeArray, StringKey, CoreQueryScopes, ColumnShapeQueryType, ColumnShapeOutput, ColumnShapeInput } from 'orchid-core';
 
@@ -344,7 +344,7 @@ type TableClass<T extends Table = Table> = {
 type TableClasses = Record<string, TableClass>;
 type TableToDb<T extends Table, RelationQueries extends Record<string, RelationQueryBase>> = Db<T['table'], T['columns'], RelationQueries, T['types'], T['computed'] extends ComputedColumnsBase<never> ? T['columns'] & {
     [K in keyof T['computed']]: ReturnType<T['computed'][K]>['_type'];
-} : T['columns'], T['scopes']> & {
+} : T['columns'], MapTableScopesOption<T['scopes'], T['softDelete']>> & {
     definedAs: string;
     db: OrchidORM;
     getFilePath(): string;
@@ -365,6 +365,7 @@ type Table = {
      */
     computed?: ComputedColumnsBase<never>;
     scopes?: CoreQueryScopes;
+    readonly softDelete?: true | string;
 };
 type Queryable<T extends Table> = Partial<ColumnShapeQueryType<T['columns']>>;
 type Selectable<T extends Table> = ColumnShapeOutput<T['columns']>;

package/dist/index.js

@@ -1760,7 +1760,8 @@ const orchidORM = (_a, tables) => {
     const options2 = __spreadProps(__spreadValues$1({}, commonOptions), {
       schema: table.schema,
       language: table.language,
-      scopes: table.scopes
+      scopes: table.scopes,
+      softDelete: table.softDelete
     });
     if (table.noPrimaryKey)
       options2.noPrimaryKey = "ignore";