@zhin.js/database 1.0.2 → 1.0.4

package/src/registry.ts

@@ -1,13 +1,13 @@
 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 type {MongoDBDialectConfig} from './dialects/mongodb.js';
+import {RelatedDatabase} from "./type/related/database.js";
+import {MemoryConfig} from "./types.js";
+import {DocumentDatabase} from "./type/document/database.js";
+import {MySQLDialectConfig} from "./dialects/mysql.js";
+import {PostgreSQLDialectConfig} from "./dialects/pg.js";
+import {RedisDialectConfig} from "./dialects/redis.js";
+import {SQLiteDialectConfig} from "./dialects/sqlite.js";
+import {KeyValueDatabase} from "./type/keyvalue/database.js";
 
 /**
  * 数据库注册表接口
@@ -25,8 +25,8 @@ export interface Databases<S extends Record<string, object> = Record<string, obj
 /**
  * 数据库注册表命名空间
  */
-export type Creator<D, S extends Record<string, object>> = (config: D, schemas?: Database.Schemas<S>) => Database<any, S, any>;
-export type Constructor<D, S extends Record<string, object>> = new (config: D, schemas?: Database.Schemas<S>) => Database<any, S, any>;
+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 namespace Registry {
@@ -44,13 +44,13 @@ export namespace Registry {
   export function create<D extends string, S extends Record<string, object>>(
     dialect: D,
     config: any,
-    schemas?: Database.Schemas<S>
+    definitions?: Database.Definitions<S>
   ): any {
     const factory = factories.get(dialect) as Factory<any, S> | undefined;
     if (!factory) {
       throw new Error(`database dialect ${dialect} not registered`);
     }
-    return (isConstructor(factory) ? new factory(config, schemas) : factory(config, schemas)) as any;
+    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> {

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, 
@@ -25,9 +25,9 @@ export class DocumentDatabase<
   
   constructor(
     dialect: Dialect<D,DocumentQueryResult>,
-    schemas?: Database.Schemas<S>,
+    definitions?: Database.Definitions<S>,
   ) {
-    super(dialect, schemas);
+    super(dialect, definitions);
   }
 
   protected async initialize(): Promise<void> {
@@ -277,7 +277,7 @@ export class DocumentDatabase<
    * 获取所有模型名称
    */
   getModelNames(): string[] {
-    return Object.keys(this.schemas || {});
+    return Object.keys(this.definitions || {});
   }
 }
 

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';
 

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, 
@@ -26,9 +26,9 @@ export class KeyValueDatabase<
   
   constructor(
     dialect: Dialect<D,KeyValueQueryResult>,
-    schemas?: Database.Schemas<S>,
+    definitions?: Database.Definitions<S>,
   ) {
-    super(dialect, schemas);
+    super(dialect, definitions);
   }
 
   protected async initialize(): Promise<void> {
@@ -255,7 +255,7 @@ export class KeyValueDatabase<
    * 获取所有模型名称
    */
   getModelNames(): string[] {
-    return Object.keys(this.schemas || {});
+    return Object.keys(this.definitions || {});
   }
 }
 

package/src/type/keyvalue/model.ts

@@ -1,6 +1,6 @@
-import { Model, Dialect, Database } from '../../base';
+import { Model, } from '../../base/index.js';
 import { KeyValueDatabase } from './database.js';
-import { Condition, KeyValueQueryResult } from '../../types.js';
+import { KeyValueQueryResult } from '../../types.js';
 
 /**
  * 键值模型类

package/src/type/related/database.ts

@@ -1,4 +1,4 @@
-import { Database,Dialect } from '../../base';
+import { Database,Dialect } from '../../base/index.js';
 import { RelatedModel } from './model.js';
 import {
   QueryParams,
@@ -13,9 +13,9 @@ import {
   DropIndexQueryParams,
   Condition,
   Column,
-  AddSchema,
-  ModifySchema,
-  DropSchema,
+  AddDefinition,
+  ModifyDefinition,
+  DropDefinition,
   isCreateQuery,
   isSelectQuery,
   isInsertQuery,
@@ -37,15 +37,15 @@ export class RelatedDatabase<
   
   constructor(
     dialect: Dialect<D,string>,
-    schemas?: Database.Schemas<S>,
+    definitions?: Database.Definitions<S>,
   ) {
-    super(dialect,schemas); 
+    super(dialect,definitions); 
   }
 
   protected async initialize(): Promise<void> {
     // 自动创建表
-    for (const [tableName, schema] of Object.entries(this.schemas || {})) {
-      await this.create(tableName, schema);
+    for (const [tableName, definition] of Object.entries(this.definitions || {})) {
+      await this.create(tableName, definition);
     }
   }
 
@@ -77,7 +77,7 @@ export class RelatedDatabase<
   // ========================================================================
   
   protected buildCreateQuery<T extends object>(params: CreateQueryParams<T>): BuildQueryResult<string> {
-    const columnDefs = Object.entries(params.schema).map(([field, column]) => this.formatColumnDefinition(field,column as Column));
+    const columnDefs = Object.entries(params.definition).map(([field, column]) => this.formatColumnDefinition(field,column as Column));
     const query = this.dialect.formatCreateTable(params.tableName, columnDefs);
     return { query, params: [] };
   }
@@ -194,7 +194,7 @@ export class RelatedDatabase<
   // ========================================================================
   
   protected buildAlterQuery<T extends object>(params: AlterQueryParams<T>): BuildQueryResult<string> {
-    const alterations = Object.entries(params.alterations).map(([field,alteration]) => this.formatAlteration(field, alteration as AddSchema<T> | ModifySchema<T> | DropSchema));
+    const alterations = Object.entries(params.alterations).map(([field,alteration]) => this.formatAlteration(field, alteration as AddDefinition<T> | ModifyDefinition<T> | DropDefinition));
     const query = this.dialect.formatAlterTable(params.tableName, alterations);
     return { query, params: [] };
   }
@@ -234,8 +234,8 @@ export class RelatedDatabase<
     
     return `${name} ${type}${length}${primary}${unique}${nullable}${defaultVal}`;
   }
-  
-  protected formatAlteration<T=any>(field:string,alteration: AddSchema<T> | ModifySchema<T> | DropSchema): string {
+
+  protected formatAlteration<T=any>(field:string,alteration: AddDefinition<T> | ModifyDefinition<T> | DropDefinition): string {
     const name = this.dialect.quoteIdentifier(field);
     
     switch (alteration.action) {
@@ -387,6 +387,6 @@ export class RelatedDatabase<
    * 获取所有模型名称
    */
   getModelNames(): string[] {
-    return Object.keys(this.schemas || {});
+    return Object.keys(this.definitions || {});
   }
 }

package/src/type/related/model.ts

@@ -1,4 +1,4 @@
-import { Model} from '../../base';
+import { Model} from '../../base/index.js';
 import { RelatedDatabase } from './database.js';
 import { Condition } from '../../types.js';
 

package/src/types.ts

@@ -31,7 +31,7 @@ export interface Column<T = any> {
   length?: number;
 }
 
-export type Schema<T extends object=object> = {
+export type Definition<T extends object=object> = {
   [P in keyof T]: Column<T[P]>;
 }
 
@@ -39,7 +39,7 @@ export type Schema<T extends object=object> = {
 // Column Alteration Types
 // ============================================================================
 
-export interface AddSchema<T = any> {
+export interface AddDefinition<T = any> {
   action: "add";
   type: ColumnType;
   nullable?: boolean;
@@ -48,7 +48,7 @@ export interface AddSchema<T = any> {
   length?: number;
 }
 
-export interface ModifySchema<T = any> {
+export interface ModifyDefinition<T = any> {
   action: "modify";
   type?: ColumnType;
   nullable?: boolean;
@@ -56,12 +56,12 @@ export interface ModifySchema<T = any> {
   length?: number;
 }
 
-export interface DropSchema {
+export interface DropDefinition {
   action: "drop";
 }
 
-export type AlterSchema<T extends object> = {
-  [P in keyof T]?:AddSchema<T[P]> | ModifySchema<T[P]> | DropSchema
+export type AlterDefinition<T extends object> = {
+  [P in keyof T]?: AddDefinition<T[P]> | ModifyDefinition<T[P]> | DropDefinition
 };
 
 // ============================================================================
@@ -112,12 +112,12 @@ export interface BaseQueryParams {
 
 export interface CreateQueryParams<T extends object = any> extends BaseQueryParams {
   type: 'create';
-  schema: Schema<T>;
+  definition: Definition<T>;
 }
 
 export interface AlterQueryParams<T extends object = any> extends BaseQueryParams {
   type: 'alter';
-  alterations: AlterSchema<T>;
+  alterations: AlterDefinition<T>;
 }
 
 export interface DropTableQueryParams<T extends object = any> extends BaseQueryParams {