orchid-orm 1.31.2 → 1.31.4

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> {
@@ -189,7 +189,7 @@ interface FromQuery extends Query {
     returnType: 'all';
 }
 type OrchidORM<T extends TableClasses = TableClasses> = {
-    [K in keyof T]: DbTable<InstanceType<T[K]>>;
+    [K in keyof T]: ORMTableInputToQueryBuilder<InstanceType<T[K]>>;
 } & {
     $transaction: typeof transaction;
     $adapter: Adapter;
@@ -370,7 +370,7 @@ type RelationThunk = BelongsTo | HasOne | HasMany | HasAndBelongsToMany;
 interface RelationThunks {
     [K: string]: RelationThunk;
 }
-type RelationScopeOrTable<Relation extends RelationThunkBase> = Relation['options']['scope'] extends (q: Query) => Query ? ReturnType<Relation['options']['scope']> : DbTable<InstanceType<ReturnType<Relation['fn']>>>;
+type RelationScopeOrTable<Relation extends RelationThunkBase> = Relation['options']['scope'] extends (q: Query) => Query ? ReturnType<Relation['options']['scope']> : ORMTableInputToQueryBuilder<InstanceType<ReturnType<Relation['fn']>>>;
 interface RelationConfigSelf {
     columns: {
         shape: ColumnsShapeBase;
@@ -383,23 +383,27 @@ type MapRelations<T> = T extends RelationConfigSelf ? {
     [K in keyof T['relations'] & string]: MapRelation<T, K, RelationScopeOrTable<T['relations'][K]>>;
 } : EmptyObject;
 
-interface TableClass<T extends Table = Table> {
+interface TableClass<T extends ORMTableInput = ORMTableInput> {
     new (): T;
     instance(): T;
 }
 interface TableClasses {
     [K: string]: TableClass;
 }
-interface TableToDb<T extends Table, Relations extends RelationsBase> extends Db<T['table'], T['columns']['shape'], keyof ShapeColumnPrimaryKeys<T['columns']['shape']> extends never ? never : ShapeColumnPrimaryKeys<T['columns']['shape']>, ShapeUniqueColumns<T['columns']['shape']> | TableDataItemsUniqueColumns<T['columns']['shape'], T['columns']['data']>, TableDataItemsUniqueColumnTuples<T['columns']['shape'], T['columns']['data']>, UniqueConstraints<T['columns']['shape']> | TableDataItemsUniqueConstraints<T['columns']['data']>, T['types'], T['columns']['shape'] & ComputedColumnsFromOptions<T['computed']>, MapTableScopesOption<T['scopes'], T['softDelete']>> {
-    relations: Relations;
+interface TableInfo {
     definedAs: string;
     db: OrchidORM;
     getFilePath(): string;
     name: string;
 }
-type DbTable<T extends Table> = T extends RelationConfigSelf ? TableToDb<T, MapRelations<T>> & MapRelations<T> : TableToDb<T, RelationsBase>;
-type ScopeFn<Related extends TableClass, Scope extends Query> = (q: DbTable<InstanceType<Related>>) => Scope;
-interface Table {
+interface Table extends Query, TableInfo {
+}
+interface TableToDb<T extends ORMTableInput, Relations extends RelationsBase> extends TableInfo, Db<T['table'], T['columns']['shape'], keyof ShapeColumnPrimaryKeys<T['columns']['shape']> extends never ? never : ShapeColumnPrimaryKeys<T['columns']['shape']>, ShapeUniqueColumns<T['columns']['shape']> | TableDataItemsUniqueColumns<T['columns']['shape'], T['columns']['data']>, TableDataItemsUniqueColumnTuples<T['columns']['shape'], T['columns']['data']>, UniqueConstraints<T['columns']['shape']> | TableDataItemsUniqueConstraints<T['columns']['data']>, T['types'], T['columns']['shape'] & ComputedColumnsFromOptions<T['computed']>, MapTableScopesOption<T>> {
+    relations: Relations;
+}
+type ORMTableInputToQueryBuilder<T extends ORMTableInput> = T extends RelationConfigSelf ? TableToDb<T, MapRelations<T>> & MapRelations<T> : TableToDb<T, RelationsBase>;
+type ScopeFn<Related extends TableClass, Scope extends Query> = (q: ORMTableInputToQueryBuilder<InstanceType<Related>>) => Scope;
+interface ORMTableInput {
     table: string;
     columns: {
         shape: ColumnsShapeBase;
@@ -414,19 +418,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 ORMTableInput> = 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 ORMTableInput> = Simplify<ColumnShapeOutput<T['columns']['shape']>>;
+type Insertable<T extends ORMTableInput> = Simplify<ColumnShapeInput<T['columns']['shape']>>;
+type Updatable<T extends ORMTableInput> = 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];
@@ -645,4 +653,4 @@ type Repo<T extends Query, Methods extends MethodsBase<T>> = (<Q extends {
 }>(q: Q) => Query & Q & MapMethods<T, Methods>) & T & MapMethods<T, Methods>;
 declare const createRepo: <T extends Query, Methods extends MethodsBase<T>>(table: T, methods: Methods) => Repo<T, Methods>;
 
-export { BaseTableClass, BaseTableInstance, DbTable, Insertable, MapMethods, MapQueryMethods, MethodsBase, OrchidORM, Queryable, Repo, ScopeFn, Selectable, SetColumnsResult, Table, TableClass, TableClasses, TableToDb, Updatable, createBaseTable, createRepo, orchidORM };
+export { BaseTableClass, BaseTableInstance, Insertable, MapMethods, MapQueryMethods, MethodsBase, ORMTableInput, ORMTableInputToQueryBuilder, OrchidORM, Queryable, Repo, ScopeFn, Selectable, SetColumnsResult, Table, TableClass, TableClasses, TableInfo, TableToDb, Updatable, createBaseTable, createRepo, orchidORM };