@flumens/models 0.13.0 → 0.14.0

package/dist/Stores/SQLiteStore.d.ts

@@ -1,5 +1,5 @@
 import { BuildColumns, ColumnBuilderBase, ColumnBuilderBaseConfig, ColumnDataType, InferModelFromColumns, SQL } from 'drizzle-orm';
-import { SQLiteSelect, SQLiteDelete, SQLiteTable } from 'drizzle-orm/sqlite-core';
+import { SQLiteSelect, SQLiteDelete, SQLiteTable, SQLiteTableWithColumns } from 'drizzle-orm/sqlite-core';
 import { Deferred } from '@flumens/utils';
 import SQLiteDatabase from './SQLiteDatabase';
 import Store from './Store';
@@ -12,12 +12,6 @@ export declare const jsonb: <TData>(name: string) => import("drizzle-orm/sqlite-
     driverParam: string;
     enumValues: undefined;
 }>;
-type SQLiteStoreOptions = {
-    db: SQLiteDatabase;
-    name: string;
-    debug?: boolean;
-    columns?: any;
-};
 export declare const defaultCols: () => {
     id: import("drizzle-orm/sqlite-core").SQLiteTextBuilderInitial<"", [string, ...string[]], undefined>;
     cid: import("drizzle-orm").HasDefault<import("drizzle-orm").NotNull<import("drizzle-orm").IsPrimaryKey<import("drizzle-orm").NotNull<import("drizzle-orm/sqlite-core").SQLiteTextBuilderInitial<"", [string, ...string[]], undefined>>>>>;
@@ -36,14 +30,25 @@ export declare const defaultCols: () => {
 type SelectQueryFn = (q: SQLiteSelect) => SQLiteSelect;
 type DeleteQueryFn = (q: SQLiteDelete) => SQLiteDelete;
 export type ColumnMap<T extends Record<string, ColumnBuilderBase<ColumnBuilderBaseConfig<ColumnDataType, string>, object>>> = InferModelFromColumns<BuildColumns<'', T, 'sqlite'>>;
-type DefaultCols = ColumnMap<ReturnType<typeof defaultCols>>;
-export default class SQLiteStore<T = DefaultCols> implements Store {
-    private readonly name;
-    private readonly db;
-    private readonly debug;
-    readonly table: SQLiteTable;
+export type InferSelectModel<T extends SQLiteTable<any>> = T['$inferSelect'];
+type SQLiteStoreOptions<TColumns = ReturnType<typeof defaultCols>> = {
+    db: SQLiteDatabase;
+    name: string;
+    debug?: boolean;
+    columns?: TColumns;
+};
+export default class SQLiteStore<TColumns extends Record<string, ColumnBuilderBase<ColumnBuilderBaseConfig<ColumnDataType, string>, object>> = ReturnType<typeof defaultCols>, T = ColumnMap<TColumns>> implements Store {
+    readonly name: string;
+    readonly db: SQLiteDatabase;
+    readonly table: SQLiteTableWithColumns<{
+        name: string;
+        schema: undefined;
+        columns: BuildColumns<string, TColumns, 'sqlite'>;
+        dialect: 'sqlite';
+    }>;
     readonly ready: Deferred<boolean>;
-    constructor({ db, name, debug, columns, }: SQLiteStoreOptions);
+    private readonly debug;
+    constructor({ db, name, debug, columns, }: SQLiteStoreOptions<TColumns>);
     private init;
     save(values: T | T[]): Promise<void>;
     find(q: string | Partial<T> | SelectQueryFn): Promise<T>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flumens/models",
-  "version": "0.13.0",
+  "version": "0.14.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {