orchid-orm 1.21.5 → 1.21.6

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { Query, SelectableFromShape, CreateMethodsNames, AddQueryDefaults, RelationConfigBase, SetQueryReturnsOne, SetQueryReturnsOneOptional, RelationJoinQuery, UpdateData, WhereArg, CreateData, DeleteMethodsNames, Db, IsolationLevel, TransactionOptions, Adapter, FromArgs, FromResult, AdapterOptions, QueryLogOptions, NoPrimaryKeyOption, RelationQuery, RelationQueryBase, ComputedColumnsBase, MapTableScopesOption, QueryWithTable, QueryData, QueryBase, DbTableOptionScopes, DefaultSchemaConfig, DefaultColumnTypes, QueryBeforeHook, QueryAfterHook, AfterHook, WhereResult, MergeQuery, SetQueryReturns, QueryReturnType } from 'pqb';
 export * from 'pqb';
-import { ColumnsShapeBase, EmptyObject, MaybeArray, StringKey, CoreQueryScopes, ColumnShapeQueryType, ColumnShapeOutput, ColumnShapeInput, ColumnSchemaConfig } from 'orchid-core';
+import { ColumnsShapeBase, EmptyObject, MaybeArray, CoreQueryScopes, ColumnShapeQueryType, ColumnShapeOutput, ColumnShapeInput, ColumnSchemaConfig } from 'orchid-core';
 
 type RelationCommonOptions<Related extends TableClass = TableClass, Scope extends Query = Query> = {
     scope?: ScopeFn<Related, Scope>;
@@ -27,17 +27,19 @@ type HasOne = RelationThunkBase & {
 };
 type HasOneOptions<Columns extends ColumnsShapeBase = ColumnsShapeBase, Related extends TableClass = TableClass, Scope extends Query = Query, Through extends string = string, Source extends string = string> = RelationCommonOptions<Related, Scope> & (RelationHasOptions<keyof Columns, keyof InstanceType<Related>['columns']> | RelationThroughOptions<Through, Source>);
 interface HasOneInfo<T extends Table, Relations extends RelationThunks, Relation extends HasOne, Name extends string, TableQuery extends Query, Populate extends Record<string, true> = Relation['options'] extends RelationRefsOptions ? Record<Relation['options']['references'][number], true> : Relation['options'] extends RelationKeysOptions ? Record<Relation['options']['foreignKey'], true> : never, Q extends Query = Relation['options'] extends RelationThroughOptions ? {
-    [K in keyof TableQuery]: K extends 'meta' ? TableQuery['meta'] & {
+    [K in keyof TableQuery]: K extends 'meta' ? Omit<TableQuery['meta'], 'selectable'> & {
         as: Name;
         defaults: Populate;
         hasWhere: true;
-    } : K extends 'selectable' ? SelectableFromShape<TableQuery['shape'], Name> : K extends 'join' ? RelJoin : K extends CreateMethodsNames ? never : TableQuery[K];
+        selectable: SelectableFromShape<TableQuery['shape'], Name>;
+    } : K extends 'join' ? RelJoin : K extends CreateMethodsNames ? never : TableQuery[K];
 } : {
-    [K in keyof TableQuery]: K extends 'meta' ? TableQuery['meta'] & {
+    [K in keyof TableQuery]: K extends 'meta' ? Omit<TableQuery['meta'], 'selectable'> & {
         as: Name;
         defaults: Populate;
         hasWhere: true;
-    } : K extends 'selectable' ? SelectableFromShape<TableQuery['shape'], Name> : K extends 'join' ? RelJoin : TableQuery[K];
+        selectable: SelectableFromShape<TableQuery['shape'], Name>;
+    } : K extends 'join' ? RelJoin : TableQuery[K];
 }, NestedCreateQuery extends Query = Relation['options'] extends RelationThroughOptions ? Q : AddQueryDefaults<Q, Populate>> extends RelationConfigBase {
     query: Q;
     methodQuery: Relation['options']['required'] extends true ? SetQueryReturnsOne<Q> : SetQueryReturnsOneOptional<Q>;
@@ -78,17 +80,19 @@ type HasMany = RelationThunkBase & {
 };
 type HasManyOptions<Columns extends ColumnsShapeBase = ColumnsShapeBase, Related extends TableClass = TableClass, Scope extends Query = Query, Through extends string = string, Source extends string = string> = HasOneOptions<Columns, Related, Scope, Through, Source>;
 interface HasManyInfo<T extends Table, Relations extends RelationThunks, Relation extends HasMany, Name extends string, TableQuery extends Query, Populate extends Record<string, true> = Relation['options'] extends RelationRefsOptions ? Record<Relation['options']['references'][number], true> : Relation['options'] extends RelationKeysOptions ? Record<Relation['options']['foreignKey'], true> : never, Q extends Query = Relation['options'] extends RelationThroughOptions ? {
-    [K in keyof TableQuery]: K extends 'meta' ? TableQuery['meta'] & {
+    [K in keyof TableQuery]: K extends 'meta' ? Omit<TableQuery['meta'], 'selectable'> & {
         as: Name;
         defaults: Populate;
         hasWhere: true;
-    } : K extends 'selectable' ? SelectableFromShape<TableQuery['shape'], Name> : K extends 'join' ? RelJoin : K extends CreateMethodsNames ? never : TableQuery[K];
+        selectable: SelectableFromShape<TableQuery['shape'], Name>;
+    } : K extends 'join' ? RelJoin : K extends CreateMethodsNames ? never : TableQuery[K];
 } : {
-    [K in keyof TableQuery]: K extends 'meta' ? TableQuery['meta'] & {
+    [K in keyof TableQuery]: K extends 'meta' ? Omit<TableQuery['meta'], 'selectable'> & {
         as: Name;
         defaults: Populate;
         hasWhere: true;
-    } : K extends 'selectable' ? SelectableFromShape<TableQuery['shape'], Name> : K extends 'join' ? RelJoin : TableQuery[K];
+        selectable: SelectableFromShape<TableQuery['shape'], Name>;
+    } : K extends 'join' ? RelJoin : TableQuery[K];
 }, NestedCreateQuery extends Query = Relation['options'] extends RelationThroughOptions ? Q : AddQueryDefaults<Q, Populate>> extends RelationConfigBase {
     query: Q;
     methodQuery: Q;
@@ -126,10 +130,11 @@ type BelongsTo = RelationThunkBase & {
 };
 type BelongsToOptions<Columns extends ColumnsShapeBase = ColumnsShapeBase, Related extends TableClass = TableClass, Scope extends Query = Query> = RelationCommonOptions<Related, Scope> & RelationRefsOrKeysOptions<keyof Columns, keyof InstanceType<Related>['columns'], keyof InstanceType<Related>['columns'], keyof Columns>;
 interface BelongsToInfo<T extends Table, Relation extends BelongsTo, Name extends string, TableQuery extends Query, FK extends string = Relation['options'] extends RelationRefsOptions ? Relation['options']['columns'][number] : Relation['options'] extends RelationKeysOptions ? Relation['options']['foreignKey'] : never, Required = Relation['options']['required'] extends true ? true : false, Q extends Query = {
-    [K in keyof TableQuery]: K extends 'meta' ? TableQuery['meta'] & {
+    [K in keyof TableQuery]: K extends 'meta' ? Omit<TableQuery['meta'], 'selectable'> & {
         as: Name;
         hasWhere: true;
-    } : K extends 'selectable' ? SelectableFromShape<TableQuery['shape'], Name> : K extends 'join' ? RelJoin : K extends CreateMethodsNames | DeleteMethodsNames ? never : TableQuery[K];
+        selectable: SelectableFromShape<TableQuery['shape'], Name>;
+    } : K extends 'join' ? RelJoin : K extends CreateMethodsNames | DeleteMethodsNames ? never : TableQuery[K];
 }> extends RelationConfigBase {
     query: Q;
     methodQuery: Required extends true ? SetQueryReturnsOne<Q> : SetQueryReturnsOneOptional<Q>;
@@ -277,10 +282,11 @@ type HasAndBelongsToManyOptions<Columns extends ColumnsShapeBase = ColumnsShapeB
     associationForeignKey: keyof InstanceType<Related>['columns'];
 });
 interface HasAndBelongsToManyInfo<T extends Table, Relation extends HasAndBelongsToMany, Name extends string, TableQuery extends Query, Q extends Query = {
-    [K in keyof TableQuery]: K extends 'meta' ? TableQuery['meta'] & {
+    [K in keyof TableQuery]: K extends 'meta' ? Omit<TableQuery['meta'], 'selectable'> & {
         as: Name;
         hasWhere: true;
-    } : K extends 'selectable' ? SelectableFromShape<TableQuery['shape'], Name> : K extends 'join' ? RelJoin : TableQuery[K];
+        selectable: SelectableFromShape<TableQuery['shape'], Name>;
+    } : K extends 'join' ? RelJoin : TableQuery[K];
 }> extends RelationConfigBase {
     query: Q;
     methodQuery: Q;
@@ -352,12 +358,12 @@ type RelationThunk = BelongsTo | HasOne | HasMany | HasAndBelongsToMany;
 type RelationThunks = Record<string, RelationThunk>;
 type RelationScopeOrTable<Relation extends RelationThunkBase> = Relation['options']['scope'] extends (q: Query) => Query ? ReturnType<Relation['options']['scope']> : RelationQueryFromFn<Relation>;
 type RelationQueryFromFn<Relation extends RelationThunkBase, TC extends TableClass = ReturnType<Relation['fn']>, Q extends Query = DbTable<TC>> = Q;
-type RelationConfig<T extends Table = Table, Relations extends RelationThunks = RelationThunks, Relation extends RelationThunk = RelationThunk, K extends PropertyKey = PropertyKey, TableQuery extends Query = Query, Result extends RelationConfigBase = Relation extends BelongsTo ? BelongsToInfo<T, Relation, StringKey<K>, TableQuery> : Relation extends HasOne ? HasOneInfo<T, Relations, Relation, StringKey<K>, TableQuery> : Relation extends HasMany ? HasManyInfo<T, Relations, Relation, StringKey<K>, TableQuery> : Relation extends HasAndBelongsToMany ? HasAndBelongsToManyInfo<T, Relation, StringKey<K>, TableQuery> : never> = Result;
-type MapRelation<T extends Table, Relations extends RelationThunks, RelationName extends keyof Relations, Relation extends RelationThunk = Relations[RelationName], TableQuery extends Query = RelationScopeOrTable<Relation>> = RelationQuery<RelationConfig<T, Relations, Relation, RelationName, TableQuery>>;
+type RelationConfig<T extends Table = Table, Relations extends RelationThunks = RelationThunks, Relation extends RelationThunk = RelationThunk, K extends string = string, TableQuery extends Query = Query, Result extends RelationConfigBase = Relation extends BelongsTo ? BelongsToInfo<T, Relation, K, TableQuery> : Relation extends HasOne ? HasOneInfo<T, Relations, Relation, K, TableQuery> : Relation extends HasMany ? HasManyInfo<T, Relations, Relation, K, TableQuery> : Relation extends HasAndBelongsToMany ? HasAndBelongsToManyInfo<T, Relation, K, TableQuery> : never> = Result;
+type MapRelation<T extends Table, Relations extends RelationThunks, RelationName extends keyof Relations & string, Relation extends RelationThunk = Relations[RelationName], TableQuery extends Query = RelationScopeOrTable<Relation>> = RelationQuery<RelationConfig<T, Relations, Relation, RelationName, TableQuery>>;
 type MapRelations<T extends Table> = T extends {
     relations: RelationThunks;
 } ? {
-    [K in keyof T['relations']]: MapRelation<T, T['relations'], K>;
+    [K in keyof T['relations'] & string]: MapRelation<T, T['relations'], K>;
 } : EmptyObject;
 
 type TableClass<T extends Table = Table> = {
@@ -396,7 +402,7 @@ type Insertable<T extends Table> = ColumnShapeInput<T['columns']>;
 type Updateable<T extends Table> = Partial<Insertable<T>>;
 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'])[]>(this: T, select: S, cb: AfterHook<S, T['columns']>) => T;
+type AfterSelectableHookMethod = <T extends Table, S extends (keyof T['columns'] & string)[]>(this: T, select: S, cb: AfterHook<S, T['columns']>) => T;
 interface BaseTableInstance<ColumnTypes> {
     table: string;
     columns: ColumnsShapeBase;