orchid-orm 1.26.3 → 1.27.1

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Query, SelectableFromShape, CreateMethodsNames, AddQueryDefaults, SetQueryReturnsOne, SetQueryReturnsOneOptional, RelationJoinQuery, UpdateData, WhereArg, CreateData, JoinQueryMethod, DeleteMethodsNames, Db, IsolationLevel, TransactionOptions, Adapter, FromArg, FromArgOptions, FromResult, AdapterOptions, DbSharedOptions, RelationQuery, ShapeColumnPrimaryKeys, ShapeUniqueColumns, TableDataItemsUniqueColumns, TableDataItemsUniqueColumnTuples, UniqueConstraints, TableDataItemsUniqueConstraints, MapTableScopesOption, TableDataItem, ComputedColumnsBase, QueryData, QueryBase, TableDataFn, 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, FromResult, AdapterOptions, DbSharedOptions, RelationQuery, ShapeColumnPrimaryKeys, ShapeUniqueColumns, TableDataItemsUniqueColumns, TableDataItemsUniqueColumnTuples, UniqueConstraints, TableDataItemsUniqueConstraints, MapTableScopesOption, TableDataItem, ComputedColumnsBase, QueryData, QueryBase, TableDataFn, DbTableOptionScopes, DefaultSchemaConfig, DefaultColumnTypes, RelationQueryBase, QueryBeforeHook, QueryAfterHook, AfterHook, WhereResult, MergeQuery } from 'pqb';
 export * from 'pqb';
 import { ColumnsShapeBase, EmptyObject, MaybeArray, RecordUnknown, CoreQueryScopes, ColumnShapeOutput, ColumnShapeInput, ColumnShapeInputPartial, ColumnSchemaConfig, QueryReturnType } from 'orchid-core';
 export * from 'orchid-core';
@@ -250,7 +250,7 @@ type OrchidORM<T extends TableClasses = TableClasses> = {
      * @param args - SQL template literal, or an object { raw: string, values?: unknown[] }
      */
     $queryArrays: Db['queryArrays'];
-    $from<Arg extends FromArg<Query>>(arg: Arg, options?: FromArgOptions): FromResult<Query, Arg>;
+    $from<Arg extends MaybeArray<FromArg<Query>>>(arg: Arg): FromResult<Query, Arg>;
     $close(): Promise<void>;
 };
 type OrchidOrmArg = true | null extends true ? 'Set strict: true to tsconfig' : ({
@@ -397,7 +397,7 @@ interface RelationQueriesBase {
     [K: string]: RelationQueryBase;
 }
 interface TableToDb<T extends Table, RelationQueries extends RelationQueriesBase> 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']>, RelationQueries, T['types'], T['computed'] extends RecordUnknown ? T['columns']['shape'] & {
-    [K in keyof T['computed']]: ReturnType<T['computed'][K]>['_type'];
+    [K in keyof T['computed']]: ReturnType<T['computed'][K]>['result']['value'];
 } : T['columns']['shape'], MapTableScopesOption<T['scopes'], T['softDelete']>> {
     definedAs: string;
     db: OrchidORM;

package/dist/index.js

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