@zhin.js/database 1.0.45 → 1.0.48

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/database",
-  "version": "1.0.45",
+  "version": "1.0.48",
   "description": "Universal database abstraction layer for Zhin.js - supports SQLite, MySQL, PostgreSQL, MongoDB, Redis",
   "type": "module",
   "main": "./lib/index.js",
@@ -13,6 +13,9 @@
       "development": "./src/index.ts"
     }
   },
+  "files": [
+    "lib"
+  ],
   "engines": {
     "node": ">=22.5.0"
   },
@@ -21,7 +24,7 @@
     "mysql2": "^3.9.8",
     "pg": "^7.1.2",
     "redis": "latest",
-    "zhin.js": "1.0.58"
+    "zhin.js": "1.0.61"
   },
   "peerDependenciesMeta": {
     "mysql2": {
@@ -43,8 +46,8 @@
     "mysql2": "latest",
     "pg": "latest",
     "redis": "latest",
-    "typescript": "^5.3.0",
-    "zhin.js": "1.0.58"
+    "typescript": "^5.9.3",
+    "zhin.js": "1.0.61"
   },
   "repository": {
     "type": "git",

package/CHANGELOG.md

@@ -1,293 +0,0 @@
-# @zhin.js/database
-
-## 1.0.45
-
-### Patch Changes
-
-- zhin.js@1.0.58
-
-## 1.0.44
-
-### Patch Changes
-
-- zhin.js@1.0.57
-
-## 1.0.43
-
-### Patch Changes
-
-- zhin.js@1.0.56
-
-## 1.0.42
-
-### Patch Changes
-
-- zhin.js@1.0.55
-
-## 1.0.41
-
-### Patch Changes
-
-- 16c8f92: fix: 统一发一次版
-- Updated dependencies [16c8f92]
-  - zhin.js@1.0.54
-
-## 1.0.40
-
-### Patch Changes
-
-- daee7f6: fix: database error
-  - zhin.js@1.0.53
-
-## 1.0.39
-
-### Patch Changes
-
-- Updated dependencies [bb6bfa8]
-- Updated dependencies [bb6bfa8]
-  - zhin.js@1.0.52
-
-## 1.0.38
-
-### Patch Changes
-
-- zhin.js@1.0.51
-
-## 1.0.37
-
-### Patch Changes
-
-- zhin.js@1.0.50
-
-## 1.0.36
-
-### Patch Changes
-
-- zhin.js@1.0.49
-
-## 1.0.35
-
-### Patch Changes
-
-- zhin.js@1.0.48
-
-## 1.0.34
-
-### Patch Changes
-
-- Updated dependencies [de3e352]
-  - zhin.js@1.0.47
-
-## 1.0.33
-
-### Patch Changes
-
-- Updated dependencies [7394603]
-  - zhin.js@1.0.46
-
-## 1.0.32
-
-### Patch Changes
-
-- zhin.js@1.0.45
-
-## 1.0.31
-
-### Patch Changes
-
-- zhin.js@1.0.44
-
-## 1.0.30
-
-### Patch Changes
-
-- Updated dependencies [72ec4ba]
-  - zhin.js@1.0.43
-
-## 1.0.29
-
-### Patch Changes
-
-- zhin.js@1.0.42
-
-## 1.0.28
-
-### Patch Changes
-
-- zhin.js@1.0.41
-
-## 1.0.27
-
-### Patch Changes
-
-- Updated dependencies [7ef9057]
-  - zhin.js@1.0.40
-
-## 1.0.26
-
-### Patch Changes
-
-- zhin.js@1.0.39
-
-## 1.0.25
-
-### Patch Changes
-
-- Updated dependencies [ab5c54a]
-  - zhin.js@1.0.38
-
-## 1.0.24
-
-### Patch Changes
-
-- zhin.js@1.0.37
-
-## 1.0.23
-
-### Patch Changes
-
-- zhin.js@1.0.36
-
-## 1.0.22
-
-### Patch Changes
-
-- zhin.js@1.0.35
-
-## 1.0.21
-
-### Patch Changes
-
-- zhin.js@1.0.34
-
-## 1.0.20
-
-### Patch Changes
-
-- zhin.js@1.0.33
-
-## 1.0.19
-
-### Patch Changes
-
-- zhin.js@1.0.32
-
-## 1.0.18
-
-### Patch Changes
-
-- zhin.js@1.0.31
-
-## 1.0.17
-
-### Patch Changes
-
-- Updated dependencies [460a6c6]
-  - zhin.js@1.0.30
-
-## 1.0.16
-
-### Patch Changes
-
-- zhin.js@1.0.29
-
-## 1.0.15
-
-### Patch Changes
-
-- zhin.js@1.0.28
-
-## 1.0.14
-
-### Patch Changes
-
-- Updated dependencies [b27e633]
-  - zhin.js@1.0.27
-
-## 1.0.13
-
-### Patch Changes
-
-- 106d357: fix: ai
-- Updated dependencies [106d357]
-  - zhin.js@1.0.26
-
-## 1.0.12
-
-### Patch Changes
-
-- 26d2942: fix: ai
-- 6b02c41: fix: ai
-- Updated dependencies [26d2942]
-- Updated dependencies [6b02c41]
-  - zhin.js@1.0.25
-
-## 1.0.11
-
-### Patch Changes
-
-- zhin.js@1.0.24
-
-## 1.0.10
-
-### Patch Changes
-
-- Updated dependencies [52ae08a]
-  - zhin.js@1.0.23
-
-## 1.0.9
-
-### Patch Changes
-
-- Updated dependencies [26aba27]
-  - zhin.js@1.0.22
-
-## 1.0.8
-
-### Patch Changes
-
-- zhin.js@1.0.21
-
-## 1.0.7
-
-### Patch Changes
-
-- a3b7673: fix: 调整依赖项
-- Updated dependencies [5141137]
-  - zhin.js@1.0.20
-
-## 1.0.6
-
-### Patch Changes
-
-- f9faa1d: fix: test release
-
-## 1.0.5
-
-### Patch Changes
-
-- d16a69c: fix: test trust publish
-
-## 1.0.4
-
-### Patch Changes
-
-- 547028f: fix: 优化包结构,优化客户端支持
-
-## 1.0.3
-
-### Patch Changes
-
-- 551c4d2: fix: 插件支持配置文件读取,优化 test 用例
-
-## 1.0.2
-
-### Patch Changes
-
-- 47845fb: fix: err
-
-## 1.0.1
-
-### Patch Changes
-
-- 727963c: fix: 修复 sqlite 数据错误;优化 console 展示

package/src/base/database.ts

@@ -1,272 +0,0 @@
-import type { Dialect } from './dialect.js';
-import { Model } from './model.js';
-import { Definition, QueryParams, AlterDefinition, Condition, BuildQueryResult, Transaction, TransactionOptions, TransactionContext } from '../types.js';
-import * as QueryClasses from './query-classes.js';
-import { TransactionContextImpl } from './transaction.js';
-
-/**
- * 查询日志处理器类型
- */
-export type QueryLogger = (info: {
-  sql: string;
-  params?: any[];
-  duration: number;
-  error?: Error;
-}) => void;
-
-/**
- * 默认查询日志处理器
- */
-const defaultLogger: QueryLogger = ({ sql, params, duration, error }) => {
-  const paramStr = params?.length ? ` [${JSON.stringify(params)}]` : '';
-  const status = error ? `❌ ERROR: ${error.message}` : `✅ ${duration}ms`;
-  console.log(`[SQL] ${sql}${paramStr} → ${status}`);
-};
-
-/**
- * 基础数据库抽象类
- * 定义所有数据库类型的通用接口和行为
- */
-export abstract class Database<D=any,S extends Record<string, object>=Record<string, object>,Q=string> {
-  protected hasStarted = false;
-  public readonly definitions: Database.Definitions<S>=new Database.Definitions<S>();
-  public readonly models: Database.Models<S,D,Q> = new Database.Models<S,D,Q>();
-  
-  private _logger?: QueryLogger;
-  private _logging = false;
-  
-  constructor(
-    public readonly dialect: Dialect<D,S,Q>,
-    definitions?: Database.DefinitionObj<S>,
-  ) {
-    for (const key in definitions) {
-      this.definitions.set(key, definitions[key]);
-    }
-  }
-  
-  // ============================================================================
-  // Query Logging
-  // ============================================================================
-  
-  /**
-   * 启用查询日志
-   * @param handler 自定义日志处理器，不传则使用默认控制台输出
-   */
-  enableLogging(handler?: QueryLogger): this {
-    this._logging = true;
-    this._logger = handler ?? defaultLogger;
-    return this;
-  }
-  
-  /**
-   * 禁用查询日志
-   */
-  disableLogging(): this {
-    this._logging = false;
-    return this;
-  }
-  
-  /**
-   * 查询日志是否启用
-   */
-  get isLogging(): boolean {
-    return this._logging;
-  }
-  
-  /**
-   * 记录查询日志
-   */
-  protected log(sql: string, params?: any[], duration?: number, error?: Error): void {
-    if (this._logging && this._logger) {
-      this._logger({ sql: String(sql), params, duration: duration ?? 0, error });
-    }
-  }
-  /**
-   * 数据库是否已启动
-   */
-  get isStarted(): boolean {
-    return this.dialect !== undefined && this.dialect.isConnected();
-  }
-
-  /**
-   * 启动数据库
-   */
-  async start(): Promise<void> {
-    await this.dialect.connect();
-    await this.initialize();
-    this.hasStarted = true;
-  }
-
-  /**
-   * 停止数据库
-   */
-  async stop(): Promise<void> {
-    await this.dialect.disconnect();
-    this.hasStarted = false;
-    console.log(`Database disconnected from dialect: ${this.dialect.name}`);
-  }
-
-  /**
-   * 健康检查
-   */
-  async healthCheck(): Promise<boolean> {
-    return this.dialect.healthCheck();
-  }
-
-  /**
-   * 执行原生查询
-   */
-  async query<U = any>(sql: Q, params?: any[]): Promise<U> {
-    if (!this.isStarted) {
-      throw new Error('Database not started');
-    }
-    const start = Date.now();
-    try {
-      const result = await this.dialect.query<U>(sql, params);
-      this.log(String(sql), params, Date.now() - start);
-      return result;
-    } catch (error) {
-      this.log(String(sql), params, Date.now() - start, error as Error);
-      throw error;
-    }
-  }
-  abstract buildQuery<T extends keyof S>(params: QueryParams<S,T>): BuildQueryResult<Q>;
-  /**
-   * 获取数据库方言名称
-   */
-  get dialectName(): string {
-    if(this.dialect === undefined){
-      throw new Error('Database not started');
-    }
-    return this.dialect.name;
-  }
-
-  /**
-   * 获取数据库配置
-   */
-  get config(): any {
-    if(this.dialect === undefined){
-      throw new Error('Database not started');
-    }
-    return this.dialect.config;
-  }
-
-  /**
-   * 抽象方法：初始化数据库
-   */
-  protected abstract initialize(): Promise<void>;
-  define<K extends keyof S>(name: K, definition: Definition<S[K]>) {
-    this.definitions.set(name, definition);
-  }
-  /**
-   * 删除表定义
-   */
-  destroy<K extends keyof S>(name: K) {
-    this.definitions.delete(name);
-  }
-  
-  /**
-   * 创建表
-   */
-  create<T extends keyof S>(
-    name: T,
-    definition: Definition<S[T]>
-  ): QueryClasses.Creation<S,T,D,Q> {
-    return new QueryClasses.Creation<S,T,D,Q>(this, name, definition);
-  }
-  alter<T extends keyof S>(name: T, alterations: AlterDefinition<S[T]>): QueryClasses.Alteration<S,T,D,Q>{
-    return new QueryClasses.Alteration<S,T,D,Q>(this, name, alterations);
-  }
-  select<T extends keyof S, K extends keyof S[T]>(name: T, fields: Array<K>): QueryClasses.Selection<S,T,K,D,Q>{
-    return new QueryClasses.Selection<S,T,K,D,Q>(this, name, fields);
-  }
-  insert<T extends keyof S>(name: T, data: S[T]): QueryClasses.Insertion<S,T,D,Q>{
-    return new QueryClasses.Insertion<S,T,D,Q>(this, name, data);
-  }
-  update<T extends keyof S>(name: T, update: Partial<S[T]>): QueryClasses.Updation<S,T,D,Q>{
-    return new QueryClasses.Updation<S,T,D,Q>(this, name, update);
-  }
-  delete<T extends keyof S>(name: T, condition: Condition<S[T]>): QueryClasses.Deletion<S,T,D,Q>{
-    return new QueryClasses.Deletion<S,T,D,Q>(this, name).where(condition);
-  }
-  
-  /**
-   * 批量插入
-   */
-  insertMany<T extends keyof S>(name: T, data: S[T][]): QueryClasses.BatchInsertion<S,T,D,Q>{
-    return new QueryClasses.BatchInsertion<S,T,D,Q>(this, name, data);
-  }
-  
-  /**
-   * 聚合查询
-   */
-  aggregate<T extends keyof S>(name: T): QueryClasses.Aggregation<S,T,D,Q>{
-    return new QueryClasses.Aggregation<S,T,D,Q>(this, name);
-  }
-  
-  // ============================================================================
-  // Transaction Support
-  // ============================================================================
-  
-  /**
-   * 是否支持事务
-   */
-  supportsTransactions(): boolean {
-    return this.dialect.supportsTransactions();
-  }
-  
-  /**
-   * 在事务中执行操作
-   * 自动处理 commit 和 rollback
-   * 支持链式调用：trx.insert(), trx.select(), trx.update(), trx.delete()
-   */
-  async transaction<R>(callback: (trx: TransactionContext<S>) => Promise<R>, options?: TransactionOptions): Promise<R> {
-    if (!this.isStarted) {
-      throw new Error('Database not started');
-    }
-    const trx = await this.dialect.beginTransaction(options);
-    const trxContext = new TransactionContextImpl<S>(this as any, trx);
-    try {
-      const result = await callback(trxContext);
-      await trxContext.commit();
-      return result;
-    } catch (error) {
-      await trxContext.rollback();
-      throw error;
-    }
-  }
-  
-  /**
-   * 抽象方法：获取所有模型名称
-   */
-  abstract getModelNames(): string[];
-
-  /**
-   * 抽象方法：清理资源
-   */
-  async dispose(): Promise<void> {
-    this.models.clear();
-    if(this.dialect === undefined){
-      throw new Error('Database not started');
-    }
-    await this.dialect.dispose();
-  }
-}
-export namespace Database {
-  export class Definitions<S extends Record<string, object>> extends Map<keyof S, Definition<S[keyof S]>> {
-    constructor() {
-      super();
-    }
-  }
-  export class Models<S extends Record<string, object>,D=any,Q=string> extends Map<keyof S, Model<D,S,Q,keyof S>> {
-    constructor() {
-      super();
-    }
-    get<K extends keyof S>(key: K): Model<D,S,Q,K> | undefined {
-      return super.get(key) as Model<D,S,Q,K> | undefined;
-    }
-  }
-  export type DefinitionObj<S extends Record<string, object>> = {
-    [K in keyof S]: Definition<S[K]>;
-  };
-}

package/src/base/dialect.ts

@@ -1,89 +0,0 @@
-// ============================================================================
-// Database Dialect Interface
-// ============================================================================
-
-import { Transaction, TransactionOptions, IsolationLevel } from '../types.js';
-
-// ============================================================================
-// SQL Builder Base Class
-// ============================================================================
-
-export abstract class Dialect<T,S extends Record<string, object>,Q> {
-  public readonly name: string;
-  public readonly config: T;
-  
-  protected constructor(name: string, config: T) {
-    this.name = name;
-    this.config = config;
-  }
-  
-  // Abstract methods that must be implemented by concrete dialects
-  abstract isConnected(): boolean;
-  abstract connect(): Promise<void>;
-  abstract disconnect(): Promise<void>;
-  abstract healthCheck(): Promise<boolean>;
-  abstract query<U = any>(query: Q, params?: any[]): Promise<U>;
-  abstract mapColumnType(type: string): string;
-  abstract quoteIdentifier(identifier: string|number|symbol): string;
-  abstract getParameterPlaceholder(index: number): string;
-  abstract getStatementTerminator(): string;
-  abstract formatBoolean(value: boolean): string;
-  abstract formatDate(value: Date): string;
-  abstract formatJson(value: any): string;
-  abstract escapeString(value: string): string;
-  abstract formatDefaultValue(value: any): string;
-  abstract formatLimit(limit: number): string;
-  abstract formatOffset(offset: number): string;
-  abstract formatLimitOffset(limit: number, offset: number): string;
-  abstract formatCreateTable<T extends keyof S>(tableName: T, columns: string[]): string;
-  abstract formatAlterTable<T extends keyof S>(tableName: T, alterations: string[]): string;
-  abstract formatDropTable<T extends keyof S>(tableName: T, ifExists?: boolean): string;
-  abstract formatDropIndex<T extends keyof S>(indexName: string, tableName: T, ifExists?: boolean): string;
-  abstract dispose(): Promise<void>;
-  
-  // ============================================================================
-  // Transaction Support (optional, default implementations)
-  // ============================================================================
-  
-  /**
-   * 是否支持事务
-   */
-  supportsTransactions(): boolean {
-    return false;
-  }
-  
-  /**
-   * 开始事务
-   */
-  async beginTransaction(options?: TransactionOptions): Promise<Transaction> {
-    throw new Error(`Dialect ${this.name} does not support transactions`);
-  }
-  
-  /**
-   * 格式化事务隔离级别
-   */
-  formatIsolationLevel(level: IsolationLevel): string {
-    return level.replace(/_/g, ' ');
-  }
-  
-  // ============================================================================
-  // Aggregation Support
-  // ============================================================================
-  
-  /**
-   * 格式化聚合函数
-   */
-  formatAggregate(fn: string, field: string, alias?: string): string {
-    const fnUpper = fn.toUpperCase();
-    const aliasClause = alias ? ` AS ${this.quoteIdentifier(alias)}` : '';
-    return `${fnUpper}(${field === '*' ? '*' : this.quoteIdentifier(field)})${aliasClause}`;
-  }
-}
-export namespace Dialect {
-  export type Creator<D,S extends Record<string, object>,Q> = (config: D) => Dialect<D,S,Q>;
-  export type Constructor<D,S extends Record<string, object>,Q> = new (config: D) => Dialect<D,S,Q>;
-  export type Factory<D,S extends Record<string, object>,Q> = Creator<D,S,Q> | Constructor<D,S,Q>;
-  export function isConstructor<D,S extends Record<string, object>,Q>(fn: Factory<D,S,Q>): fn is Constructor<D,S,Q> {
-    return fn.prototype && fn.prototype.constructor === fn;
-  }
-}

package/src/base/index.ts

@@ -1,6 +0,0 @@
-export * from './dialect.js';
-export * from './database.js';
-export * from './model.js';
-export * from './thenable.js';
-export * from './query-classes.js';
-export * from './transaction.js';