karin-plugin-mys-core 1.0.20 → 1.0.22

package/lib/apps/MiHoYoLogin.js

@@ -1,7 +1,7 @@
 import {
   ShowBindAccountCmdFunc
-} from "../chunk-SOLISSTT.js";
-import "../chunk-S3ALDDWH.js";
+} from "../chunk-SCXP2BGQ.js";
+import "../chunk-C2ZR7X67.js";
 import {
   UserInfo,
   fetchQRcode,
@@ -9,11 +9,11 @@ import {
   getTokenByGameToken,
   getUserFullInfo,
   queryQRcode
-} from "../chunk-32QZ2PSX.js";
+} from "../chunk-AFF6YSYO.js";
 import "../chunk-5LRGHP36.js";
 import "../chunk-HI6OZTI2.js";
 import "../chunk-BLE3V6QR.js";
-import "../chunk-ER4WMJJ6.js";
+import "../chunk-4N3KY3KE.js";
 import {
   common_exports
 } from "../chunk-RX4VMVAI.js";

package/lib/apps/MysDevice.js

@@ -1,11 +1,11 @@
 import {
   DeviceInfo,
   UserInfo
-} from "../chunk-32QZ2PSX.js";
+} from "../chunk-AFF6YSYO.js";
 import "../chunk-5LRGHP36.js";
 import "../chunk-HI6OZTI2.js";
 import "../chunk-BLE3V6QR.js";
-import "../chunk-ER4WMJJ6.js";
+import "../chunk-4N3KY3KE.js";
 import "../chunk-RX4VMVAI.js";
 import "../chunk-SHLPPEAY.js";
 import "../chunk-MLKGABMK.js";

package/lib/apps/UIDManage.js

@@ -5,13 +5,13 @@ import {
   ShowBindAccountCmdFunc,
   UnbindAccount,
   UnbindUID
-} from "../chunk-SOLISSTT.js";
-import "../chunk-S3ALDDWH.js";
-import "../chunk-32QZ2PSX.js";
+} from "../chunk-SCXP2BGQ.js";
+import "../chunk-C2ZR7X67.js";
+import "../chunk-AFF6YSYO.js";
 import "../chunk-5LRGHP36.js";
 import "../chunk-HI6OZTI2.js";
 import "../chunk-BLE3V6QR.js";
-import "../chunk-ER4WMJJ6.js";
+import "../chunk-4N3KY3KE.js";
 import "../chunk-RX4VMVAI.js";
 import "../chunk-SHLPPEAY.js";
 import "../chunk-MLKGABMK.js";

package/lib/{chunk-ER4WMJJ6.js → chunk-4N3KY3KE.js}

@@ -35,6 +35,12 @@ var DatabaseType = /* @__PURE__ */ ((DatabaseType3) => {
   DatabaseType3["Db"] = "db";
   return DatabaseType3;
 })(DatabaseType || {});
+var ColumnOptionType = /* @__PURE__ */ ((ColumnOptionType2) => {
+  ColumnOptionType2["Normal"] = "normal";
+  ColumnOptionType2["Array"] = "array";
+  ColumnOptionType2["Json"] = "json";
+  return ColumnOptionType2;
+})(ColumnOptionType || {});
 var DatabaseArray = class _DatabaseArray extends Array {
   constructor(items) {
     super();
@@ -139,10 +145,10 @@ var DbBase = class {
     const result = {
       [primaryKey]: pk
     };
-    lodash2.forEach(this.modelSchema, (value, key) => {
+    this.modelSchema.forEach(({ key, type, Option }) => {
       if (key !== primaryKey) {
-        const Value = typeof value.defaultValue === "function" ? value.defaultValue() : value.defaultValue;
-        result[key] = value.JsonColumn ? JSON.parse(Value) : value.ArrayColumn ? Value.split(",") : Value;
+        const Value = typeof Option.defaultValue === "function" ? Option.defaultValue() : Option.defaultValue;
+        result[key] = type === "json" /* Json */ ? JSON.parse(Value) : "array" /* Array */ ? Value.split(",") : Value;
       }
     });
     return result;
@@ -178,9 +184,9 @@ var DbBase = class {
   }
   writeDirSync(pk, data) {
     const path3 = this.userPath(pk);
-    lodash2.forEach(this.modelSchema, (value, key) => {
+    this.modelSchema.forEach(({ key, type, Option }) => {
       if (key !== this.primaryKey) {
-        const mergeData = common_exports.filterData(data[key], value.defaultValue, this.modelSchemaDefine[key]);
+        const mergeData = common_exports.filterData(data[key], Option.defaultValue, this.modelSchemaDefine[key]);
         json.writeSync(`${path3}/${key}.json`, {
           key,
           [this.primaryKey]: pk,
@@ -272,13 +278,15 @@ var Sqlite3 = class extends DbBase {
       await this.model.sync();
       const queryInterface = sequelize.getQueryInterface();
       const tableDescription = await queryInterface.describeTable(this.modelName);
-      for (const key in this.modelSchema) {
-        if (!tableDescription[key]) {
-          await queryInterface.addColumn(this.modelName, key, this.modelSchema[key]);
-          if (typeof this.modelSchema[key] === "string") continue;
-          const defaultValue = this.modelSchema[key].defaultValue;
+      for (const Schema of this.modelSchema) {
+        const { key, Option } = Schema;
+        const _key = key;
+        if (!tableDescription[_key]) {
+          await queryInterface.addColumn(this.modelName, _key, Option);
+          if (typeof Option === "string") continue;
+          const defaultValue = Option.defaultValue;
           if (defaultValue !== void 0) {
-            await this.model.update({ [key]: defaultValue }, { where: {} });
+            await this.model.update({ [_key]: defaultValue }, { where: {} });
           }
         }
       }
@@ -402,16 +410,19 @@ var Sqlite3 = class extends DbBase {
 var Sqlite3Static = new class Sqlite3Static2 {
   dialect = dialect;
   description = "\u63D2\u4EF6\u9ED8\u8BA4\u6570\u636E\u5E93";
-  Column(type, def, option) {
-    return {
+  Column = (key, type, def, option) => ({
+    key,
+    type: "normal" /* Normal */,
+    Option: {
       type: DataTypes[type],
       defaultValue: def,
       ...option
-    };
-  }
-  ArrayColumn(key, fn) {
-    return {
-      ArrayColumn: true,
+    }
+  });
+  ArrayColumn = (key, fn) => ({
+    key,
+    type: "array" /* Array */,
+    Option: {
       type: DataTypes.STRING,
       defaultValue: [].join(","),
       get() {
@@ -422,11 +433,12 @@ var Sqlite3Static = new class Sqlite3Static2 {
         const setData = (fn ? fn(data) : data) || [];
         this.setDataValue(key, setData.join(","));
       }
-    };
-  }
-  JsonColumn(key, def) {
-    return {
-      JsonColumn: true,
+    }
+  });
+  JsonColumn = (key, def) => ({
+    key,
+    type: "json" /* Json */,
+    Option: {
       type: DataTypes.STRING,
       defaultValue: JSON.stringify(def),
       get() {
@@ -441,8 +453,8 @@ var Sqlite3Static = new class Sqlite3Static2 {
       set(data) {
         this.setDataValue(key, JSON.stringify(data));
       }
-    };
-  }
+    }
+  });
 }();
 
 // src/exports/database/database.ts
@@ -486,11 +498,15 @@ var Database = new class DatabaseClass {
     return this.Db.Database();
   }
   get PkColumn() {
-    return (type, option) => ({
-      type: DataTypes2[type],
-      primaryKey: true,
-      allowNull: false,
-      ...option
+    return (key, type, option) => ({
+      key,
+      type: "normal" /* Normal */,
+      Option: {
+        type: DataTypes2[type],
+        primaryKey: true,
+        allowNull: false,
+        ...option
+      }
     });
   }
   get Column() {
@@ -552,7 +568,7 @@ var Table = class {
     return this.#cache();
   }
   async addSchem(newSchema, SchemaDefine = {}) {
-    this.modelSchema = Object.assign(this.modelSchema, newSchema);
+    this.modelSchema.push(...newSchema);
     this.modelSchemaDefine = Object.assign(this.modelSchemaDefine, SchemaDefine);
     this.initCache = await this.#Database.init(
       this.#DataDir,
@@ -575,13 +591,13 @@ var MysAccountInfoTable = createTable(
   "db" /* Db */
 );
 var MysAccountInfoDB = await MysAccountInfoTable.init(
-  {
-    ltuid: Database.PkColumn("STRING"),
-    type: Database.Column("STRING", "mihoyo" /* cn */),
-    cookie: Database.Column("TEXT", ""),
-    stoken: Database.Column("STRING", ""),
-    deviceMd5: Database.Column("STRING", "")
-  }
+  [
+    Database.PkColumn("ltuid", "STRING"),
+    Database.Column("type", "STRING", "mihoyo" /* cn */),
+    Database.Column("cookie", "TEXT", ""),
+    Database.Column("stoken", "STRING", ""),
+    Database.Column("deviceMd5", "STRING", "")
+  ]
 );
 
 // src/exports/database/tables/mysDeviceInfo.ts
@@ -591,18 +607,18 @@ var MysDeviceInfoTable = createTable(
   "db" /* Db */
 );
 var MysDeviceInfoDB = await MysDeviceInfoTable.init(
-  {
-    md5: Database.PkColumn("STRING"),
-    deviceId: Database.Column("STRING", common_exports.getDeviceGuid),
-    deviceFp: Database.Column("STRING", ""),
-    name: Database.Column("STRING", ""),
-    board: Database.Column("STRING", ""),
-    model: Database.Column("STRING", ""),
-    oaid: Database.Column("STRING", ""),
-    version: Database.Column("INTEGER", 12),
-    fingerprint: Database.Column("STRING", ""),
-    product: Database.Column("STRING", "")
-  }
+  [
+    Database.PkColumn("md5", "STRING"),
+    Database.Column("deviceId", "STRING", common_exports.getDeviceGuid),
+    Database.Column("deviceFp", "STRING", ""),
+    Database.Column("name", "STRING", ""),
+    Database.Column("board", "STRING", ""),
+    Database.Column("model", "STRING", ""),
+    Database.Column("oaid", "STRING", ""),
+    Database.Column("version", "INTEGER", 12),
+    Database.Column("fingerprint", "STRING", ""),
+    Database.Column("product", "STRING", "")
+  ]
 );
 
 // src/exports/database/tables/mysUserInfo.ts
@@ -612,17 +628,18 @@ var MysUserInfoTable = createTable(
   "db" /* Db */
 );
 var MysUserInfoDB = await MysUserInfoTable.init(
-  {
-    userId: Database.PkColumn("STRING"),
-    ltuids: Database.ArrayColumn("ltuids"),
-    stuids: Database.ArrayColumn("stuids"),
-    deviceList: Database.ArrayColumn("deviceList")
-  }
+  [
+    Database.PkColumn("userId", "STRING"),
+    Database.ArrayColumn("ltuids"),
+    Database.ArrayColumn("stuids"),
+    Database.ArrayColumn("deviceList")
+  ]
 );
 
 export {
   Dialect,
   DatabaseType,
+  ColumnOptionType,
   DatabaseArray,
   MysAccountType,
   UidPermission,

package/lib/{chunk-32QZ2PSX.js → chunk-AFF6YSYO.js}

@@ -5,7 +5,7 @@ import {
   MysAccountInfoDB,
   MysDeviceInfoDB,
   MysUserInfoDB
-} from "./chunk-ER4WMJJ6.js";
+} from "./chunk-4N3KY3KE.js";
 import {
   common_exports
 } from "./chunk-RX4VMVAI.js";

package/lib/{chunk-S3ALDDWH.js → chunk-C2ZR7X67.js}

@@ -13,15 +13,15 @@ import { config } from "node-karin";
 import React from "react";
 var DefaultLayoutComponent = ({
   children,
-  bg,
-  width,
+  bgStyle,
   mysPlugin
 }) => {
   const karinVersion = config.pkg().version;
   return /* @__PURE__ */ React.createElement(
     "div",
     {
-      className: `relative flex ${width} flex-col pb-10 font-hywh text-black ${bg}`,
+      className: "relative flex flex-col pb-10 font-hywh text-black",
+      style: bgStyle,
       id: "container"
     },
     children,
@@ -29,21 +29,18 @@ var DefaultLayoutComponent = ({
       "img",
       {
         src: `${mysPlugin.logoPath}`,
-        alt: "Mys Plugin Logo",
         className: "h-6 w-6 rounde"
       }
     ), /* @__PURE__ */ React.createElement("div", { className: "flex flex-col" }, /* @__PURE__ */ React.createElement("span", { className: "text-[5px] font-bold leading-none text-black" }, "KARIN-MYS-PLUGIN"), /* @__PURE__ */ React.createElement("div", { className: "flex items-baseline gap-0.5" }, /* @__PURE__ */ React.createElement("span", { className: "font-semibold" }, mysPlugin.name), /* @__PURE__ */ React.createElement("strong", { className: "text-xs font-bold text-[#f2c06f]" }, "v", mysPlugin.version)))), /* @__PURE__ */ React.createElement("div", { className: "h-8 w-px bg-gray-600" })), /* @__PURE__ */ React.createElement("div", { className: "flex items-center gap-2" }, /* @__PURE__ */ React.createElement(
       "img",
       {
         src: `${dir.pluginDir}/resources/image/mys-core-logo.webp`,
-        alt: "MysCore Logo",
         className: "h-6 w-6 rounded-sm"
       }
     ), /* @__PURE__ */ React.createElement("div", { className: "flex flex-col" }, /* @__PURE__ */ React.createElement("span", { className: "text-[5px] font-bold leading-none text-black" }, "KARIN-PLUGIN"), /* @__PURE__ */ React.createElement("div", { className: "flex items-baseline gap-0.5" }, /* @__PURE__ */ React.createElement("span", { className: "font-semibold" }, "MysCore"), /* @__PURE__ */ React.createElement("strong", { className: "text-xs font-bold text-[#f2c06f]" }, "v", dir.version)))), /* @__PURE__ */ React.createElement("div", { className: "h-8 w-px bg-gray-600" }), /* @__PURE__ */ React.createElement("div", { className: "flex items-center gap-2" }, /* @__PURE__ */ React.createElement(
       "img",
       {
         src: `${dir.pluginDir}/resources/image/frame-logo.webp`,
-        alt: "Karin Logo",
         className: "h-6 w-6 rounded-sm"
       }
     ), /* @__PURE__ */ React.createElement("div", { className: "flex flex-col" }, /* @__PURE__ */ React.createElement("span", { className: "text-[5px] font-bold leading-none text-black" }, "IS DRIVEN BY"), /* @__PURE__ */ React.createElement("div", { className: "flex items-baseline gap-1.5" }, /* @__PURE__ */ React.createElement("span", { className: "font-semibold" }, "Karin"), /* @__PURE__ */ React.createElement("strong", { className: "text-[10px] font-bold text-[#f2c06f]" }, "v", karinVersion)))))
@@ -51,7 +48,7 @@ var DefaultLayoutComponent = ({
 };
 
 // src/exports/render/render.ts
-import karin, { absPath, config as config2, existToMkdirSync, karinPathBase } from "node-karin";
+import karin, { absPath, existToMkdirSync, karinPathBase } from "node-karin";
 import fs from "fs";
 import path from "path";
 import React2 from "react";
@@ -74,11 +71,6 @@ var ReactRender = class {
       }
     };
   }
-  get karin() {
-    return {
-      version: config2.pkg().version
-    };
-  }
   async template(template, component, props, options = {}) {
     const element = React2.createElement(component, props);
     const appHtml = renderToString(element);

package/lib/{chunk-SOLISSTT.js → chunk-SCXP2BGQ.js}

@@ -2,11 +2,11 @@ import {
   DefaultLayoutComponent,
   React,
   ReactRender
-} from "./chunk-S3ALDDWH.js";
+} from "./chunk-C2ZR7X67.js";
 import {
   MysGame,
   UserInfo
-} from "./chunk-32QZ2PSX.js";
+} from "./chunk-AFF6YSYO.js";
 import {
   dir
 } from "./chunk-SHLPPEAY.js";
@@ -17,7 +17,7 @@ var ShowBindAccountComponent = ({
   AccountList
 }) => {
   const plugin = Render.plugin;
-  return /* @__PURE__ */ React.createElement(DefaultLayoutComponent, { bg: "bg-[#f6f0e6]", width: "w-[600px]" }, /* @__PURE__ */ React.createElement("div", { className: "w-full px-[18px] pb-9 pt-5" }, /* @__PURE__ */ React.createElement(
+  return /* @__PURE__ */ React.createElement(DefaultLayoutComponent, { bgStyle: { backgroundColor: "#f6f0e6", width: 600 } }, /* @__PURE__ */ React.createElement("div", { className: "w-full px-[18px] pb-9 pt-5" }, /* @__PURE__ */ React.createElement(
     "div",
     {
       className: "absolute -top-2.5 right-0 z-[5] h-[72px] w-[150px] bg-contain bg-center bg-no-repeat opacity-50",

package/lib/core/index.js

@@ -4,7 +4,7 @@ import {
   DeviceCfg
 } from "../chunk-HI6OZTI2.js";
 import "../chunk-BLE3V6QR.js";
-import "../chunk-ER4WMJJ6.js";
+import "../chunk-4N3KY3KE.js";
 import "../chunk-RX4VMVAI.js";
 import "../chunk-SHLPPEAY.js";
 import "../chunk-MLKGABMK.js";

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

@@ -1,5 +1,5 @@
-import { D as DatabaseType, a as DatabaseClassInstance, b as Dialect, c as DatabaseClassStatic, M as ModelAttributes, d as DatabaseReturn, e as MysDeviceInfoTableType, B as BaseUserInfoTableType, f as BaseGameUIDInfoTableType } from '../../mysUserInfo-CPIjniyl.js';
-export { j as BindUidsItemType, g as DatabaseArray, h as MysDeviceInfoDatabaseBaseType, i as MysDeviceInfoDatabaseIdFpType, U as UidPermission } from '../../mysUserInfo-CPIjniyl.js';
+import { D as DatabaseType, a as DatabaseClassInstance, b as Dialect, c as DatabaseClassStatic, C as ColumnOption, d as ColumnOptionType, M as ModelAttributes, e as DatabaseReturn, V as ValidateSchema, f as MysDeviceInfoTableType, B as BaseUserInfoTableType, g as BaseGameUIDInfoTableType } from '../../mysUserInfo-CYNdwJxY.js';
+export { k as BindUidsItemType, h as DatabaseArray, i as MysDeviceInfoDatabaseBaseType, j as MysDeviceInfoDatabaseIdFpType, U as UidPermission } from '../../mysUserInfo-CYNdwJxY.js';
 import { DataTypes, ModelAttributeColumnOptions, Model, ModelStatic } from 'sequelize';
 import { a as MysAccountInfoTableType } from '../../mysAccountInfo-B7u5Sl8f.js';
 export { M as MysAccountType } from '../../mysAccountInfo-B7u5Sl8f.js';
@@ -25,7 +25,7 @@ declare const Database: {
     }[];
     /** @description 获取当前使用的数据库 */
     get<T extends Record<string, any>, D extends DatabaseType>(): DatabaseClassInstance<T, D>;
-    get PkColumn(): (type: keyof typeof DataTypes, option?: Partial<ModelAttributeColumnOptions<Model>>) => ModelAttributeColumnOptions<Model>;
+    get PkColumn(): <K extends string>(key: K, type: keyof typeof DataTypes, option?: Partial<ModelAttributeColumnOptions<Model>>) => ColumnOption<ColumnOptionType.Normal, K>;
     get Column(): DatabaseClassStatic["Column"];
     get ArrayColumn(): DatabaseClassStatic["ArrayColumn"];
     get JsonColumn(): DatabaseClassStatic["JsonColumn"];
@@ -61,8 +61,12 @@ declare class Table<TableType extends Record<string, any>, ExtraTableType extend
      * @param type Db: 直接保存在sqlite数据中、 File: 保存在单个json文件中、 Dir: 保存在多个json文件的目录中、Schema中除pk外每一个键值对应一个文件 e.g tableName/user/key.json
      */
     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>>>;
+    init<const S extends readonly {
+        key: keyof TableType;
+    }[]>(Schema: ValidateSchema<TableType, S>, SchemaDefine?: Partial<Record<keyof TableType, any>>): Promise<() => Promise<DatabaseClassInstance<TableType, DBType>>>;
+    addSchem<newTableType extends ExtraTableType, const S extends readonly {
+        key: keyof newTableType;
+    }[]>(newSchema: ValidateSchema<newTableType, S>, 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>;
@@ -77,4 +81,4 @@ declare const MysDeviceInfoDB: () => Promise<DatabaseClassInstance<MysDeviceInfo
 declare const MysUserInfoTable: Table<BaseUserInfoTableType, BaseGameUIDInfoTableType<string>, DatabaseType.Db>;
 declare const MysUserInfoDB: () => Promise<DatabaseClassInstance<BaseUserInfoTableType, DatabaseType.Db>>;
 
-export { BaseGameUIDInfoTableType, BaseUserInfoTableType, Database, DatabaseClassInstance, DatabaseClassStatic, type DatabaseFn, DatabaseReturn, DatabaseType, DbBase, Dialect, ModelAttributes, MysAccountInfoDB, MysAccountInfoTable, MysAccountInfoTableType, MysDeviceInfoDB, MysDeviceInfoTable, MysDeviceInfoTableType, MysUserInfoDB, MysUserInfoTable, Table, createTable };
+export { BaseGameUIDInfoTableType, BaseUserInfoTableType, ColumnOption, ColumnOptionType, Database, DatabaseClassInstance, DatabaseClassStatic, type DatabaseFn, DatabaseReturn, DatabaseType, DbBase, Dialect, ModelAttributes, MysAccountInfoDB, MysAccountInfoTable, MysAccountInfoTableType, MysDeviceInfoDB, MysDeviceInfoTable, MysDeviceInfoTableType, MysUserInfoDB, MysUserInfoTable, Table, ValidateSchema, createTable };

package/lib/exports/database/index.js

@@ -1,4 +1,5 @@
 import {
+  ColumnOptionType,
   Database,
   DatabaseArray,
   DatabaseType,
@@ -14,11 +15,12 @@ import {
   Table,
   UidPermission,
   createTable
-} from "../../chunk-ER4WMJJ6.js";
+} from "../../chunk-4N3KY3KE.js";
 import "../../chunk-RX4VMVAI.js";
 import "../../chunk-SHLPPEAY.js";
 import "../../chunk-MLKGABMK.js";
 export {
+  ColumnOptionType,
   Database,
   DatabaseArray,
   DatabaseType,

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

@@ -1,7 +1,7 @@
 import { M as MysAccountType, a as MysAccountInfoTableType } from '../../mysAccountInfo-B7u5Sl8f.js';
 import { SendMessage } from 'node-karin';
 import { AxiosRequestConfig, AxiosResponse } from 'node-karin/axios';
-import { h as MysDeviceInfoDatabaseBaseType, i as MysDeviceInfoDatabaseIdFpType, e as MysDeviceInfoTableType, B as BaseUserInfoTableType, d as DatabaseReturn, D as DatabaseType, g as DatabaseArray, U as UidPermission, f as BaseGameUIDInfoTableType } from '../../mysUserInfo-CPIjniyl.js';
+import { i as MysDeviceInfoDatabaseBaseType, j as MysDeviceInfoDatabaseIdFpType, f as MysDeviceInfoTableType, B as BaseUserInfoTableType, e as DatabaseReturn, D as DatabaseType, h as DatabaseArray, U as UidPermission, g as BaseGameUIDInfoTableType } from '../../mysUserInfo-CYNdwJxY.js';
 import 'sequelize';
 
 declare const MysApp: Readonly<{

package/lib/exports/mys/index.js

@@ -15,11 +15,11 @@ import {
   getUserFullInfo,
   getUserGameRolesByCookie,
   queryQRcode
-} from "../../chunk-32QZ2PSX.js";
+} from "../../chunk-AFF6YSYO.js";
 import "../../chunk-5LRGHP36.js";
 import "../../chunk-HI6OZTI2.js";
 import "../../chunk-BLE3V6QR.js";
-import "../../chunk-ER4WMJJ6.js";
+import "../../chunk-4N3KY3KE.js";
 import "../../chunk-RX4VMVAI.js";
 import "../../chunk-SHLPPEAY.js";
 import "../../chunk-MLKGABMK.js";

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

@@ -4,8 +4,10 @@ import { Options } from 'node-karin';
 
 interface DefaultLayoutProps {
     children: React.ReactNode;
-    bg: string;
-    width: string;
+    bgStyle: React.CSSProperties & {
+        backgroundColor: React.CSSProperties['backgroundColor'];
+        width: React.CSSProperties['width'];
+    };
     mysPlugin?: {
         name: string;
         version: string;
@@ -38,9 +40,6 @@ declare class ReactRender<P extends Record<string, any>, K extends string> {
     #private;
     constructor(cfg: RenderCfg, pluginOptions?: Omit<P, 'name' | 'version' | 'resources'>);
     get plugin(): Omit<P, 'name' | 'version' | 'resources'> & DefaultRenderPluginOptionsType;
-    get karin(): {
-        version: string;
-    };
     template<C extends React.ComponentType<any>>(template: K, component: C, props: React.ComponentProps<C>, options?: {
         type?: 'png' | 'jpeg' | 'webp';
         plugin?: Record<string, any>;

package/lib/exports/render/index.js

@@ -2,7 +2,7 @@ import {
   DefaultLayoutComponent,
   React,
   ReactRender
-} from "../../chunk-S3ALDDWH.js";
+} from "../../chunk-C2ZR7X67.js";
 import "../../chunk-RX4VMVAI.js";
 import "../../chunk-SHLPPEAY.js";
 import "../../chunk-MLKGABMK.js";

package/lib/{mysUserInfo-CPIjniyl.d.ts → mysUserInfo-CYNdwJxY.d.ts}

@@ -16,11 +16,14 @@ declare enum DatabaseType {
     Db = "db"
 }
 type ModelAttributes<M extends Model = Model, TAttributes = any> = {
-    [name in keyof TAttributes]: ModelAttributeColumnOptions<M> & {
-        ArrayColumn?: true;
-        JsonColumn?: true;
-    };
-};
+    key: keyof TAttributes;
+    type: ColumnOptionType;
+    Option: ModelAttributeColumnOptions<M>;
+}[];
+type ExtractSchemaKeys<T extends readonly any[]> = T[number]['key'];
+type ValidateSchema<TAttributes, S extends readonly {
+    key: any;
+}[]> = keyof TAttributes extends ExtractSchemaKeys<S> ? ExtractSchemaKeys<S> extends keyof TAttributes ? S : `❌ Schema 包含了多余的键：${Exclude<ExtractSchemaKeys<S>, keyof TAttributes>}` : keyof TAttributes extends string ? `❌ Schema 缺少必需的键：${Exclude<keyof TAttributes, ExtractSchemaKeys<S>>}` : never;
 interface DatabaseReturn<T> {
     [DatabaseType.Db]: T & {
         save: (data: Partial<T>) => Promise<DatabaseReturn<T>[DatabaseType.Db]>;
@@ -87,18 +90,24 @@ type DatabaseClassInstance<T extends Record<string, any>, D extends DatabaseType
     /** @description 删除用户数据 */
     destroy(pk: string): Promise<boolean>;
 };
+declare const enum ColumnOptionType {
+    Normal = "normal",
+    Array = "array",
+    Json = "json"
+}
+interface ColumnOption<T extends ColumnOptionType, K extends string> {
+    key: K;
+    type: T;
+    Option: ModelAttributeColumnOptions<Model>;
+}
 interface DatabaseClassStatic {
     /** @description 数据库标识 */
     dialect: Dialect;
     /** @description 数据库说明 */
     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> & {
-        ArrayColumn: true;
-    };
-    JsonColumn<T extends Record<string, any>>(key: string, def: T): ModelAttributeColumnOptions<Model> & {
-        JsonColumn: true;
-    };
+    Column<T, K extends string>(key: K, type: keyof typeof DataTypes, def: T, option?: Partial<ModelAttributeColumnOptions<Model>>): ColumnOption<ColumnOptionType.Normal, K>;
+    ArrayColumn<T, K extends string>(key: K, fn?: (data: DatabaseArray<T>) => T[]): ColumnOption<ColumnOptionType.Array, K>;
+    JsonColumn<T extends Record<string, any>, K extends string>(key: K, def: T): ColumnOption<ColumnOptionType.Json, K>;
 }
 declare class DatabaseArray<T> extends Array<T> {
     constructor(items: T[]);
@@ -168,4 +177,4 @@ type BaseGameUIDInfoTableType<Game extends string> = {
     [P in `${Game}-uids`]: Partial<Record<string, BindUidsItemType>>;
 };
 
-export { type BaseUserInfoTableType as B, DatabaseType as D, type ModelAttributes as M, UidPermission as U, type DatabaseClassInstance as a, Dialect as b, type DatabaseClassStatic as c, type DatabaseReturn as d, type MysDeviceInfoTableType as e, type BaseGameUIDInfoTableType as f, DatabaseArray as g, type MysDeviceInfoDatabaseBaseType as h, type MysDeviceInfoDatabaseIdFpType as i, type BindUidsItemType as j };
+export { type BaseUserInfoTableType as B, type ColumnOption as C, DatabaseType as D, type ModelAttributes as M, UidPermission as U, type ValidateSchema as V, type DatabaseClassInstance as a, Dialect as b, type DatabaseClassStatic as c, ColumnOptionType as d, type DatabaseReturn as e, type MysDeviceInfoTableType as f, type BaseGameUIDInfoTableType as g, DatabaseArray as h, type MysDeviceInfoDatabaseBaseType as i, type MysDeviceInfoDatabaseIdFpType as j, type BindUidsItemType as k };

package/lib/web.config.js

@@ -3,7 +3,7 @@ import {
   DeviceCfg
 } from "./chunk-HI6OZTI2.js";
 import "./chunk-BLE3V6QR.js";
-import "./chunk-ER4WMJJ6.js";
+import "./chunk-4N3KY3KE.js";
 import "./chunk-RX4VMVAI.js";
 import {
   dir

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "karin-plugin-mys-core",
-  "version": "1.0.20",
+  "version": "1.0.22",
   "author": "babanbang",
   "type": "module",
   "description": "karin-plugin-mys-core",

package/resources/styles/karin-plugin-mys-core.css

@@ -665,10 +665,6 @@ video {
   width: 150px;
 }
 
-.w-\[600px\] {
-  width: 600px;
-}
-
 .w-full {
   width: 100%;
 }
@@ -781,11 +777,6 @@ video {
   border-color: rgb(0 0 0 / 0.06);
 }
 
-.bg-\[\#f6f0e6\] {
-  --tw-bg-opacity: 1;
-  background-color: rgb(246 240 230 / var(--tw-bg-opacity, 1));
-}
-
 .bg-black\/\[0\.06\] {
   background-color: rgb(0 0 0 / 0.06);
 }