orchid-orm 1.19.0 → 1.20.1

package/dist/index.d.ts

@@ -1,6 +1,6 @@
-import { Query, QueryWithTable, SetQueryTableAlias, RelationJoinQuery, WhereArg, UpdateData, CreateData, AddQueryDefaults, Db, IsolationLevel, TransactionOptions, Adapter, FromArgs, FromResult, AdapterOptions, QueryLogOptions, NoPrimaryKeyOption, RelationQuery, RelationConfigBase, RelationQueryBase, ComputedColumnsBase, MapTableScopesOption, QueryData, QueryBase, DbTableOptionScopes, DefaultColumnTypes, QueryBeforeHook, QueryAfterHook, AfterHook, WhereResult, MergeQuery, SetQueryReturns, QueryReturnType } from 'pqb';
+import { Query, QueryWithTable, SetQueryTableAlias, RelationJoinQuery, WhereArg, UpdateData, CreateData, AddQueryDefaults, Db, IsolationLevel, TransactionOptions, Adapter, FromArgs, FromResult, AdapterOptions, QueryLogOptions, NoPrimaryKeyOption, RelationQuery, RelationConfigBase, RelationQueryBase, ComputedColumnsBase, MapTableScopesOption, 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 } from 'orchid-core';
+import { ColumnsShapeBase, EmptyObject, MaybeArray, StringKey, CoreQueryScopes, ColumnShapeQueryType, ColumnShapeOutput, ColumnShapeInput, ColumnSchemaConfig } from 'orchid-core';
 
 type RelationCommonOptions<Related extends TableClass = TableClass, Scope extends Query = Query> = {
     scope?: ScopeFn<Related, Scope>;
@@ -374,7 +374,6 @@ 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 SchemaProviderBase = any;
 interface BaseTableInstance<ColumnTypes> {
     table: string;
     columns: ColumnsShapeBase;
@@ -530,23 +529,25 @@ interface BaseTableInstance<ColumnTypes> {
     afterDelete: AfterSelectableHookMethod;
     afterDeleteCommit: AfterSelectableHookMethod;
 }
-interface BaseTableClass<ColumnTypes, SchemaProvider extends SchemaProviderBase> {
+interface BaseTableClass<SchemaConfig extends ColumnSchemaConfig, ColumnTypes> {
     nowSQL: string | undefined;
     exportAs: string;
-    schema: SchemaProvider;
     getFilePath(): string;
     new (): BaseTableInstance<ColumnTypes>;
     instance(): BaseTableInstance<ColumnTypes>;
+    inputSchema: SchemaConfig['inputSchema'];
+    outputSchema: SchemaConfig['outputSchema'];
+    querySchema: SchemaConfig['querySchema'];
 }
-declare function createBaseTable<SchemaProvider extends SchemaProviderBase, ColumnTypes = DefaultColumnTypes>({ columnTypes: columnTypesArg, snakeCase, filePath: filePathArg, nowSQL, exportAs, language, schemaProvider: schemaProviderArg, }?: {
-    columnTypes?: ColumnTypes | ((t: DefaultColumnTypes) => ColumnTypes);
+declare function createBaseTable<SchemaConfig extends ColumnSchemaConfig = DefaultSchemaConfig, ColumnTypes = DefaultColumnTypes<SchemaConfig>>({ schemaConfig, columnTypes: columnTypesArg, snakeCase, filePath: filePathArg, nowSQL, exportAs, language, }?: {
+    schemaConfig?: SchemaConfig;
+    columnTypes?: ColumnTypes | ((t: DefaultColumnTypes<SchemaConfig>) => ColumnTypes);
     snakeCase?: boolean;
     filePath?: string;
     nowSQL?: string;
     exportAs?: string;
     language?: string;
-    schemaProvider?: SchemaProvider;
-}): BaseTableClass<ColumnTypes, SchemaProvider>;
+}): BaseTableClass<SchemaConfig, ColumnTypes>;
 
 type QueryMethods<T extends Query> = Record<string, (q: T, ...args: any[]) => any>;
 type QueryOne<T extends Query> = SetQueryReturns<T, Exclude<QueryReturnType, 'all'>>;