orchid-orm 1.22.1 → 1.23.1

package/dist/index.d.ts

@@ -1,6 +1,6 @@
-import { Query, SelectableFromShape, CreateMethodsNames, AddQueryDefaults, RelationConfigBase, SetQueryReturnsOne, SetQueryReturnsOneOptional, RelationJoinQuery, UpdateData, WhereArg, CreateData, JoinQueryMethod, DeleteMethodsNames, Db, IsolationLevel, TransactionOptions, Adapter, FromArgs, FromResult, AdapterOptions, QueryLogOptions, NoPrimaryKeyOption, RelationQuery, MapTableScopesOption, ComputedColumnsBase, QueryData, QueryBase, DbTableOptionScopes, DefaultSchemaConfig, DefaultColumnTypes, RelationQueryBase, QueryBeforeHook, QueryAfterHook, AfterHook, WhereResult, MergeQuery } from 'pqb';
+import { Query, SelectableFromShape, CreateMethodsNames, AddQueryDefaults, SetQueryReturnsOne, SetQueryReturnsOneOptional, RelationJoinQuery, UpdateData, WhereArg, CreateData, JoinQueryMethod, DeleteMethodsNames, Db, IsolationLevel, TransactionOptions, Adapter, FromArg, FromArgOptions, FromResult, AdapterOptions, QueryLogOptions, NoPrimaryKeyOption, RelationQuery, MapTableScopesOption, ComputedColumnsBase, QueryData, QueryBase, DbTableOptionScopes, DefaultSchemaConfig, DefaultColumnTypes, RelationQueryBase, QueryBeforeHook, QueryAfterHook, AfterHook, WhereResult, MergeQuery } from 'pqb';
 export * from 'pqb';
-import { ColumnsShapeBase, RecordKeyTrue, EmptyObject, MaybeArray, RecordUnknown, CoreQueryScopes, ColumnShapeOutput, ColumnShapeInput, ColumnShapeInputPartial, ColumnSchemaConfig, QueryReturnType } from 'orchid-core';
+import { ColumnsShapeBase, EmptyObject, MaybeArray, RecordUnknown, CoreQueryScopes, ColumnShapeOutput, ColumnShapeInput, ColumnShapeInputPartial, ColumnSchemaConfig, QueryReturnType } from 'orchid-core';
 
 interface RelationCommonOptions<Related extends TableClass = TableClass, Scope extends Query = Query> {
     scope?: ScopeFn<Related, Scope>;
@@ -29,7 +29,7 @@ type HasOneOptions<Columns extends ColumnsShapeBase = ColumnsShapeBase, Related
 type HasOneParams<T extends RelationConfigSelf, Relation extends RelationThunkBase> = Relation['options'] extends RelationRefsOptions ? {
     [Name in Relation['options']['columns'][number]]: T['columns'][Name]['type'];
 } : Relation['options'] extends RelationKeysOptions ? Record<Relation['options']['primaryKey'], T['columns'][Relation['options']['primaryKey']]['type']> : Relation['options'] extends RelationThroughOptions ? RelationConfigParams<T, T['relations'][Relation['options']['through']]> : never;
-interface HasOneInfo<T extends RelationConfigSelf, Name extends keyof T['relations'] & string, TableQuery extends Query, Populate extends RecordKeyTrue = T['relations'][Name]['options'] extends RelationRefsOptions ? Record<T['relations'][Name]['options']['references'][number], true> : T['relations'][Name]['options'] extends RelationKeysOptions ? Record<T['relations'][Name]['options']['foreignKey'], true> : never, Q extends Query = T['relations'][Name]['options'] extends RelationThroughOptions ? {
+interface HasOneInfo<T extends RelationConfigSelf, Name extends keyof T['relations'] & string, TableQuery extends Query, Populate = T['relations'][Name]['options'] extends RelationRefsOptions ? Record<T['relations'][Name]['options']['references'][number], true> : T['relations'][Name]['options'] extends RelationKeysOptions ? Record<T['relations'][Name]['options']['foreignKey'], true> : never, Q extends Query = T['relations'][Name]['options'] extends RelationThroughOptions ? {
     [K in keyof TableQuery]: K extends 'meta' ? Omit<TableQuery['meta'], 'selectable'> & {
         as: Name;
         defaults: Populate;
@@ -43,7 +43,7 @@ interface HasOneInfo<T extends RelationConfigSelf, Name extends keyof T['relatio
         hasWhere: true;
         selectable: SelectableFromShape<TableQuery['shape'], Name>;
     } : K extends 'join' ? RelJoin : TableQuery[K];
-}, NestedCreateQuery extends Query = T['relations'][Name]['options'] extends RelationThroughOptions ? Q : AddQueryDefaults<Q, Populate>> extends RelationConfigBase {
+}, NestedCreateQuery extends Query = T['relations'][Name]['options'] extends RelationThroughOptions ? Q : AddQueryDefaults<Q, Populate>> {
     query: Q;
     methodQuery: T['relations'][Name]['options']['required'] extends true ? SetQueryReturnsOne<Q> : SetQueryReturnsOneOptional<Q>;
     joinQuery: RelationJoinQuery;
@@ -97,7 +97,7 @@ interface HasManyInfo<T extends RelationConfigSelf, Name extends keyof T['relati
         hasWhere: true;
         selectable: SelectableFromShape<TableQuery['shape'], Name>;
     } : K extends 'join' ? RelJoin : TableQuery[K];
-}> extends RelationConfigBase {
+}> {
     query: Q;
     methodQuery: Q;
     joinQuery: RelationJoinQuery;
@@ -135,14 +135,14 @@ type BelongsToFKey<Relation extends RelationThunkBase> = Relation['options'] ext
 type BelongsToParams<T extends RelationConfigSelf, Relation extends RelationThunkBase> = {
     [Name in BelongsToFKey<Relation>]: T['columns'][Name]['type'];
 };
-interface BelongsToInfo<T extends RelationConfigSelf, Name extends keyof T['relations'] & string, TableQuery extends Query, FK extends string = BelongsToFKey<T['relations'][Name]>, Required = T['relations'][Name]['options']['required'] extends true ? true : false, Q extends Query = {
-    [K in keyof TableQuery]: K extends 'meta' ? // Omit is optimal
+interface BelongsToInfo<T extends RelationConfigSelf, Name extends keyof T['relations'] & string, TableQuery extends Query, FK extends string, Required, Q extends Query = {
+    [P in keyof TableQuery]: P extends 'meta' ? // Omit is optimal
     Omit<TableQuery['meta'], 'selectable'> & {
         as: Name;
         hasWhere: true;
         selectable: SelectableFromShape<TableQuery['shape'], Name>;
-    } : K extends 'join' ? RelJoin : K extends CreateMethodsNames | DeleteMethodsNames ? never : TableQuery[K];
-}> extends RelationConfigBase {
+    } : P extends 'join' ? RelJoin : P extends CreateMethodsNames | DeleteMethodsNames ? never : TableQuery[P];
+}> {
     query: Q;
     methodQuery: Required extends true ? SetQueryReturnsOne<Q> : SetQueryReturnsOneOptional<Q>;
     joinQuery: RelationJoinQuery;
@@ -249,7 +249,7 @@ type OrchidORM<T extends TableClasses = TableClasses> = {
      * @param args - SQL template literal, or an object { raw: string, values?: unknown[] }
      */
     $queryArrays: Db['queryArrays'];
-    $from<Args extends FromArgs<Query>>(...args: Args): FromResult<Query, Args>;
+    $from<Arg extends FromArg<Query>>(arg: Arg, options?: FromArgOptions): FromResult<Query, Arg>;
     $close(): Promise<void>;
 };
 declare const orchidORM: <T extends TableClasses>({ log, logger, autoPreparedStatements, noPrimaryKey, ...options }: (Omit<AdapterOptions, "log"> | {
@@ -293,7 +293,7 @@ interface HasAndBelongsToManyInfo<T extends RelationConfigSelf, Name extends key
         hasWhere: true;
         selectable: SelectableFromShape<TableQuery['shape'], Name>;
     } : K extends 'join' ? RelJoin : TableQuery[K];
-}> extends RelationConfigBase {
+}> {
     query: Q;
     methodQuery: Q;
     joinQuery: RelationJoinQuery;
@@ -380,7 +380,7 @@ interface RelationConfigSelf {
     relations: RelationThunks;
 }
 type RelationConfigParams<T extends RelationConfigSelf, Relation extends RelationThunk> = Relation extends BelongsTo ? BelongsToParams<T, Relation> : Relation extends HasOne ? HasOneParams<T, Relation> : Relation extends HasMany ? HasManyParams<T, Relation> : Relation extends HasAndBelongsToMany ? HasAndBelongsToManyParams<T, Relation> : never;
-type MapRelation<T extends RelationConfigSelf, K extends keyof T['relations'] & string> = RelationQuery<T['relations'][K] extends BelongsTo ? BelongsToInfo<T, K, RelationScopeOrTable<T['relations'][K]>> : T['relations'][K] extends HasOne ? HasOneInfo<T, K, RelationScopeOrTable<T['relations'][K]>> : T['relations'][K] extends HasMany ? HasManyInfo<T, K, RelationScopeOrTable<T['relations'][K]>> : T['relations'][K] extends HasAndBelongsToMany ? HasAndBelongsToManyInfo<T, K, RelationScopeOrTable<T['relations'][K]>> : never>;
+type MapRelation<T extends RelationConfigSelf, K extends keyof T['relations'] & string> = RelationQuery<T['relations'][K] extends BelongsTo ? BelongsToInfo<T, K, RelationScopeOrTable<T['relations'][K]>, BelongsToFKey<T['relations'][K]>, T['relations'][K]['options']['required']> : T['relations'][K] extends HasOne ? HasOneInfo<T, K, RelationScopeOrTable<T['relations'][K]>> : T['relations'][K] extends HasMany ? HasManyInfo<T, K, RelationScopeOrTable<T['relations'][K]>> : T['relations'][K] extends HasAndBelongsToMany ? HasAndBelongsToManyInfo<T, K, RelationScopeOrTable<T['relations'][K]>> : never>;
 type MapRelations<T> = T extends {
     columns: ColumnsShapeBase;
     relations: RelationThunks;

package/dist/index.js

@@ -1844,7 +1844,7 @@ const orchidORM = (_a, tables) => {
     $queryBuilder: qb,
     $query: (...args) => qb.query(...args),
     $queryArrays: (...args) => qb.queryArrays(...args),
-    $from: (...args) => qb.from(...args),
+    $from: (arg, options2) => qb.from(arg, options2),
     $close: () => adapter.close()
   };
   const tableInstances = {};