orchid-orm 1.37.2 → 1.37.4

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { Query, SelectableFromShape, CreateMethodsNames, CreateData, CreateBelongsToData, AddQueryDefaults, RelationConfigBase, SetQueryReturnsOne, SetQueryReturnsOneOptional, UpdateData, WhereArg, JoinQueryMethod, DeleteMethodsNames, Db, IsolationLevel, TransactionOptions, Adapter, FromArg, FromResult, AdapterOptions, DbSharedOptions, RelationsBase, ShapeColumnPrimaryKeys, ShapeUniqueColumns, TableDataItemsUniqueColumns, TableDataItemsUniqueColumnTuples, UniqueConstraints, TableDataItemsUniqueConstraints, ComputedColumnsFromOptions, MapTableScopesOption, TableDataItem, ComputedOptionsFactory, QueryData, TableDataFn, DbTableOptionScopes, RawSQL, DynamicRawSQL, DefaultSchemaConfig, DefaultColumnTypes, QueryBeforeHook, QueryAfterHook, AfterHook, WhereResult, MergeQuery } from 'pqb';
 export * from 'pqb';
-import { ColumnsShapeBase, EmptyObject, MaybeArray, RecordUnknown, Simplify, ColumnShapeOutput, DefaultSelectColumns, ColumnShapeInput, ColumnShapeInputPartial, IsQuery, CoreQueryScopes, ColumnSchemaConfig, StaticSQLArgs, QueryColumn, DynamicSQLArg, QueryColumns, QueryReturnType } from 'orchid-core';
+import { ColumnsShapeBase, EmptyObject, MaybeArray, RecordUnknown, ShallowSimplify, ColumnShapeOutput, DefaultSelectColumns, ColumnShapeInput, ColumnShapeInputPartial, IsQuery, CoreQueryScopes, ColumnSchemaConfig, StaticSQLArgs, QueryColumn, DynamicSQLArg, QueryColumns, QueryReturnType } from 'orchid-core';
 export * from 'orchid-core';
 
 interface RelationCommonOptions<Related extends TableClass = TableClass, Scope extends Query = Query> {
@@ -191,6 +191,9 @@ declare function transaction<Result>(this: {
 declare function ensureTransaction<Result>(this: {
     $queryBuilder: Db;
 }, cb: () => Promise<Result>): Promise<Result>;
+declare function isInTransaction(this: {
+    $queryBuilder: Db;
+}): boolean;
 
 interface FromQuery extends Query {
     returnType: 'all';
@@ -206,6 +209,10 @@ type OrchidORM<T extends TableClasses = TableClasses> = {
      * @see import('pqb').Transaction.prototype.ensureTransaction
      */
     $ensureTransaction: typeof ensureTransaction;
+    /**
+     * @see import('pqb').Transaction.prototype.ensureTransaction
+     */
+    $isInTransaction: typeof isInTransaction;
     $adapter: Adapter;
     $queryBuilder: Db;
     /**
@@ -447,12 +454,12 @@ interface ORMTableInput {
     readonly softDelete?: true | string;
     comment?: string;
 }
-type Queryable<T extends ORMTableInput> = Simplify<{
+type Queryable<T extends ORMTableInput> = ShallowSimplify<{
     [K in keyof T['columns']['shape']]?: T['columns']['shape'][K]['queryType'];
 }>;
-type Selectable<T extends ORMTableInput> = Simplify<Pick<ColumnShapeOutput<T['columns']['shape']>, DefaultSelectColumns<T['columns']['shape']>>>;
-type Insertable<T extends ORMTableInput> = Simplify<ColumnShapeInput<T['columns']['shape']>>;
-type Updatable<T extends ORMTableInput> = Simplify<ColumnShapeInputPartial<T['columns']['shape']>>;
+type Selectable<T extends ORMTableInput> = ShallowSimplify<Pick<ColumnShapeOutput<T['columns']['shape']>, DefaultSelectColumns<T['columns']['shape']>>>;
+type Insertable<T extends ORMTableInput> = ShallowSimplify<ColumnShapeInput<T['columns']['shape']>>;
+type Updatable<T extends ORMTableInput> = ShallowSimplify<ColumnShapeInputPartial<T['columns']['shape']>>;
 type BeforeHookMethod = (cb: QueryBeforeHook) => void;
 type AfterHookMethod = (cb: QueryAfterHook) => void;
 type AfterSelectableHookMethod = <Shape extends QueryColumns, S extends (keyof Shape)[]>(this: {

package/dist/index.js

@@ -1790,6 +1790,9 @@ function transaction(fnOrOptions, fn) {
 function ensureTransaction(cb) {
   return this.$queryBuilder.ensureTransaction(cb);
 }
+function isInTransaction() {
+  return this.$queryBuilder.isInTransaction();
+}
 
 var __defProp$1 = Object.defineProperty;
 var __defProps = Object.defineProperties;
@@ -1862,6 +1865,7 @@ const orchidORM = (_a, tables) => {
   const result = {
     $transaction: transaction,
     $ensureTransaction: ensureTransaction,
+    $isInTransaction: isInTransaction,
     $adapter: adapter,
     $queryBuilder: qb,
     $query: (...args) => qb.query(...args),