orchid-orm 1.31.2 → 1.31.3

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { Query, SelectableFromShape, CreateMethodsNames, CreateData, AddQueryDefaults, RelationConfigBase, UpdateData, WhereArg, JoinQueryMethod, DeleteMethodsNames, Db, IsolationLevel, TransactionOptions, Adapter, FromArg, FromResult, AdapterOptions, DbSharedOptions, RelationJoinQuery, RelationQuery, RelationsBase, ShapeColumnPrimaryKeys, ShapeUniqueColumns, TableDataItemsUniqueColumns, TableDataItemsUniqueColumnTuples, UniqueConstraints, TableDataItemsUniqueConstraints, ComputedColumnsFromOptions, MapTableScopesOption, TableDataItem, ComputedOptionsFactory, QueryData, QueryBase, TableDataFn, DbTableOptionScopes, SqlMethod, DefaultSchemaConfig, DefaultColumnTypes, QueryBeforeHook, QueryAfterHook, AfterHook, WhereResult, MergeQuery } from 'pqb';
 export * from 'pqb';
-import { ColumnsShapeBase, EmptyObject, MaybeArray, CoreQueryScopes, ColumnShapeOutput, ColumnShapeInput, ColumnShapeInputPartial, ColumnSchemaConfig, RecordUnknown, QueryReturnType } from 'orchid-core';
+import { ColumnsShapeBase, EmptyObject, MaybeArray, RecordUnknown, Simplify, ColumnShapeOutput, ColumnShapeInput, ColumnShapeInputPartial, CoreQueryScopes, ColumnSchemaConfig, QueryColumns, QueryReturnType } from 'orchid-core';
 export * from 'orchid-core';
 
 interface RelationCommonOptions<Related extends TableClass = TableClass, Scope extends Query = Query> {
@@ -414,19 +414,23 @@ interface Table {
      * collect computed columns returned by {@link BaseTable.setColumns}
      */
     computed?: ComputedOptionsFactory<never, never>;
-    scopes?: CoreQueryScopes;
+    scopes?: RecordUnknown;
     readonly softDelete?: true | string;
     comment?: string;
 }
-type Queryable<T extends Table> = {
+type Queryable<T extends Table> = Simplify<{
     [K in keyof T['columns']['shape']]?: T['columns']['shape'][K]['queryType'];
-};
-type Selectable<T extends Table> = ColumnShapeOutput<T['columns']['shape']>;
-type Insertable<T extends Table> = ColumnShapeInput<T['columns']['shape']>;
-type Updatable<T extends Table> = ColumnShapeInputPartial<T['columns']['shape']>;
-type BeforeHookMethod = <T extends Table>(cb: QueryBeforeHook) => T;
-type AfterHookMethod = <T extends Table>(cb: QueryAfterHook) => T;
-type AfterSelectableHookMethod = <T extends Table, S extends (keyof T['columns']['shape'])[]>(this: T, select: S, cb: AfterHook<S, T['columns']['shape']>) => T;
+}>;
+type Selectable<T extends Table> = Simplify<ColumnShapeOutput<T['columns']['shape']>>;
+type Insertable<T extends Table> = Simplify<ColumnShapeInput<T['columns']['shape']>>;
+type Updatable<T extends Table> = Simplify<ColumnShapeInputPartial<T['columns']['shape']>>;
+type BeforeHookMethod = (cb: QueryBeforeHook) => void;
+type AfterHookMethod = (cb: QueryAfterHook) => void;
+type AfterSelectableHookMethod = <Shape extends QueryColumns, S extends (keyof Shape)[]>(this: {
+    columns: {
+        shape: Shape;
+    };
+}, select: S, cb: AfterHook<S, Shape>) => void;
 interface SetColumnsResult<Shape extends ColumnsShapeBase, Data extends MaybeArray<MaybeArray<TableDataItem>>> {
     shape: Shape;
     data: Data extends unknown[] ? Data : [Data];