orchid-orm 1.29.2 → 1.31.0

package/dist/index.d.ts

@@ -1,6 +1,6 @@
-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, SqlMethod, 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, ComputedColumnsFromOptions, MapTableScopesOption, TableDataItem, ComputedOptionsFactory, QueryData, QueryBase, TableDataFn, DbTableOptionScopes, SqlMethod, 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';
+import { ColumnsShapeBase, EmptyObject, MaybeArray, CoreQueryScopes, ColumnShapeOutput, ColumnShapeInput, ColumnShapeInputPartial, ColumnSchemaConfig, RecordUnknown, QueryReturnType } from 'orchid-core';
 export * from 'orchid-core';
 
 interface RelationCommonOptions<Related extends TableClass = TableClass, Scope extends Query = Query> {
@@ -56,6 +56,7 @@ interface HasOneInfo<T extends RelationConfigSelf, Name extends keyof T['relatio
             table: Q;
         }>;
     };
+    dataForCreate: never;
     dataForUpdate: {
         disconnect: boolean;
     } | {
@@ -110,6 +111,7 @@ interface HasManyInfo<T extends RelationConfigSelf, Name extends keyof T['relati
             table: Q;
         }>;
     };
+    dataForCreate: never;
     dataForUpdate: {
         disconnect?: MaybeArray<WhereArg<Q>>;
         delete?: MaybeArray<WhereArg<Q>>;
@@ -187,6 +189,9 @@ declare function transaction<T extends {
     $queryBuilder: Db;
 }, Result>(this: T, options: IsolationLevel | TransactionOptions, fn: () => Promise<Result>): Promise<Result>;
 
+interface FromQuery extends Query {
+    returnType: 'all';
+}
 type OrchidORM<T extends TableClasses = TableClasses> = {
     [K in keyof T]: DbTable<InstanceType<T[K]>>;
 } & {
@@ -253,7 +258,7 @@ type OrchidORM<T extends TableClasses = TableClasses> = {
     /**
      * See {@link FromMethods.from}
      */
-    $from<Arg extends MaybeArray<FromArg<Query>>>(arg: Arg): FromResult<Query, Arg>;
+    $from<Arg extends MaybeArray<FromArg<Query>>>(arg: Arg): FromResult<FromQuery, Arg>;
     $close(): Promise<void>;
 };
 type OrchidOrmArg = true | null extends true ? 'Set strict: true to tsconfig' : ({
@@ -307,6 +312,7 @@ interface HasAndBelongsToManyInfo<T extends RelationConfigSelf, Name extends key
             table: Q;
         }>;
     };
+    dataForCreate: never;
     dataForUpdate: {
         disconnect?: MaybeArray<WhereArg<Q>>;
         set?: MaybeArray<WhereArg<Q>>;
@@ -399,9 +405,7 @@ interface TableClasses {
 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]>['result']['value'];
-} : T['columns']['shape'], MapTableScopesOption<T['scopes'], T['softDelete']>> {
+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['columns']['shape'] & ComputedColumnsFromOptions<T['computed']>, MapTableScopesOption<T['scopes'], T['softDelete']>> {
     definedAs: string;
     db: OrchidORM;
     getFilePath(): string;
@@ -423,7 +427,7 @@ interface Table {
     /**
      * collect computed columns returned by {@link BaseTable.setColumns}
      */
-    computed?: ComputedColumnsBase<never>;
+    computed?: ComputedOptionsFactory<never, never>;
     scopes?: CoreQueryScopes;
     readonly softDelete?: true | string;
     comment?: string;
@@ -548,16 +552,20 @@ interface BaseTableInstance<ColumnTypes> {
      *
      * @param computed - object where keys are column names and values are functions returning raw SQL
      */
-    setComputed<Table extends string, Shape extends ColumnsShapeBase, Computed extends ComputedColumnsBase<Db<Table, Shape, never, never, never, never, EmptyObject, ColumnTypes>>>(computed: Computed): Computed;
+    setComputed<Shape extends ColumnsShapeBase, Computed extends ComputedOptionsFactory<ColumnTypes, Shape>>(this: {
+        columns: {
+            shape: Shape;
+        };
+    }, computed: Computed): Computed;
     /**
      * See {@link ScopeMethods}
      */
-    setScopes<Table extends string, Columns extends ColumnsShapeBase, Keys extends string>(this: {
+    setScopes<Table extends string, Shape extends ColumnsShapeBase, Keys extends string>(this: {
         table: Table;
         columns: {
-            shape: Columns;
+            shape: Shape;
         };
-    }, scopes: DbTableOptionScopes<Table, Columns, Keys>): CoreQueryScopes<Keys>;
+    }, scopes: DbTableOptionScopes<Table, Shape, Keys>): CoreQueryScopes<Keys>;
     belongsTo<Columns extends ColumnsShapeBase, Related extends TableClass, Scope extends Query, Options extends BelongsToOptions<Columns, Related, Scope>>(this: {
         columns: {
             shape: Columns;
@@ -632,7 +640,7 @@ declare function createBaseTable<SchemaConfig extends ColumnSchemaConfig = Defau
 
 type QueryMethods<T extends Query> = Record<string, (q: T, ...args: any[]) => any>;
 type QueryOne<T extends Query> = {
-    [K in keyof T]: K extends 'returnType' ? Exclude<QueryReturnType, 'all'> : T[K];
+    [K in keyof T]: K extends 'returnType' ? Exclude<QueryReturnType, 'all' | undefined> : T[K];
 };
 interface MethodsBase<T extends Query> {
     queryMethods?: QueryMethods<T>;

package/dist/index.js

@@ -437,7 +437,10 @@ const nestedUpdate$3 = ({ query, primaryKeys, foreignKeys, len }) => {
       } else if (params.create) {
         const q3 = query.clone();
         q3.q.select = primaryKeys;
-        const record = await pqb._queryCreate(q3, params.create);
+        const record = await pqb._queryCreate(
+          q3,
+          params.create
+        );
         for (let i = 0; i < len; i++) {
           update[foreignKeys[i]] = record[primaryKeys[i]];
         }
@@ -474,7 +477,10 @@ const nestedUpdate$3 = ({ query, primaryKeys, foreignKeys, len }) => {
           );
         } else {
           const data = typeof upsert.create === "function" ? upsert.create() : upsert.create;
-          const result = await pqb._queryCreate(query.select(...primaryKeys), data);
+          const result = await pqb._queryCreate(
+            query.select(...primaryKeys),
+            data
+          );
           const collectData = {};
           state.collect = {
             keys: primaryKeys,
@@ -1885,7 +1891,8 @@ const orchidORM = (_a, tables) => {
       softDelete: table.softDelete,
       snakeCase: table.snakeCase,
       comment: table.comment,
-      noPrimaryKey: table.noPrimaryKey ? "ignore" : void 0
+      noPrimaryKey: table.noPrimaryKey ? "ignore" : void 0,
+      computed: table.computed
     });
     const dbTable = new pqb.Db(
       adapter,
@@ -1902,12 +1909,6 @@ const orchidORM = (_a, tables) => {
     dbTable.db = result;
     dbTable.filePath = table.filePath;
     dbTable.name = table.constructor.name;
-    if (table.computed) {
-      pqb.addComputedColumns(
-        dbTable,
-        table.computed
-      );
-    }
     result[key] = dbTable;
   }
   applyRelations(qb, tableInstances, result);