@zhin.js/database 1.0.3 → 1.0.5

package/src/registry.ts

@@ -1,59 +1,59 @@
 import { Database } from './base/database.js';
-import type {MongoDBDialectConfig} from './dialects/mongodb';
-import {RelatedDatabase} from "./type/related/database";
-import {MemoryConfig} from "./types";
-import {DocumentDatabase} from "./type/document/database";
-import {MySQLDialectConfig} from "./dialects/mysql";
-import {PostgreSQLDialectConfig} from "./dialects/pg";
-import {RedisDialectConfig} from "./dialects/redis";
-import {SQLiteDialectConfig} from "./dialects/sqlite";
-import {KeyValueDatabase} from "./type/keyvalue/database";
+import { Memory } from './dialects/memory.js';
+import { MongoDB } from './dialects/mongodb.js';
+import {MySQL} from "./dialects/mysql.js";
+import {PG} from "./dialects/pg.js";
+import {Redis} from "./dialects/redis.js";
+import {Sqlite} from "./dialects/sqlite.js";
 
 /**
  * 数据库注册表接口
  * 支持模块声明扩展
  */
 export interface Databases<S extends Record<string, object> = Record<string, object>> {
-  memory: RelatedDatabase<MemoryConfig,S>;
-  mongodb: DocumentDatabase<MongoDBDialectConfig,S>;
-  mysql: RelatedDatabase<MySQLDialectConfig,S>;
-  pg: RelatedDatabase<PostgreSQLDialectConfig,S>;
-  redis: KeyValueDatabase<RedisDialectConfig,S>;
-  sqlite: RelatedDatabase<SQLiteDialectConfig>;
+  memory: Memory<S>;
+  mongodb: MongoDB<S>;
+  mysql: MySQL<S>;
+  pg: PG<S>;
+  redis: Redis<S>;
+  sqlite: Sqlite<S>;
 }
 
 /**
  * 数据库注册表命名空间
  */
-export type Creator<D, S extends Record<string, object>> = (config: D, definitions?: Database.Definitions<S>) => Database<any, S, any>;
-export type Constructor<D, S extends Record<string, object>> = new (config: D, definitions?: Database.Definitions<S>) => Database<any, S, any>;
-export type Factory<D, S extends Record<string, object>> = Creator<any, S> | Constructor<any, S>;
+export type Factory<D, S extends Record<string, object>,R extends Database<D, S, any>> ={
+  new (config: D, definitions?: Database.DefinitionObj<S>): R;
+}
 
 export namespace Registry {
-  export const factories=new Map();
-  export type Config<T extends Database<any, any, any>> = T extends Database<infer D, any, any> ? D: any;
+  export const factories=new Map<string, Factory<any, any,any>>();
+  export interface Config{
+    memory:import('./dialects/memory.js').MemoryConfig
+    mongodb:import('./dialects/mongodb.js').MongoDBDialectConfig
+    mysql:import('./dialects/mysql.js').MySQLDialectConfig
+    pg:import('./dialects/pg.js').PostgreSQLDialectConfig
+    redis:import('./dialects/redis.js').RedisDialectConfig
+    sqlite:import('./dialects/sqlite.js').SQLiteDialectConfig
+  }
   export type DatabaseType = 'related' | 'document' | 'keyvalue';
   
-  export function register<D extends string, S extends Record<string, object>>(
+  export function register<S extends Record<string, object>,D extends keyof Databases<S>>(
     dialect: D, 
-    factory: Factory<any, S>
+    factory: Factory<Config[D], S,any>
   ): void {
-    factories.set(dialect, factory as Factory<any, S>);
+    factories.set(dialect, factory as Factory<Config[D], S,any>);
   }
   
-  export function create<D extends string, S extends Record<string, object>>(
+  export function create<S extends Record<string, object>, D extends keyof Databases<S>>(
     dialect: D,
-    config: any,
-    definitions?: Database.Definitions<S>
-  ): any {
-    const factory = factories.get(dialect) as Factory<any, S> | undefined;
+    config: Config[D],
+    definitions?: Database.DefinitionObj<S>
+  ): Databases<S>[D] {
+    const factory = factories.get(dialect);
     if (!factory) {
       throw new Error(`database dialect ${dialect} not registered`);
     }
-    return (isConstructor(factory) ? new factory(config, definitions) : factory(config, definitions)) as any;
-  }
-  
-  export function isConstructor<D, S extends Record<string, object>>(fn: Factory<D, S>): fn is Constructor<D, S> {
-    return fn.prototype && fn.prototype.constructor === fn;
+    return new factory(config, definitions) as Databases<S>[D];
   }
 }

package/src/type/document/database.ts

@@ -1,4 +1,4 @@
-import { Database, Dialect } from '../../base';
+import { Database, Dialect } from '../../base/index.js';
 import { DocumentModel } from './model.js';
 import { 
   QueryParams, 
@@ -24,8 +24,8 @@ export class DocumentDatabase<
 > extends Database<D, S, DocumentQueryResult> {
   
   constructor(
-    dialect: Dialect<D,DocumentQueryResult>,
-    definitions?: Database.Definitions<S>,
+    dialect: Dialect<D, S, DocumentQueryResult>,
+    definitions?: Database.DefinitionObj<S>,
   ) {
     super(dialect, definitions);
   }
@@ -38,24 +38,24 @@ export class DocumentDatabase<
   /**
    * 构建查询（重写基类方法）
    */
-  buildQuery<U extends object = any>(params: QueryParams<U>): BuildQueryResult<DocumentQueryResult> {
+  buildQuery<T extends keyof S>(params: QueryParams<S, T>): BuildQueryResult<DocumentQueryResult> {
     switch (params.type) {
       case 'create':
-        return this.buildCreateQuery(params as CreateQueryParams<U>);
+        return this.buildCreateQuery(params as CreateQueryParams<S, T>);
       case 'select':
-        return this.buildSelectQuery(params as SelectQueryParams<U>);
+        return this.buildSelectQuery(params as SelectQueryParams<S, T>);
       case 'insert':
-        return this.buildInsertQuery(params as InsertQueryParams<U>);
+        return this.buildInsertQuery(params as InsertQueryParams<S, T>);
       case 'update':
-        return this.buildUpdateQuery(params as UpdateQueryParams<U>);
+        return this.buildUpdateQuery(params as UpdateQueryParams<S, T>);
       case 'delete':
-        return this.buildDeleteQuery(params as DeleteQueryParams<U>);
+        return this.buildDeleteQuery(params as DeleteQueryParams<S, T>);
       case 'alter':
-        return this.buildAlterQuery(params as AlterQueryParams<U>);
+        return this.buildAlterQuery(params as AlterQueryParams<S, T>);
       case 'drop_table':
-        return this.buildDropTableQuery(params as DropTableQueryParams<U>);
+        return this.buildDropTableQuery(params as DropTableQueryParams<S, T>);
       case 'drop_index':
-        return this.buildDropIndexQuery(params as DropIndexQueryParams);
+        return this.buildDropIndexQuery(params as DropIndexQueryParams<S, T>);
       default:
         throw new Error(`Unsupported query type: ${(params as any).type}`);
     }
@@ -64,10 +64,10 @@ export class DocumentDatabase<
   /**
    * 构建创建集合查询
    */
-  protected buildCreateQuery<T extends object>(params: CreateQueryParams<T>): BuildQueryResult<DocumentQueryResult> {
+  protected buildCreateQuery<T extends keyof S>(params: CreateQueryParams<S, T>): BuildQueryResult<DocumentQueryResult> {
     return {
       query: {
-        collection: params.tableName,
+        collection: params.tableName as string,
         filter: {},
         projection: {}
       },
@@ -78,7 +78,7 @@ export class DocumentDatabase<
   /**
    * 构建查询文档查询
    */
-  protected buildSelectQuery<T extends object>(params: SelectQueryParams<T>): BuildQueryResult<DocumentQueryResult> {
+  protected buildSelectQuery<T extends keyof S>(params: SelectQueryParams<S, T>): BuildQueryResult<DocumentQueryResult> {
     const filter: Record<string, any> = {};
     
     // 转换条件为文档查询格式
@@ -87,7 +87,7 @@ export class DocumentDatabase<
     }
 
     const query: DocumentQueryResult = {
-      collection: params.tableName,
+      collection: params.tableName as string,
       filter
     };
 
@@ -122,10 +122,10 @@ export class DocumentDatabase<
   /**
    * 构建插入文档查询
    */
-  protected buildInsertQuery<T extends object>(params: InsertQueryParams<T>): BuildQueryResult<DocumentQueryResult> {
+  protected buildInsertQuery<T extends keyof S>(params: InsertQueryParams<S, T>): BuildQueryResult<DocumentQueryResult> {
     return {
       query: {
-        collection: params.tableName,
+        collection: params.tableName as string,
         filter: {},
         projection: {}
       },
@@ -136,7 +136,7 @@ export class DocumentDatabase<
   /**
    * 构建更新文档查询
    */
-  protected buildUpdateQuery<T extends object>(params: UpdateQueryParams<T>): BuildQueryResult<DocumentQueryResult> {
+  protected buildUpdateQuery<T extends keyof S>(params: UpdateQueryParams<S, T>): BuildQueryResult<DocumentQueryResult> {
     const filter: Record<string, any> = {};
     
     if (params.conditions) {
@@ -145,7 +145,7 @@ export class DocumentDatabase<
 
     return {
       query: {
-        collection: params.tableName,
+        collection: params.tableName as string,
         filter,
         projection: {}
       },
@@ -156,7 +156,7 @@ export class DocumentDatabase<
   /**
    * 构建删除文档查询
    */
-  protected buildDeleteQuery<T extends object>(params: DeleteQueryParams<T>): BuildQueryResult<DocumentQueryResult> {
+  protected buildDeleteQuery<T extends keyof S>(params: DeleteQueryParams<S, T>): BuildQueryResult<DocumentQueryResult> {
     const filter: Record<string, any> = {};
     
     if (params.conditions) {
@@ -165,7 +165,7 @@ export class DocumentDatabase<
 
     return {
       query: {
-        collection: params.tableName,
+        collection: params.tableName as string,
         filter,
         projection: {}
       },
@@ -176,10 +176,10 @@ export class DocumentDatabase<
   /**
    * 构建修改集合查询
    */
-  protected buildAlterQuery<T extends object>(params: AlterQueryParams<T>): BuildQueryResult<DocumentQueryResult> {
+  protected buildAlterQuery<T extends keyof S>(params: AlterQueryParams<S, T>): BuildQueryResult<DocumentQueryResult> {
     return {
       query: {
-        collection: params.tableName,
+        collection: params.tableName as string,
         filter: {},
         projection: {}
       },
@@ -190,10 +190,10 @@ export class DocumentDatabase<
   /**
    * 构建删除集合查询
    */
-  protected buildDropTableQuery<T extends object>(params: DropTableQueryParams<T>): BuildQueryResult<DocumentQueryResult> {
+  protected buildDropTableQuery<T extends keyof S>(params: DropTableQueryParams<S, T>): BuildQueryResult<DocumentQueryResult> {
     return {
       query: {
-        collection: params.tableName,
+        collection: params.tableName as string,
         filter: {},
         projection: {}
       },
@@ -204,10 +204,10 @@ export class DocumentDatabase<
   /**
    * 构建删除索引查询
    */
-  protected buildDropIndexQuery(params: DropIndexQueryParams): BuildQueryResult<DocumentQueryResult> {
+  protected buildDropIndexQuery<T extends keyof S>(params: DropIndexQueryParams<S, T>): BuildQueryResult<DocumentQueryResult> {
     return {
       query: {
-        collection: params.tableName,
+        collection: params.tableName as string,
         filter: {},
         projection: {}
       },
@@ -264,13 +264,13 @@ export class DocumentDatabase<
   /**
    * 获取模型
    */
-  model<T extends keyof S>(name: T): DocumentModel<S[T], D> {
-    let model = this.models.get(name as string);
+  model<T extends keyof S>(name: T): DocumentModel<D, S, T> {
+    let model = this.models.get(name) as DocumentModel<D, S, T> | undefined;
     if (!model) {
-      model = new DocumentModel(this as unknown as DocumentDatabase<D>, name as string);
-      this.models.set(name as string, model);
+      model = new DocumentModel<D, S, T>(this, name);
+      this.models.set(name, model as any);
     }
-    return model as unknown as DocumentModel<S[T], D>;
+    return model as DocumentModel<D, S, T>;
   }
 
   /**

package/src/type/document/model.ts

@@ -1,4 +1,4 @@
-import { Model} from '../../base';
+import { Model} from '../../base/index.js';
 import { DocumentDatabase } from './database.js';
 import { DocumentQueryResult, Condition } from '../../types.js';
 
@@ -6,10 +6,10 @@ import { DocumentQueryResult, Condition } from '../../types.js';
  * 文档型模型类
  * 继承自 Model，提供文档型数据库特有的操作
  */
-export class DocumentModel<T extends object = object, D =any> extends Model<D, T, DocumentQueryResult> {
+export class DocumentModel<D=any, S extends Record<string, object> = Record<string, object>, T extends keyof S = keyof S> extends Model<D, S, DocumentQueryResult, T> {
   constructor(
-    database: DocumentDatabase<D>,
-    name: string
+    database: DocumentDatabase<D, S>,
+    name: T
   ) {
     super(database, name);
   }
@@ -17,9 +17,9 @@ export class DocumentModel<T extends object = object, D =any> extends Model<D, T
   /**
    * 创建文档
    */
-  async create(document: T): Promise<T & { _id: string }>;
-  async create(documents: T[]): Promise<(T & { _id: string })[]>;
-  async create(documents: T | T[]): Promise<(T & { _id: string }) | (T & { _id: string })[]> {
+  async create(document: S[T]): Promise<S[T] & { _id: string }>;
+  async create(documents: S[T][]): Promise<(S[T] & { _id: string })[]>;
+  async create(documents: S[T] | S[T][]): Promise<(S[T] & { _id: string }) | (S[T] & { _id: string })[]> {
     const isArray = Array.isArray(documents);
     const docs = isArray ? documents : [documents];
     
@@ -33,7 +33,7 @@ export class DocumentModel<T extends object = object, D =any> extends Model<D, T
           operation: 'insertOne',
           filter: {},
           projection: {},
-          collection: this.name,
+          collection: this.name as string,
         },
         [docWithId]
       );
@@ -46,9 +46,9 @@ export class DocumentModel<T extends object = object, D =any> extends Model<D, T
   /**
    * 查找单个文档
    */
-  async selectOne<K extends keyof T>(...fields: Array<K>): Promise<(Pick<T, K> & { _id: string }) | null> {
+  async selectOne<K extends keyof S[T]>(...fields: Array<K>): Promise<(Pick<S[T], K> & { _id: string }) | null> {
     const results = await this.select(...fields).limit(1);
-    return results.length > 0 ? results[0] as (Pick<T, K> & { _id: string }) : null;
+    return results.length > 0 ? results[0] as (Pick<S[T], K> & { _id: string }) : null;
   }
 
   /**
@@ -57,24 +57,24 @@ export class DocumentModel<T extends object = object, D =any> extends Model<D, T
   async selectById(id: string){
     return this.select('_id' as any).where({
       _id: id,
-    }).limit(1).then((results: any) => results[0] || null);
+    } as Condition<S[T]>).limit(1).then((results: any) => results[0] || null);
   }
   /**
    * 根据ID更新文档
    */
-  async updateById(id: string, update: Partial<T>): Promise<number> {
+  async updateById(id: string, update: Partial<S[T]>): Promise<number> {
     return this.update(update).where({
       _id: id,
-    } as Condition<T>)
+    } as Condition<S[T]>)
   }
 
   /**
    * 根据ID删除文档
    */
-  async deleteById(id: string): Promise<number> {
+  async deleteById(id: string): Promise<S[T][] | number> {
     return this.delete({
       _id: id,
-    } as Condition<T>)
+    } as Condition<S[T]>) as Promise<S[T][] | number>;
   }
 
   /**

package/src/type/keyvalue/database.ts

@@ -1,4 +1,4 @@
-import { Database, Dialect } from '../../base';
+import { Database, Dialect } from '../../base/index.js';
 import { KeyValueModel } from './model.js';
 import { 
   QueryParams, 
@@ -25,8 +25,8 @@ export class KeyValueDatabase<
 > extends Database<D, S, KeyValueQueryResult> {
   
   constructor(
-    dialect: Dialect<D,KeyValueQueryResult>,
-    definitions?: Database.Definitions<S>,
+    dialect: Dialect<D, S, KeyValueQueryResult>,
+    definitions?: Database.DefinitionObj<S>,
   ) {
     super(dialect, definitions);
   }
@@ -39,24 +39,24 @@ export class KeyValueDatabase<
   /**
    * 构建查询（重写基类方法）
    */
-  buildQuery<U extends object = any>(params: QueryParams<U>): BuildQueryResult<KeyValueQueryResult> {
+  buildQuery<T extends keyof S>(params: QueryParams<S, T>): BuildQueryResult<KeyValueQueryResult> {
     switch (params.type) {
       case 'create':
-        return this.buildCreateQuery(params as CreateQueryParams<U>);
+        return this.buildCreateQuery(params as CreateQueryParams<S, T>);
       case 'select':
-        return this.buildSelectQuery(params as SelectQueryParams<U>);
+        return this.buildSelectQuery(params as SelectQueryParams<S, T>);
       case 'insert':
-        return this.buildInsertQuery(params as InsertQueryParams<U>);
+        return this.buildInsertQuery(params as InsertQueryParams<S, T>);
       case 'update':
-        return this.buildUpdateQuery(params as UpdateQueryParams<U>);
+        return this.buildUpdateQuery(params as UpdateQueryParams<S, T>);
       case 'delete':
-        return this.buildDeleteQuery(params as DeleteQueryParams<U>);
+        return this.buildDeleteQuery(params as DeleteQueryParams<S, T>);
       case 'alter':
-        return this.buildAlterQuery(params as AlterQueryParams<U>);
+        return this.buildAlterQuery(params as AlterQueryParams<S, T>);
       case 'drop_table':
-        return this.buildDropTableQuery(params as DropTableQueryParams<U>);
+        return this.buildDropTableQuery(params as DropTableQueryParams<S, T>);
       case 'drop_index':
-        return this.buildDropIndexQuery(params as DropIndexQueryParams);
+        return this.buildDropIndexQuery(params as DropIndexQueryParams<S, T>);
       default:
         throw new Error(`Unsupported query type: ${(params as any).type}`);
     }
@@ -65,10 +65,10 @@ export class KeyValueDatabase<
   /**
    * 构建创建桶查询
    */
-  protected buildCreateQuery<T extends object>(params: CreateQueryParams<T>): BuildQueryResult<KeyValueQueryResult> {
+  protected buildCreateQuery<T extends keyof S>(params: CreateQueryParams<S, T>): BuildQueryResult<KeyValueQueryResult> {
     return {
       query: {
-        bucket: params.tableName,
+        bucket: params.tableName as string,
         operation: 'keys'
       },
       params: []
@@ -78,10 +78,10 @@ export class KeyValueDatabase<
   /**
    * 构建查询键值查询
    */
-  protected buildSelectQuery<T extends object>(params: SelectQueryParams<T>): BuildQueryResult<KeyValueQueryResult> {
+  protected buildSelectQuery<T extends keyof S>(params: SelectQueryParams<S, T>): BuildQueryResult<KeyValueQueryResult> {
     // 键值数据库的查询通常是获取所有键或特定键
     const query: KeyValueQueryResult = {
-      bucket: params.tableName,
+      bucket: params.tableName as string,
       operation: 'keys'
     };
 
@@ -103,12 +103,12 @@ export class KeyValueDatabase<
   /**
    * 构建插入键值查询
    */
-  protected buildInsertQuery<T extends object>(params: InsertQueryParams<T>): BuildQueryResult<KeyValueQueryResult> {
+  protected buildInsertQuery<T extends keyof S>(params: InsertQueryParams<S, T>): BuildQueryResult<KeyValueQueryResult> {
     const key = this.extractKeyFromData(params.data);
     
     return {
       query: {
-        bucket: params.tableName,
+        bucket: params.tableName as string,
         operation: 'set',
         key: key || 'default',
         value: params.data
@@ -120,12 +120,12 @@ export class KeyValueDatabase<
   /**
    * 构建更新键值查询
    */
-  protected buildUpdateQuery<T extends object>(params: UpdateQueryParams<T>): BuildQueryResult<KeyValueQueryResult> {
+  protected buildUpdateQuery<T extends keyof S>(params: UpdateQueryParams<S, T>): BuildQueryResult<KeyValueQueryResult> {
     const key = this.extractKeyFromCondition(params.conditions);
     
     return {
       query: {
-        bucket: params.tableName,
+        bucket: params.tableName as string,
         operation: 'set',
         key: key || 'default',
         value: params.update
@@ -137,12 +137,12 @@ export class KeyValueDatabase<
   /**
    * 构建删除键值查询
    */
-  protected buildDeleteQuery<T extends object>(params: DeleteQueryParams<T>): BuildQueryResult<KeyValueQueryResult> {
+  protected buildDeleteQuery<T extends keyof S>(params: DeleteQueryParams<S, T>): BuildQueryResult<KeyValueQueryResult> {
     const key = this.extractKeyFromCondition(params.conditions);
     
     return {
       query: {
-        bucket: params.tableName,
+        bucket: params.tableName as string,
         operation: 'delete',
         key: key || 'default'
       },
@@ -153,10 +153,10 @@ export class KeyValueDatabase<
   /**
    * 构建修改桶查询
    */
-  protected buildAlterQuery<T extends object>(params: AlterQueryParams<T>): BuildQueryResult<KeyValueQueryResult> {
+  protected buildAlterQuery<T extends keyof S>(params: AlterQueryParams<S, T>): BuildQueryResult<KeyValueQueryResult> {
     return {
       query: {
-        bucket: params.tableName,
+        bucket: params.tableName as string,
         operation: 'keys'
       },
       params: [params.alterations]
@@ -166,10 +166,10 @@ export class KeyValueDatabase<
   /**
    * 构建删除桶查询
    */
-  protected buildDropTableQuery<T extends object>(params: DropTableQueryParams<T>): BuildQueryResult<KeyValueQueryResult> {
+  protected buildDropTableQuery<T extends keyof S>(params: DropTableQueryParams<S, T>): BuildQueryResult<KeyValueQueryResult> {
     return {
       query: {
-        bucket: params.tableName,
+        bucket: params.tableName as string,
         operation: 'clear'
       },
       params: []
@@ -179,10 +179,10 @@ export class KeyValueDatabase<
   /**
    * 构建删除索引查询
    */
-  protected buildDropIndexQuery(params: DropIndexQueryParams): BuildQueryResult<KeyValueQueryResult> {
+  protected buildDropIndexQuery<T extends keyof S>(params: DropIndexQueryParams<S, T>): BuildQueryResult<KeyValueQueryResult> {
     return {
       query: {
-        bucket: params.tableName,
+        bucket: params.tableName as string,
         operation: 'keys'
       },
       params: [params.indexName]
@@ -242,13 +242,13 @@ export class KeyValueDatabase<
   /**
    * 获取模型
    */
-  model<T extends keyof S>(name: T): KeyValueModel<S[T], D> {
-    let model = this.models.get(name as string);
+  model<T extends keyof S>(name: T): KeyValueModel<D, S, T> {
+    let model = this.models.get(name) as KeyValueModel<D, S, T> | undefined;
     if (!model) {
-      model = new KeyValueModel(this as unknown as KeyValueDatabase<D>, name as string);
-      this.models.set(name as string, model);
+      model = new KeyValueModel<D, S, T>(this, name);
+      this.models.set(name, model as any);
     }
-    return model as unknown as KeyValueModel<S[T], D>;
+    return model as KeyValueModel<D, S, T>;
   }
 
   /**