karin-plugin-mys-core 1.0.7 → 1.0.9

package/lib/{chunk-BH4S574A.js → chunk-KQVWWGRH.js}

@@ -1,6 +1,6 @@
 import {
   MysDeviceInfoDB
-} from "./chunk-BNSHDFFN.js";
+} from "./chunk-ZTOR2DXG.js";
 
 // src/exports/mys/user/deviceInfo.ts
 import md5 from "md5";

package/lib/{chunk-LLYBEHPW.js → chunk-LBLGKL3W.js}

@@ -1,9 +1,9 @@
-import {
-  common_exports
-} from "./chunk-LG34FPBI.js";
 import {
   dir
 } from "./chunk-SHLPPEAY.js";
+import {
+  common_exports
+} from "./chunk-5DXIT7UB.js";
 
 // src/exports/render/render.ts
 import karin, { config, existToMkdirSync, karinPathBase } from "node-karin";

package/lib/{chunk-EMAUATE3.js → chunk-MPZP23EX.js}

@@ -1,6 +1,6 @@
 import {
   DbBase
-} from "./chunk-Y3J3J5B2.js";
+} from "./chunk-3JN5WYUN.js";
 import {
   DatabaseArray
 } from "./chunk-JVJQKRJ4.js";
@@ -30,8 +30,8 @@ var Sqlite3 = class extends DbBase {
       return false;
     }
   }
-  async init(DataDir, modelName, modelSchema, type) {
-    this.initBase(DataDir, modelName, modelSchema, type);
+  async init(DataDir, modelName, modelSchema, modelSchemaDefine, type, primaryKey) {
+    this.initBase(DataDir, modelName, modelSchema, modelSchemaDefine, type, primaryKey);
     if (this.databaseType === "db" /* Db */) {
       this.model = sequelize.define(this.modelName, this.modelSchema, {
         timestamps: false,
@@ -179,6 +179,7 @@ var Sqlite3Static = new class Sqlite3Static2 {
   }
   ArrayColumn(key, fn) {
     return {
+      ArrayColumn: true,
       type: DataTypes.STRING,
       defaultValue: [].join(","),
       get() {
@@ -193,6 +194,7 @@ var Sqlite3Static = new class Sqlite3Static2 {
   }
   JsonColumn(key, def) {
     return {
+      JsonColumn: true,
       type: DataTypes.STRING,
       defaultValue: JSON.stringify(def),
       get() {

package/lib/{chunk-P2PBUTB7.js → chunk-MQ52BX7O.js}

@@ -1,26 +1,21 @@
 import {
-  DefaultLayoutComponent
+  DefaultLayoutComponent,
+  React
 } from "./chunk-JT3SU5UU.js";
 import {
   ReactRender
-} from "./chunk-LLYBEHPW.js";
+} from "./chunk-LBLGKL3W.js";
 import {
   UserInfo
-} from "./chunk-DJTJKSNN.js";
+} from "./chunk-4BTKE3LO.js";
 import {
   MysGame
-} from "./chunk-BWFWWHCT.js";
+} from "./chunk-2BVJS5VE.js";
 import {
   dir
 } from "./chunk-SHLPPEAY.js";
 
-// src/template/ShowBindAccount/ShowBindAccount.tsx
-import React from "react";
-
-// src/template/render.ts
-var Render = new ReactRender(dir, {});
-
-// src/template/ShowBindAccount/ShowBindAccount.tsx
+// src/template/ShowBindAccount.tsx
 var ShowBindAccountComponent = ({
   User,
   AccountList
@@ -65,8 +60,8 @@ var ShowBindAccountComponent = ({
   )) : /* @__PURE__ */ React.createElement("div", { className: "my-3 px-5 py-5 text-center font-semibold text-[#6b6b6b]" }, "\u6682\u672A\u7ED1\u5B9A\u8D26\u53F7")));
 };
 
-// src/template/ShowBindDevice/ShowBindDevice.tsx
-import React2 from "react";
+// src/template/index.ts
+var Render = new ReactRender(dir, {});
 
 // src/apps/UIDManage.ts
 import karin, { handler, segment } from "node-karin";
@@ -83,7 +78,7 @@ var BindUID = karin.command(
     }
     const userInfo = await Game.UserInfo.create(e.userId);
     const bindUids = userInfo.bind_uids;
-    if (!(uid in bindUids)) {
+    if (!bindUids[uid]) {
       bindUids[uid] = { perm: 0 /* BIND */, ltuid: "" };
     }
     await userInfo.saveUserInfo({
@@ -123,7 +118,7 @@ var UnbindUID = karin.command(
       }
       delUid = filterUids[idx - 1][0];
     }
-    if (delUid in bindUids) {
+    if (bindUids[delUid]) {
       if (bindUids[delUid].perm === 0 /* BIND */) {
         delete bindUids[delUid];
       } else {

package/lib/{chunk-6PIXUPZ6.js → chunk-PMFOX5HA.js}

@@ -47,30 +47,28 @@ var EnhancedArray = class _EnhancedArray extends Array {
     this.#cfg.set(this.#keyPath, this.slice(), save);
     return this;
   }
-  remove(predicate, save, isIndex = false) {
-    if (isIndex && lodash.isNumber(predicate)) {
-      if (predicate < 0 || predicate >= this.length) {
-        logger.error(`\u7D22\u5F15 ${predicate} \u8D85\u51FA\u8303\u56F4 [0, ${this.length - 1}]`);
-        return this;
-      }
-      lodash.pullAt(this, predicate);
-    } else if (lodash.isFunction(predicate)) {
-      lodash.remove(this, predicate);
-    } else {
-      lodash.pull(this, predicate);
+  /** @description 删除指定索引 */
+  pullAt(idx, save) {
+    if (idx < 0 || idx >= this.length) {
+      logger.error(`\u7D22\u5F15 ${idx} \u8D85\u51FA\u8303\u56F4 [0, ${this.length - 1}]`);
+      return this;
     }
+    lodash.pullAt(this, idx);
     this.#cfg.set(this.#keyPath, this.slice(), save);
     return this;
   }
-  /**
-  * @param predicate - 要删除的元素数组
-  * @param save - 是否立即保存
-  */
-  removeSome(elements, save) {
+  /** @description 删除指定元素 */
+  pullAll(elements, save) {
     lodash.pullAll(this, elements);
     this.#cfg.set(this.#keyPath, this.slice(), save);
     return this;
   }
+  /** @description 使用条件函数删除元素 */
+  remove(predicate, save) {
+    lodash.remove(this, predicate);
+    this.#cfg.set(this.#keyPath, this.slice(), save);
+    return this;
+  }
   clear() {
     this.length = 0;
     return this;

package/lib/chunk-TTN7NFCA.js

@@ -0,0 +1,109 @@
+import {
+  common_exports
+} from "./chunk-5DXIT7UB.js";
+import {
+  EnhancedArray
+} from "./chunk-PMFOX5HA.js";
+
+// src/exports/config/config.ts
+import { existsSync, existToMkdirSync, logger, requireFileSync, watch, writeJsonSync } from "node-karin";
+import lodash from "node-karin/lodash";
+import path from "path";
+var Config = class {
+  #cfgName;
+  /**
+   * @description 配置缓存
+   */
+  #ConfigCache = null;
+  /**
+   * @description 默认配置
+   */
+  #DefaultConfig;
+  #DefineConfig;
+  /**
+   * @description 配置保存路径
+   */
+  #ConfigPath;
+  /**
+   * @param name 插件名称:配置名称
+   */
+  constructor(name, ConfigDir, DefaultConfig, DefineConfig) {
+    this.#cfgName = name;
+    const splitName = name.split(":");
+    if (!splitName[1]) {
+      throw new Error("\u914D\u7F6E\u540D\u79F0\u683C\u5F0F\u9519\u8BEF\uFF0C\u5E94\u4E3A \u63D2\u4EF6\u540D\u79F0:\u914D\u7F6E\u540D\u79F0");
+    }
+    this.#ConfigPath = path.join(ConfigDir, `${splitName[1]}.json`);
+    this.#DefaultConfig = DefaultConfig;
+    this.#DefineConfig = DefineConfig;
+    existToMkdirSync(ConfigDir);
+    !existsSync(this.#ConfigPath) && writeJsonSync(this.#ConfigPath, DefaultConfig, true);
+    this.loadConfig();
+  }
+  loadConfig() {
+    const config = requireFileSync(this.#ConfigPath);
+    const mergedConfig = this.mergeWithDefaults(config, this.#DefaultConfig, this.#DefineConfig);
+    this.#ConfigCache = mergedConfig;
+    return mergedConfig;
+  }
+  mergeWithDefaults(userConfig, defaultConfig, DefineConfig) {
+    const filteredUserConfig = common_exports.filterData(userConfig, defaultConfig, DefineConfig);
+    const result = lodash.merge({}, defaultConfig, filteredUserConfig);
+    if (!lodash.isEqual(result, userConfig)) {
+      try {
+        writeJsonSync(this.#ConfigPath, result);
+      } catch (err) {
+        logger.error(err);
+      }
+    }
+    return result;
+  }
+  /**
+   * @description 获取配置路径对应的默认配置
+   */
+  getDef(path2) {
+    const defConfig = JSON.parse(JSON.stringify(this.#DefaultConfig));
+    return lodash.get(defConfig, path2);
+  }
+  get(path2, isArray = false, def) {
+    const conf = JSON.parse(JSON.stringify(this.#ConfigCache));
+    const result = path2 ? lodash.get(conf, path2, def) : conf;
+    if (isArray) {
+      if (!Array.isArray(result)) {
+        logger.error(`\u914D\u7F6E\u8DEF\u5F84 ${path2} \u4E0D\u662F\u6570\u7EC4\u7C7B\u578B`);
+        return new EnhancedArray(this, [], path2);
+      }
+      return new EnhancedArray(this, result, path2);
+    }
+    return result;
+  }
+  /**
+   * @param save 是否立即保存
+   */
+  set(path2, value, save) {
+    lodash.set(this.#ConfigCache, path2, value);
+    save && this.save();
+  }
+  /**
+   * @description 立即保存配置
+   */
+  save() {
+    try {
+      logger.debug(`[${this.#cfgName}] \u4FDD\u5B58\u914D\u7F6E`, this.#ConfigCache);
+      writeJsonSync(this.#ConfigPath, this.#ConfigCache);
+    } catch (err) {
+      logger.error(err);
+    }
+  }
+  watch(fnc) {
+    watch(this.#ConfigPath, async (oldData, newData) => {
+      fnc && await fnc(this, oldData, newData);
+      this.loadConfig();
+    });
+    return this;
+  }
+};
+
+export {
+  Config
+};

package/lib/{chunk-BNSHDFFN.js → chunk-ZTOR2DXG.js}

@@ -1,18 +1,18 @@
 import {
-  Table
-} from "./chunk-EAVXU4Q2.js";
+  createTable
+} from "./chunk-G7TMVDGP.js";
 import {
   Database
-} from "./chunk-G547WVGV.js";
-import {
-  common_exports
-} from "./chunk-LG34FPBI.js";
+} from "./chunk-DMJ5OQR6.js";
 import {
   dir
 } from "./chunk-SHLPPEAY.js";
+import {
+  common_exports
+} from "./chunk-5DXIT7UB.js";
 
 // src/exports/database/tables/mysDeviceInfo.ts
-var MysDeviceInfoTable = new Table(
+var MysDeviceInfoTable = createTable(
   dir.DataDir,
   "mys_device_info_data",
   "db" /* Db */

package/lib/common-BlI5Gsw_.d.ts

@@ -0,0 +1,35 @@
+/**
+ * @description 生成随机字符串
+ * @param length - 字符串长度
+ */
+declare const randomString: (length: number, type: "Lower" | "Upper" | "All") => string;
+/**
+ * @description 生成设备guid
+ */
+declare const getDeviceGuid: () => string;
+/**
+ * @description 将字符串解析为key-value键值对
+ * @param Str - 字符串
+ * @param sep - 分隔符
+ */
+declare const StrToObj: <D extends {
+    [key: string]: string;
+}>(Str: string, sep: string | RegExp) => Partial<D>;
+/**
+ * @description 将key-value键值对解析为字符串
+ * @param obj - key-value键值对
+ * @param sep - 分隔符
+ */
+declare const ObjToStr: (obj: Record<string, string | number>, sep: string) => string;
+declare function filterData(user: any, defaults: any, Define: any): any;
+
+declare const common_ObjToStr: typeof ObjToStr;
+declare const common_StrToObj: typeof StrToObj;
+declare const common_filterData: typeof filterData;
+declare const common_getDeviceGuid: typeof getDeviceGuid;
+declare const common_randomString: typeof randomString;
+declare namespace common {
+  export { common_ObjToStr as ObjToStr, common_StrToObj as StrToObj, common_filterData as filterData, common_getDeviceGuid as getDeviceGuid, common_randomString as randomString };
+}
+
+export { ObjToStr as O, StrToObj as S, common as c, filterData as f, getDeviceGuid as g, randomString as r };

package/lib/exports/config/array.d.ts

@@ -1 +1 @@
-export { E as EnhancedArray } from '../../array-CCexQ14j.js';
+export { E as EnhancedArray } from './config.js';

package/lib/exports/config/array.js

@@ -1,6 +1,6 @@
 import {
   EnhancedArray
-} from "../../chunk-6PIXUPZ6.js";
+} from "../../chunk-PMFOX5HA.js";
 import "../../chunk-MLKGABMK.js";
 export {
   EnhancedArray

package/lib/exports/config/config.d.ts

@@ -1 +1,56 @@
-export { C as Config } from '../../array-CCexQ14j.js';
+declare class Config<C extends Record<string, any>> {
+    #private;
+    /**
+     * @param name 插件名称:配置名称
+     */
+    constructor(name: `${string}:${string}`, ConfigDir: string, DefaultConfig: C, DefineConfig: Record<string, any>);
+    loadConfig(): C;
+    mergeWithDefaults(userConfig: C, defaultConfig: C, DefineConfig: Record<string, any>): C;
+    /**
+     * @description 获取配置路径对应的默认配置
+     */
+    getDef<T>(path: string): T;
+    /**
+     * @description 获取配置路径对应的配置
+     */
+    get<T>(path: string, isArray?: false, def?: T): T;
+    get<T>(path: string, isArray: true, def?: T[]): EnhancedArray<T>;
+    /**
+     * @param save 是否立即保存
+     */
+    set<T>(path: string, value: T, save: boolean): void;
+    /**
+     * @description 立即保存配置
+     */
+    save(): void;
+    watch(fnc?: (self: Config<C>, oldData: C, newData: C) => Promise<void> | void): this;
+}
+
+declare class EnhancedArray<T> extends Array<T> {
+    #private;
+    constructor(cfg: Config<any>, items: T[], path: string);
+    /**
+     * @param element - string | number
+     * @returns
+     */
+    has(element: T & (string | number)): boolean;
+    /**
+     * @param isEqual 是否不添加重复元素
+     * @param save 是否立即保存
+     */
+    add(element: T, isEqual: boolean, save: boolean): this;
+    /**
+     * @param isEqual 是否不添加重复元素
+     * @param save 是否立即保存
+     */
+    addSome(elements: T[], isEqual: boolean, save: boolean): this;
+    /** @description 删除指定索引 */
+    pullAt(idx: number, save: boolean): this;
+    /** @description 删除指定元素 */
+    pullAll(elements: T[], save: boolean): this;
+    /** @description 使用条件函数删除元素 */
+    remove(predicate: (item: T) => boolean, save: boolean): this;
+    clear(): this;
+}
+
+export { Config, EnhancedArray as E };

package/lib/exports/config/config.js

@@ -1,7 +1,11 @@
 import {
   Config
-} from "../../chunk-BXA3VAQC.js";
-import "../../chunk-6PIXUPZ6.js";
+} from "../../chunk-TTN7NFCA.js";
+import "../../chunk-ARLTXJFJ.js";
+import "../../chunk-PYTECG57.js";
+import "../../chunk-T7W4DXRM.js";
+import "../../chunk-5DXIT7UB.js";
+import "../../chunk-PMFOX5HA.js";
 import "../../chunk-MLKGABMK.js";
 export {
   Config

package/lib/exports/config/index.d.ts

@@ -1,2 +1 @@
-export { C as Config, E as EnhancedArray } from '../../array-CCexQ14j.js';
-export { ConfigDefine, ConfigDefineArray } from './types/config.js';
+export { Config, E as EnhancedArray } from './config.js';

package/lib/exports/config/index.js

@@ -1,12 +1,14 @@
-import "../../chunk-XQWTJIT4.js";
-import "../../chunk-7SZX3RBZ.js";
-import "../../chunk-2DHTKQ34.js";
+import "../../chunk-3ERB3ILC.js";
 import {
   Config
-} from "../../chunk-BXA3VAQC.js";
+} from "../../chunk-TTN7NFCA.js";
+import "../../chunk-ARLTXJFJ.js";
+import "../../chunk-PYTECG57.js";
+import "../../chunk-T7W4DXRM.js";
+import "../../chunk-5DXIT7UB.js";
 import {
   EnhancedArray
-} from "../../chunk-6PIXUPZ6.js";
+} from "../../chunk-PMFOX5HA.js";
 import "../../chunk-MLKGABMK.js";
 export {
   Config,

package/lib/exports/database/database.js

@@ -1,8 +1,8 @@
 import {
   Database
-} from "../../chunk-G547WVGV.js";
-import "../../chunk-EMAUATE3.js";
-import "../../chunk-Y3J3J5B2.js";
+} from "../../chunk-DMJ5OQR6.js";
+import "../../chunk-MPZP23EX.js";
+import "../../chunk-3JN5WYUN.js";
 import "../../chunk-7KEG6SDX.js";
 import "../../chunk-FBWSEBAW.js";
 import "../../chunk-JVJQKRJ4.js";
@@ -12,6 +12,10 @@ import "../../chunk-K5U2O3HH.js";
 import "../../chunk-I7XZONDN.js";
 import "../../chunk-JRH4JC43.js";
 import "../../chunk-SHLPPEAY.js";
+import "../../chunk-ARLTXJFJ.js";
+import "../../chunk-PYTECG57.js";
+import "../../chunk-T7W4DXRM.js";
+import "../../chunk-5DXIT7UB.js";
 import "../../chunk-MLKGABMK.js";
 export {
   Database

package/lib/exports/database/dbs/base.d.ts

@@ -2,12 +2,14 @@ import { ModelStatic, Model } from 'sequelize';
 import { DatabaseType, ModelAttributes, DatabaseReturn } from '../types/dbs/base.js';
 
 declare class DbBase<T extends Record<string, any>, D extends DatabaseType> {
-    model: ModelStatic<Model>;
+    primaryKey: keyof T | undefined;
+    model: ModelStatic<Model> | undefined;
     databasePath: string;
     databaseType: D;
     modelName: string;
-    modelSchema: ModelAttributes<Model>;
-    initBase(DataDir: string, modelName: string, modelSchema: ModelAttributes<Model>, type: D): void;
+    modelSchema: ModelAttributes<Model, T>;
+    modelSchemaDefine: Partial<Record<keyof T, any>>;
+    initBase(DataDir: string, modelName: string, modelSchema: ModelAttributes<Model, T>, modelSchemaDefine: Partial<Record<keyof T, any>>, type: D, primaryKey?: keyof T): void;
     schemaToJSON(pk: string): T;
     userPath(pk: string): string;
     readSync(path: string, pk: string): DatabaseReturn<T>[DatabaseType.File];

package/lib/exports/database/dbs/base.js

@@ -1,6 +1,6 @@
 import {
   DbBase
-} from "../../../chunk-Y3J3J5B2.js";
+} from "../../../chunk-3JN5WYUN.js";
 import "../../../chunk-7KEG6SDX.js";
 import "../../../chunk-FBWSEBAW.js";
 import "../../../chunk-JVJQKRJ4.js";
@@ -9,6 +9,10 @@ import "../../../chunk-SHW6FHIB.js";
 import "../../../chunk-K5U2O3HH.js";
 import "../../../chunk-I7XZONDN.js";
 import "../../../chunk-JRH4JC43.js";
+import "../../../chunk-ARLTXJFJ.js";
+import "../../../chunk-PYTECG57.js";
+import "../../../chunk-T7W4DXRM.js";
+import "../../../chunk-5DXIT7UB.js";
 import "../../../chunk-MLKGABMK.js";
 export {
   DbBase

package/lib/exports/database/dbs/index.d.ts

@@ -1,4 +1,4 @@
 export { DbBase } from './base.js';
-export { Table } from './table.js';
+export { Table, createTable } from './table.js';
 import 'sequelize';
 import '../types/dbs/base.js';

package/lib/exports/database/dbs/index.js

@@ -1,12 +1,13 @@
 import "../../../chunk-SEWEEPJN.js";
 import {
-  Table
-} from "../../../chunk-EAVXU4Q2.js";
-import "../../../chunk-G547WVGV.js";
-import "../../../chunk-EMAUATE3.js";
+  Table,
+  createTable
+} from "../../../chunk-G7TMVDGP.js";
+import "../../../chunk-DMJ5OQR6.js";
+import "../../../chunk-MPZP23EX.js";
 import {
   DbBase
-} from "../../../chunk-Y3J3J5B2.js";
+} from "../../../chunk-3JN5WYUN.js";
 import "../../../chunk-7KEG6SDX.js";
 import "../../../chunk-FBWSEBAW.js";
 import "../../../chunk-JVJQKRJ4.js";
@@ -16,8 +17,13 @@ import "../../../chunk-K5U2O3HH.js";
 import "../../../chunk-I7XZONDN.js";
 import "../../../chunk-JRH4JC43.js";
 import "../../../chunk-SHLPPEAY.js";
+import "../../../chunk-ARLTXJFJ.js";
+import "../../../chunk-PYTECG57.js";
+import "../../../chunk-T7W4DXRM.js";
+import "../../../chunk-5DXIT7UB.js";
 import "../../../chunk-MLKGABMK.js";
 export {
   DbBase,
-  Table
+  Table,
+  createTable
 };

package/lib/exports/database/dbs/sqlite3.d.ts

@@ -5,7 +5,7 @@ import { DbBase } from './base.js';
 declare class Sqlite3<T extends Record<string, any>, D extends DatabaseType> extends DbBase<T, D> implements DatabaseClassInstance<T, D> {
     dialect: Dialect;
     check(): Promise<boolean>;
-    init(DataDir: string, modelName: string, modelSchema: ModelAttributes<Model>, type: D): Promise<DatabaseClassInstance<T, D>>;
+    init(DataDir: string, modelName: string, modelSchema: ModelAttributes<Model, T>, modelSchemaDefine: Partial<Record<keyof T, any>>, type: D, primaryKey?: keyof T): Promise<DatabaseClassInstance<T, D>>;
     findByPk(pk: string, create: true): Promise<DatabaseReturn<T>[D]>;
     findByPk(pk: string, create?: false): Promise<DatabaseReturn<T>[D] | undefined>;
     findAllByPks(pks: string[]): Promise<DatabaseReturn<T>[D][]>;
@@ -16,8 +16,12 @@ declare const Sqlite3Static: {
     dialect: Dialect;
     description: string;
     Column<T>(type: keyof typeof DataTypes, def: T, option?: Partial<ModelAttributeColumnOptions<Model>>): ModelAttributeColumnOptions<Model>;
-    ArrayColumn<T>(key: string, fn?: (data: DatabaseArray<T>) => T[]): ModelAttributeColumnOptions<Model>;
-    JsonColumn<T>(key: string, def: T): ModelAttributeColumnOptions<Model>;
+    ArrayColumn<T>(key: string, fn?: (data: DatabaseArray<T>) => T[]): ModelAttributeColumnOptions<Model> & {
+        ArrayColumn: true;
+    };
+    JsonColumn<T>(key: string, def: T): ModelAttributeColumnOptions<Model> & {
+        JsonColumn: true;
+    };
 };
 
 export { Sqlite3, Sqlite3Static };

package/lib/exports/database/dbs/sqlite3.js

@@ -1,8 +1,8 @@
 import {
   Sqlite3,
   Sqlite3Static
-} from "../../../chunk-EMAUATE3.js";
-import "../../../chunk-Y3J3J5B2.js";
+} from "../../../chunk-MPZP23EX.js";
+import "../../../chunk-3JN5WYUN.js";
 import "../../../chunk-7KEG6SDX.js";
 import "../../../chunk-FBWSEBAW.js";
 import "../../../chunk-JVJQKRJ4.js";
@@ -12,6 +12,10 @@ import "../../../chunk-K5U2O3HH.js";
 import "../../../chunk-I7XZONDN.js";
 import "../../../chunk-JRH4JC43.js";
 import "../../../chunk-SHLPPEAY.js";
+import "../../../chunk-ARLTXJFJ.js";
+import "../../../chunk-PYTECG57.js";
+import "../../../chunk-T7W4DXRM.js";
+import "../../../chunk-5DXIT7UB.js";
 import "../../../chunk-MLKGABMK.js";
 export {
   Sqlite3,

package/lib/exports/database/dbs/table.d.ts

@@ -1,16 +1,20 @@
-import { ModelAttributeColumnOptions, Model } from 'sequelize';
-import { DatabaseType, DatabaseClassInstance } from '../types/dbs/base.js';
+import { Model } from 'sequelize';
+import { DatabaseType, DatabaseClassInstance, ModelAttributes } from '../types/dbs/base.js';
 
-declare class Table<TableType extends Record<string, any>, DBType extends DatabaseType, ExtraTableType extends Record<string, any>> {
+declare class Table<TableType extends Record<string, any>, ExtraTableType extends Record<string, any> = {}, DBType extends DatabaseType = DatabaseType> {
     #private;
     initCache: DatabaseClassInstance<TableType, DBType>;
-    modelSchema: Record<keyof TableType, ModelAttributeColumnOptions<Model>>;
+    modelSchema: ModelAttributes<Model, TableType>;
+    modelSchemaDefine: Partial<Record<keyof TableType, any>>;
     /**
      * @param type Db: 直接保存在sqlite数据中、 File: 保存在单个json文件中、 Dir: 保存在多个json文件的目录中、Schema中除pk外每一个键值对应一个文件 e.g tableName/user/key.json
      */
-    constructor(DataDir: string, tableName: string, type: DBType);
-    init(Schema: Record<keyof TableType, ModelAttributeColumnOptions<Model>>): Promise<() => Promise<DatabaseClassInstance<TableType, DBType>>>;
-    addSchem<newTableType extends ExtraTableType>(newSchema: Record<keyof newTableType, ModelAttributeColumnOptions<Model>>): Promise<() => Promise<DatabaseClassInstance<TableType & newTableType, DBType>>>;
+    constructor(DataDir: string, tableName: string, type: DBType, primaryKey?: keyof TableType);
+    init(Schema: ModelAttributes<Model, TableType>, SchemaDefine?: Partial<Record<keyof TableType, any>>): Promise<() => Promise<DatabaseClassInstance<TableType, DBType>>>;
+    addSchem<newTableType extends ExtraTableType>(newSchema: ModelAttributes<Model, newTableType>, SchemaDefine?: Partial<Record<keyof newTableType, any>>): Promise<() => Promise<DatabaseClassInstance<TableType & newTableType, DBType>>>;
 }
+declare function createTable<TableType extends Record<string, any>, ExtraTableType extends Record<string, any> = {}>(DataDir: string, tableName: string, type: DatabaseType.File, primaryKey: keyof TableType): Table<TableType, ExtraTableType, DatabaseType.File>;
+declare function createTable<TableType extends Record<string, any>, ExtraTableType extends Record<string, any> = {}>(DataDir: string, tableName: string, type: DatabaseType.Dir, primaryKey: keyof TableType): Table<TableType, ExtraTableType, DatabaseType.Dir>;
+declare function createTable<TableType extends Record<string, any>, ExtraTableType extends Record<string, any> = {}>(DataDir: string, tableName: string, type: DatabaseType.Db, primaryKey?: keyof TableType): Table<TableType, ExtraTableType, DatabaseType.Db>;
 
-export { Table };
+export { Table, createTable };

package/lib/exports/database/dbs/table.js

@@ -1,9 +1,10 @@
 import {
-  Table
-} from "../../../chunk-EAVXU4Q2.js";
-import "../../../chunk-G547WVGV.js";
-import "../../../chunk-EMAUATE3.js";
-import "../../../chunk-Y3J3J5B2.js";
+  Table,
+  createTable
+} from "../../../chunk-G7TMVDGP.js";
+import "../../../chunk-DMJ5OQR6.js";
+import "../../../chunk-MPZP23EX.js";
+import "../../../chunk-3JN5WYUN.js";
 import "../../../chunk-7KEG6SDX.js";
 import "../../../chunk-FBWSEBAW.js";
 import "../../../chunk-JVJQKRJ4.js";
@@ -13,7 +14,12 @@ import "../../../chunk-K5U2O3HH.js";
 import "../../../chunk-I7XZONDN.js";
 import "../../../chunk-JRH4JC43.js";
 import "../../../chunk-SHLPPEAY.js";
+import "../../../chunk-ARLTXJFJ.js";
+import "../../../chunk-PYTECG57.js";
+import "../../../chunk-T7W4DXRM.js";
+import "../../../chunk-5DXIT7UB.js";
 import "../../../chunk-MLKGABMK.js";
 export {
-  Table
+  Table,
+  createTable
 };