orchid-orm 1.17.19 → 1.17.21

package/dist/index.d.ts

@@ -1,6 +1,6 @@
-import { Query, QueryWithTable, SetQueryTableAlias, WhereArg, UpdateData, CreateData, Db, IsolationLevel, TransactionOptions, Adapter, FromArgs, FromResult, AdapterOptions, QueryLogOptions, NoPrimaryKeyOption, RelationConfigBase, RelationQuery, SetQueryReturnsOne, SetQueryReturnsOneOptional, SetQueryReturnsAll, RelationQueryBase, ComputedColumnsBase, ColumnsShape, QueryData, QueryBase, DefaultColumnTypes, QueryBeforeHook, QueryAfterHook, AfterHook, WhereResult, MergeQuery, SetQueryReturns, QueryReturnType } from 'pqb';
+import { Query, QueryWithTable, SetQueryTableAlias, WhereArg, UpdateData, CreateData, Db, IsolationLevel, TransactionOptions, Adapter, FromArgs, FromResult, AdapterOptions, QueryLogOptions, NoPrimaryKeyOption, RelationConfigBase, RelationQuery, SetQueryReturnsOne, SetQueryReturnsOneOptional, SetQueryReturnsAll, RelationQueryBase, ComputedColumnsBase, QueryData, QueryBase, DefaultColumnTypes, QueryBeforeHook, QueryAfterHook, AfterHook, WhereResult, MergeQuery, SetQueryReturns, QueryReturnType } from 'pqb';
 export { OrchidOrmError, OrchidOrmInternalError, columnTypes, raw, testTransaction } from 'pqb';
-import { EmptyObject, MaybeArray, StringKey, ColumnShapeQueryType, ColumnShapeOutput, ColumnShapeInput, ColumnsShapeBase } from 'orchid-core';
+import { EmptyObject, MaybeArray, StringKey, ColumnsShapeBase, ColumnShapeQueryType, ColumnShapeOutput, ColumnShapeInput } from 'orchid-core';
 
 type RelationCommonOptions<Related extends TableClass = TableClass, Scope extends Query = Query> = {
     scope?: ScopeFn<Related, Scope>;
@@ -359,7 +359,7 @@ type DbTable<TC extends TableClass, T extends Table = InstanceType<TC>, Relation
 type ScopeFn<Related extends TableClass, Scope extends Query> = (q: DbTable<Related>) => Scope;
 type Table = {
     table: string;
-    columns: ColumnsShape;
+    columns: ColumnsShapeBase;
     schema?: string;
     types: unknown;
     noPrimaryKey?: boolean;
@@ -385,7 +385,7 @@ interface BaseTableClass<ColumnTypes, SchemaProvider extends SchemaProviderBase>
     getFilePath(): string;
     new (): {
         table: string;
-        columns: ColumnsShape;
+        columns: ColumnsShapeBase;
         schema?: string;
         noPrimaryKey?: boolean;
         snakeCase?: boolean;
@@ -396,7 +396,7 @@ interface BaseTableClass<ColumnTypes, SchemaProvider extends SchemaProviderBase>
         result: ColumnsShapeBase;
         clone<T extends QueryBase>(this: T): T;
         getFilePath(): string;
-        setColumns<T extends ColumnsShape>(fn: (t: ColumnTypes) => T): T;
+        setColumns<T extends ColumnsShapeBase>(fn: (t: ColumnTypes) => T): T;
         /**
          * You can add a generated column in the migration (see [generated](/guide/migration-column-methods.html#generated-column)),
          * such column will persist in the database, it can be indexed.
@@ -487,7 +487,7 @@ interface BaseTableClass<ColumnTypes, SchemaProvider extends SchemaProviderBase>
          *
          * @param computed - object where keys are column names and values are functions returning raw SQL
          */
-        setComputed<Table extends string, Shape extends ColumnsShape, Computed extends ComputedColumnsBase<Db<Table, Shape, EmptyObject, ColumnTypes>>>(computed: Computed): Computed;
+        setComputed<Table extends string, Shape extends ColumnsShapeBase, Computed extends ComputedColumnsBase<Db<Table, Shape, EmptyObject, ColumnTypes>>>(computed: Computed): Computed;
         belongsTo<Self extends Table, Related extends TableClass, Scope extends Query, Options extends BelongsToOptions<Self, Related, Scope>>(this: Self, fn: () => Related, options: Options): {
             type: 'belongsTo';
             fn: () => Related;
@@ -524,15 +524,15 @@ interface BaseTableClass<ColumnTypes, SchemaProvider extends SchemaProviderBase>
         afterDeleteCommit: AfterSelectableHookMethod;
     };
 }
-declare const createBaseTable: <SchemaProvider extends unknown, ColumnTypes = DefaultColumnTypes>({ columnTypes: columnTypesArg, snakeCase, filePath: filePathArg, nowSQL, exportAs, language, schemaProvider: schemaProviderArg, }?: {
-    columnTypes?: ColumnTypes | ((t: DefaultColumnTypes) => ColumnTypes) | undefined;
-    snakeCase?: boolean | undefined;
-    filePath?: string | undefined;
-    nowSQL?: string | undefined;
-    exportAs?: string | undefined;
-    language?: string | undefined;
-    schemaProvider?: SchemaProvider | undefined;
-}) => BaseTableClass<ColumnTypes, SchemaProvider>;
+declare function createBaseTable<SchemaProvider extends SchemaProviderBase, ColumnTypes = DefaultColumnTypes>({ columnTypes: columnTypesArg, snakeCase, filePath: filePathArg, nowSQL, exportAs, language, schemaProvider: schemaProviderArg, }?: {
+    columnTypes?: ColumnTypes | ((t: DefaultColumnTypes) => ColumnTypes);
+    snakeCase?: boolean;
+    filePath?: string;
+    nowSQL?: string;
+    exportAs?: string;
+    language?: string;
+    schemaProvider?: SchemaProvider;
+}): BaseTableClass<ColumnTypes, SchemaProvider>;
 
 type QueryMethods<T extends Query> = Record<string, (q: T, ...args: any[]) => any>;
 type QueryOne<T extends Query> = SetQueryReturns<T, Exclude<QueryReturnType, 'all'>>;

package/dist/index.js

@@ -4,7 +4,7 @@ var pqb = require('pqb');
 var orchidCore = require('orchid-core');
 var node_async_hooks = require('node:async_hooks');
 
-const createBaseTable = ({
+function createBaseTable({
   columnTypes: columnTypesArg,
   snakeCase,
   filePath: filePathArg,
@@ -12,7 +12,7 @@ const createBaseTable = ({
   exportAs = "BaseTable",
   language,
   schemaProvider: schemaProviderArg
-} = {}) => {
+} = {}) {
   var _a;
   const columnTypes = typeof columnTypesArg === "function" ? columnTypesArg(
     pqb.columnTypes
@@ -110,7 +110,7 @@ const createBaseTable = ({
   orchidCore.applyMixins(base, [pqb.QueryHooks]);
   base.prototype.types = columnTypes;
   return base;
-};
+}
 
 const getThroughRelation = (table, through) => {
   var _a;