karin-plugin-mys-core 1.0.7 → 1.0.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (79) hide show
  1. package/lib/apps/MiHoYoLogin.js +24 -26
  2. package/lib/apps/MysDevice.js +18 -18
  3. package/lib/apps/UIDManage.js +20 -20
  4. package/lib/{chunk-BWFWWHCT.js → chunk-2BVJS5VE.js} +7 -4
  5. package/lib/{chunk-BH4S574A.js → chunk-2WGBVGJM.js} +1 -1
  6. package/lib/{chunk-Y3J3J5B2.js → chunk-3JN5WYUN.js} +31 -20
  7. package/lib/{chunk-BNSHDFFN.js → chunk-3R37ZEXD.js} +5 -5
  8. package/lib/chunk-5DXIT7UB.js +88 -0
  9. package/lib/{chunk-LLYBEHPW.js → chunk-CD2J42HG.js} +1 -1
  10. package/lib/{chunk-DJTJKSNN.js → chunk-CZD74R2W.js} +26 -19
  11. package/lib/{chunk-G547WVGV.js → chunk-DMJ5OQR6.js} +1 -1
  12. package/lib/{chunk-7ZQQ76WC.js → chunk-EDNBKOMS.js} +4 -4
  13. package/lib/{chunk-EAVXU4Q2.js → chunk-G7TMVDGP.js} +17 -6
  14. package/lib/{chunk-HTH25YE2.js → chunk-HJ6HX5HB.js} +4 -4
  15. package/lib/{chunk-EMAUATE3.js → chunk-MPZP23EX.js} +5 -3
  16. package/lib/chunk-OYGNSYOG.js +109 -0
  17. package/lib/{chunk-6PIXUPZ6.js → chunk-PMFOX5HA.js} +14 -16
  18. package/lib/{chunk-P2PBUTB7.js → chunk-UTTUUWA4.js} +10 -15
  19. package/lib/common-BlI5Gsw_.d.ts +35 -0
  20. package/lib/exports/config/array.d.ts +1 -1
  21. package/lib/exports/config/array.js +1 -1
  22. package/lib/exports/config/config.d.ts +56 -1
  23. package/lib/exports/config/config.js +6 -2
  24. package/lib/exports/config/index.d.ts +1 -2
  25. package/lib/exports/config/index.js +7 -5
  26. package/lib/exports/database/database.js +7 -3
  27. package/lib/exports/database/dbs/base.d.ts +5 -3
  28. package/lib/exports/database/dbs/base.js +5 -1
  29. package/lib/exports/database/dbs/index.d.ts +1 -1
  30. package/lib/exports/database/dbs/index.js +12 -6
  31. package/lib/exports/database/dbs/sqlite3.d.ts +7 -3
  32. package/lib/exports/database/dbs/sqlite3.js +6 -2
  33. package/lib/exports/database/dbs/table.d.ts +12 -8
  34. package/lib/exports/database/dbs/table.js +12 -6
  35. package/lib/exports/database/index.d.ts +2 -2
  36. package/lib/exports/database/index.js +18 -14
  37. package/lib/exports/database/tables/index.js +14 -12
  38. package/lib/exports/database/tables/mysAccountInfo.d.ts +1 -1
  39. package/lib/exports/database/tables/mysAccountInfo.js +9 -5
  40. package/lib/exports/database/tables/mysDeviceInfo.d.ts +1 -1
  41. package/lib/exports/database/tables/mysDeviceInfo.js +9 -7
  42. package/lib/exports/database/tables/mysUserInfo.d.ts +1 -1
  43. package/lib/exports/database/tables/mysUserInfo.js +9 -5
  44. package/lib/exports/database/types/dbs/base.d.ts +17 -6
  45. package/lib/exports/database/types/index.d.ts +1 -1
  46. package/lib/exports/database/types/tables/index.d.ts +1 -1
  47. package/lib/exports/database/types/tables/mysUserInfo.d.ts +6 -5
  48. package/lib/exports/mys/api/apis.js +18 -18
  49. package/lib/exports/mys/api/app.js +11 -9
  50. package/lib/exports/mys/api/define.js +18 -18
  51. package/lib/exports/mys/api/index.js +21 -21
  52. package/lib/exports/mys/index.js +24 -24
  53. package/lib/exports/mys/user/deviceInfo.js +12 -10
  54. package/lib/exports/mys/user/game.d.ts +12 -5
  55. package/lib/exports/mys/user/game.js +1 -1
  56. package/lib/exports/mys/user/index.d.ts +3 -3
  57. package/lib/exports/mys/user/index.js +21 -21
  58. package/lib/exports/mys/user/userInfo.js +18 -18
  59. package/lib/exports/render/index.js +5 -3
  60. package/lib/exports/render/render.js +5 -3
  61. package/lib/exports/utils/common.d.ts +1 -33
  62. package/lib/exports/utils/common.js +3 -1
  63. package/lib/exports/utils/index.d.ts +2 -1
  64. package/lib/exports/utils/index.js +4 -2
  65. package/lib/exports/{config/types/config.d.ts → utils/types/common.d.ts} +3 -4
  66. package/lib/exports/utils/types/common.js +1 -0
  67. package/lib/exports/utils/types/index.d.ts +1 -0
  68. package/lib/exports/utils/types/index.js +2 -0
  69. package/package.json +1 -1
  70. package/lib/array-CCexQ14j.d.ts +0 -62
  71. package/lib/chunk-BXA3VAQC.js +0 -131
  72. package/lib/chunk-LG34FPBI.js +0 -50
  73. package/lib/exports/config/types/config.js +0 -1
  74. package/lib/exports/config/types/index.d.ts +0 -1
  75. package/lib/exports/config/types/index.js +0 -2
  76. /package/lib/{chunk-2DHTKQ34.js → chunk-3ERB3ILC.js} +0 -0
  77. /package/lib/{chunk-7SZX3RBZ.js → chunk-ARLTXJFJ.js} +0 -0
  78. /package/lib/{chunk-UC6INRYV.js → chunk-PYTECG57.js} +0 -0
  79. /package/lib/{chunk-XQWTJIT4.js → chunk-T7W4DXRM.js} +0 -0
@@ -1,16 +1,20 @@
1
- import { ModelAttributeColumnOptions, Model } from 'sequelize';
2
- import { DatabaseType, DatabaseClassInstance } from '../types/dbs/base.js';
1
+ import { Model } from 'sequelize';
2
+ import { DatabaseType, DatabaseClassInstance, ModelAttributes } from '../types/dbs/base.js';
3
3
 
4
- declare class Table<TableType extends Record<string, any>, DBType extends DatabaseType, ExtraTableType extends Record<string, any>> {
4
+ declare class Table<TableType extends Record<string, any>, ExtraTableType extends Record<string, any> = {}, DBType extends DatabaseType = DatabaseType> {
5
5
  #private;
6
6
  initCache: DatabaseClassInstance<TableType, DBType>;
7
- modelSchema: Record<keyof TableType, ModelAttributeColumnOptions<Model>>;
7
+ modelSchema: ModelAttributes<Model, TableType>;
8
+ modelSchemaDefine: Partial<Record<keyof TableType, any>>;
8
9
  /**
9
10
  * @param type Db: 直接保存在sqlite数据中、 File: 保存在单个json文件中、 Dir: 保存在多个json文件的目录中、Schema中除pk外每一个键值对应一个文件 e.g tableName/user/key.json
10
11
  */
11
- constructor(DataDir: string, tableName: string, type: DBType);
12
- init(Schema: Record<keyof TableType, ModelAttributeColumnOptions<Model>>): Promise<() => Promise<DatabaseClassInstance<TableType, DBType>>>;
13
- addSchem<newTableType extends ExtraTableType>(newSchema: Record<keyof newTableType, ModelAttributeColumnOptions<Model>>): Promise<() => Promise<DatabaseClassInstance<TableType & newTableType, DBType>>>;
12
+ constructor(DataDir: string, tableName: string, type: DBType, primaryKey?: keyof TableType);
13
+ init(Schema: ModelAttributes<Model, TableType>, SchemaDefine?: Partial<Record<keyof TableType, any>>): Promise<() => Promise<DatabaseClassInstance<TableType, DBType>>>;
14
+ addSchem<newTableType extends ExtraTableType>(newSchema: ModelAttributes<Model, newTableType>, SchemaDefine?: Partial<Record<keyof newTableType, any>>): Promise<() => Promise<DatabaseClassInstance<TableType & newTableType, DBType>>>;
14
15
  }
16
+ 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>;
17
+ 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>;
18
+ 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>;
15
19
 
16
- export { Table };
20
+ export { Table, createTable };
@@ -1,9 +1,10 @@
1
1
  import {
2
- Table
3
- } from "../../../chunk-EAVXU4Q2.js";
4
- import "../../../chunk-G547WVGV.js";
5
- import "../../../chunk-EMAUATE3.js";
6
- import "../../../chunk-Y3J3J5B2.js";
2
+ Table,
3
+ createTable
4
+ } from "../../../chunk-G7TMVDGP.js";
5
+ import "../../../chunk-DMJ5OQR6.js";
6
+ import "../../../chunk-MPZP23EX.js";
7
+ import "../../../chunk-3JN5WYUN.js";
7
8
  import "../../../chunk-7KEG6SDX.js";
8
9
  import "../../../chunk-FBWSEBAW.js";
9
10
  import "../../../chunk-JVJQKRJ4.js";
@@ -12,8 +13,13 @@ import "../../../chunk-SHW6FHIB.js";
12
13
  import "../../../chunk-K5U2O3HH.js";
13
14
  import "../../../chunk-I7XZONDN.js";
14
15
  import "../../../chunk-JRH4JC43.js";
16
+ import "../../../chunk-ARLTXJFJ.js";
17
+ import "../../../chunk-PYTECG57.js";
18
+ import "../../../chunk-T7W4DXRM.js";
19
+ import "../../../chunk-5DXIT7UB.js";
15
20
  import "../../../chunk-SHLPPEAY.js";
16
21
  import "../../../chunk-MLKGABMK.js";
17
22
  export {
18
- Table
23
+ Table,
24
+ createTable
19
25
  };
@@ -1,6 +1,6 @@
1
1
  export { Database } from './database.js';
2
2
  export { DbBase } from './dbs/base.js';
3
- export { Table } from './dbs/table.js';
3
+ export { Table, createTable } from './dbs/table.js';
4
4
  export { MysAccountInfoDB, MysAccountInfoTable } from './tables/mysAccountInfo.js';
5
5
  export { MysDeviceInfoDB, MysDeviceInfoTable } from './tables/mysDeviceInfo.js';
6
6
  export { MysUserInfoDB, MysUserInfoTable } from './tables/mysUserInfo.js';
@@ -8,5 +8,5 @@ export { DatabaseFn } from './types/database.js';
8
8
  export { DatabaseArray, DatabaseClassInstance, DatabaseClassStatic, DatabaseReturn, DatabaseType, Dialect, ModelAttributes } from './types/dbs/base.js';
9
9
  export { MysAccountInfoTableType, MysAccountType } from './types/tables/mysAccountInfo.js';
10
10
  export { MysDeviceInfoDatabaseBaseType, MysDeviceInfoDatabaseIdFpType, MysDeviceInfoTableType } from './types/tables/mysDeviceInfo.js';
11
- export { BaseGameUIDInfoTableType, BaseUserInfoTableType, UidPermission } from './types/tables/mysUserInfo.js';
11
+ export { BaseGameUIDInfoTableType, BaseUserInfoTableType, BindUidsItemType, UidPermission } from './types/tables/mysUserInfo.js';
12
12
  import 'sequelize';
@@ -1,28 +1,29 @@
1
1
  import "../../chunk-W4DBT7AD.js";
2
2
  import "../../chunk-Z5I6A73Y.js";
3
+ import {
4
+ MysAccountInfoDB,
5
+ MysAccountInfoTable
6
+ } from "../../chunk-EDNBKOMS.js";
3
7
  import {
4
8
  MysDeviceInfoDB,
5
9
  MysDeviceInfoTable
6
- } from "../../chunk-BNSHDFFN.js";
10
+ } from "../../chunk-3R37ZEXD.js";
7
11
  import {
8
12
  MysUserInfoDB,
9
13
  MysUserInfoTable
10
- } from "../../chunk-HTH25YE2.js";
11
- import {
12
- MysAccountInfoDB,
13
- MysAccountInfoTable
14
- } from "../../chunk-7ZQQ76WC.js";
14
+ } from "../../chunk-HJ6HX5HB.js";
15
15
  import "../../chunk-SEWEEPJN.js";
16
16
  import {
17
- Table
18
- } from "../../chunk-EAVXU4Q2.js";
17
+ Table,
18
+ createTable
19
+ } from "../../chunk-G7TMVDGP.js";
19
20
  import {
20
21
  Database
21
- } from "../../chunk-G547WVGV.js";
22
- import "../../chunk-EMAUATE3.js";
22
+ } from "../../chunk-DMJ5OQR6.js";
23
+ import "../../chunk-MPZP23EX.js";
23
24
  import {
24
25
  DbBase
25
- } from "../../chunk-Y3J3J5B2.js";
26
+ } from "../../chunk-3JN5WYUN.js";
26
27
  import "../../chunk-7KEG6SDX.js";
27
28
  import "../../chunk-FBWSEBAW.js";
28
29
  import {
@@ -39,8 +40,10 @@ import {
39
40
  UidPermission
40
41
  } from "../../chunk-I7XZONDN.js";
41
42
  import "../../chunk-JRH4JC43.js";
42
- import "../../chunk-UC6INRYV.js";
43
- import "../../chunk-LG34FPBI.js";
43
+ import "../../chunk-ARLTXJFJ.js";
44
+ import "../../chunk-PYTECG57.js";
45
+ import "../../chunk-T7W4DXRM.js";
46
+ import "../../chunk-5DXIT7UB.js";
44
47
  import "../../chunk-SHLPPEAY.js";
45
48
  import "../../chunk-MLKGABMK.js";
46
49
  export {
@@ -57,5 +60,6 @@ export {
57
60
  MysUserInfoDB,
58
61
  MysUserInfoTable,
59
62
  Table,
60
- UidPermission
63
+ UidPermission,
64
+ createTable
61
65
  };
@@ -1,21 +1,21 @@
1
1
  import "../../../chunk-Z5I6A73Y.js";
2
+ import {
3
+ MysAccountInfoDB,
4
+ MysAccountInfoTable
5
+ } from "../../../chunk-EDNBKOMS.js";
2
6
  import {
3
7
  MysDeviceInfoDB,
4
8
  MysDeviceInfoTable
5
- } from "../../../chunk-BNSHDFFN.js";
9
+ } from "../../../chunk-3R37ZEXD.js";
6
10
  import {
7
11
  MysUserInfoDB,
8
12
  MysUserInfoTable
9
- } from "../../../chunk-HTH25YE2.js";
10
- import {
11
- MysAccountInfoDB,
12
- MysAccountInfoTable
13
- } from "../../../chunk-7ZQQ76WC.js";
13
+ } from "../../../chunk-HJ6HX5HB.js";
14
14
  import "../../../chunk-SEWEEPJN.js";
15
- import "../../../chunk-EAVXU4Q2.js";
16
- import "../../../chunk-G547WVGV.js";
17
- import "../../../chunk-EMAUATE3.js";
18
- import "../../../chunk-Y3J3J5B2.js";
15
+ import "../../../chunk-G7TMVDGP.js";
16
+ import "../../../chunk-DMJ5OQR6.js";
17
+ import "../../../chunk-MPZP23EX.js";
18
+ import "../../../chunk-3JN5WYUN.js";
19
19
  import "../../../chunk-7KEG6SDX.js";
20
20
  import "../../../chunk-FBWSEBAW.js";
21
21
  import "../../../chunk-JVJQKRJ4.js";
@@ -24,8 +24,10 @@ import "../../../chunk-SHW6FHIB.js";
24
24
  import "../../../chunk-K5U2O3HH.js";
25
25
  import "../../../chunk-I7XZONDN.js";
26
26
  import "../../../chunk-JRH4JC43.js";
27
- import "../../../chunk-UC6INRYV.js";
28
- import "../../../chunk-LG34FPBI.js";
27
+ import "../../../chunk-ARLTXJFJ.js";
28
+ import "../../../chunk-PYTECG57.js";
29
+ import "../../../chunk-T7W4DXRM.js";
30
+ import "../../../chunk-5DXIT7UB.js";
29
31
  import "../../../chunk-SHLPPEAY.js";
30
32
  import "../../../chunk-MLKGABMK.js";
31
33
  export {
@@ -3,7 +3,7 @@ import { MysAccountInfoTableType } from '../types/tables/mysAccountInfo.js';
3
3
  import { Table } from '../dbs/table.js';
4
4
  import 'sequelize';
5
5
 
6
- declare const MysAccountInfoTable: Table<MysAccountInfoTableType, DatabaseType.Db, {}>;
6
+ declare const MysAccountInfoTable: Table<MysAccountInfoTableType, {}, DatabaseType.Db>;
7
7
  declare const MysAccountInfoDB: () => Promise<DatabaseClassInstance<MysAccountInfoTableType, DatabaseType.Db>>;
8
8
 
9
9
  export { MysAccountInfoDB, MysAccountInfoTable };
@@ -1,12 +1,12 @@
1
1
  import {
2
2
  MysAccountInfoDB,
3
3
  MysAccountInfoTable
4
- } from "../../../chunk-7ZQQ76WC.js";
4
+ } from "../../../chunk-EDNBKOMS.js";
5
5
  import "../../../chunk-SEWEEPJN.js";
6
- import "../../../chunk-EAVXU4Q2.js";
7
- import "../../../chunk-G547WVGV.js";
8
- import "../../../chunk-EMAUATE3.js";
9
- import "../../../chunk-Y3J3J5B2.js";
6
+ import "../../../chunk-G7TMVDGP.js";
7
+ import "../../../chunk-DMJ5OQR6.js";
8
+ import "../../../chunk-MPZP23EX.js";
9
+ import "../../../chunk-3JN5WYUN.js";
10
10
  import "../../../chunk-7KEG6SDX.js";
11
11
  import "../../../chunk-FBWSEBAW.js";
12
12
  import "../../../chunk-JVJQKRJ4.js";
@@ -15,6 +15,10 @@ import "../../../chunk-SHW6FHIB.js";
15
15
  import "../../../chunk-K5U2O3HH.js";
16
16
  import "../../../chunk-I7XZONDN.js";
17
17
  import "../../../chunk-JRH4JC43.js";
18
+ import "../../../chunk-ARLTXJFJ.js";
19
+ import "../../../chunk-PYTECG57.js";
20
+ import "../../../chunk-T7W4DXRM.js";
21
+ import "../../../chunk-5DXIT7UB.js";
18
22
  import "../../../chunk-SHLPPEAY.js";
19
23
  import "../../../chunk-MLKGABMK.js";
20
24
  export {
@@ -3,7 +3,7 @@ import { MysDeviceInfoTableType } from '../types/tables/mysDeviceInfo.js';
3
3
  import { Table } from '../dbs/table.js';
4
4
  import 'sequelize';
5
5
 
6
- declare const MysDeviceInfoTable: Table<MysDeviceInfoTableType, DatabaseType.Db, {}>;
6
+ declare const MysDeviceInfoTable: Table<MysDeviceInfoTableType, {}, DatabaseType.Db>;
7
7
  declare const MysDeviceInfoDB: () => Promise<DatabaseClassInstance<MysDeviceInfoTableType, DatabaseType.Db>>;
8
8
 
9
9
  export { MysDeviceInfoDB, MysDeviceInfoTable };
@@ -1,12 +1,12 @@
1
1
  import {
2
2
  MysDeviceInfoDB,
3
3
  MysDeviceInfoTable
4
- } from "../../../chunk-BNSHDFFN.js";
4
+ } from "../../../chunk-3R37ZEXD.js";
5
5
  import "../../../chunk-SEWEEPJN.js";
6
- import "../../../chunk-EAVXU4Q2.js";
7
- import "../../../chunk-G547WVGV.js";
8
- import "../../../chunk-EMAUATE3.js";
9
- import "../../../chunk-Y3J3J5B2.js";
6
+ import "../../../chunk-G7TMVDGP.js";
7
+ import "../../../chunk-DMJ5OQR6.js";
8
+ import "../../../chunk-MPZP23EX.js";
9
+ import "../../../chunk-3JN5WYUN.js";
10
10
  import "../../../chunk-7KEG6SDX.js";
11
11
  import "../../../chunk-FBWSEBAW.js";
12
12
  import "../../../chunk-JVJQKRJ4.js";
@@ -15,8 +15,10 @@ import "../../../chunk-SHW6FHIB.js";
15
15
  import "../../../chunk-K5U2O3HH.js";
16
16
  import "../../../chunk-I7XZONDN.js";
17
17
  import "../../../chunk-JRH4JC43.js";
18
- import "../../../chunk-UC6INRYV.js";
19
- import "../../../chunk-LG34FPBI.js";
18
+ import "../../../chunk-ARLTXJFJ.js";
19
+ import "../../../chunk-PYTECG57.js";
20
+ import "../../../chunk-T7W4DXRM.js";
21
+ import "../../../chunk-5DXIT7UB.js";
20
22
  import "../../../chunk-SHLPPEAY.js";
21
23
  import "../../../chunk-MLKGABMK.js";
22
24
  export {
@@ -3,7 +3,7 @@ import { BaseUserInfoTableType, BaseGameUIDInfoTableType } from '../types/tables
3
3
  import { Table } from '../dbs/table.js';
4
4
  import 'sequelize';
5
5
 
6
- declare const MysUserInfoTable: Table<BaseUserInfoTableType, DatabaseType.Db, BaseGameUIDInfoTableType<string>>;
6
+ declare const MysUserInfoTable: Table<BaseUserInfoTableType, BaseGameUIDInfoTableType<string>, DatabaseType.Db>;
7
7
  declare const MysUserInfoDB: () => Promise<DatabaseClassInstance<BaseUserInfoTableType, DatabaseType.Db>>;
8
8
 
9
9
  export { MysUserInfoDB, MysUserInfoTable };
@@ -1,12 +1,12 @@
1
1
  import {
2
2
  MysUserInfoDB,
3
3
  MysUserInfoTable
4
- } from "../../../chunk-HTH25YE2.js";
4
+ } from "../../../chunk-HJ6HX5HB.js";
5
5
  import "../../../chunk-SEWEEPJN.js";
6
- import "../../../chunk-EAVXU4Q2.js";
7
- import "../../../chunk-G547WVGV.js";
8
- import "../../../chunk-EMAUATE3.js";
9
- import "../../../chunk-Y3J3J5B2.js";
6
+ import "../../../chunk-G7TMVDGP.js";
7
+ import "../../../chunk-DMJ5OQR6.js";
8
+ import "../../../chunk-MPZP23EX.js";
9
+ import "../../../chunk-3JN5WYUN.js";
10
10
  import "../../../chunk-7KEG6SDX.js";
11
11
  import "../../../chunk-FBWSEBAW.js";
12
12
  import "../../../chunk-JVJQKRJ4.js";
@@ -15,6 +15,10 @@ import "../../../chunk-SHW6FHIB.js";
15
15
  import "../../../chunk-K5U2O3HH.js";
16
16
  import "../../../chunk-I7XZONDN.js";
17
17
  import "../../../chunk-JRH4JC43.js";
18
+ import "../../../chunk-ARLTXJFJ.js";
19
+ import "../../../chunk-PYTECG57.js";
20
+ import "../../../chunk-T7W4DXRM.js";
21
+ import "../../../chunk-5DXIT7UB.js";
18
22
  import "../../../chunk-SHLPPEAY.js";
19
23
  import "../../../chunk-MLKGABMK.js";
20
24
  export {
@@ -16,7 +16,10 @@ declare enum DatabaseType {
16
16
  Db = "db"
17
17
  }
18
18
  type ModelAttributes<M extends Model = Model, TAttributes = any> = {
19
- [name in keyof TAttributes]: ModelAttributeColumnOptions<M>;
19
+ [name in keyof TAttributes]: ModelAttributeColumnOptions<M> & {
20
+ ArrayColumn?: true;
21
+ JsonColumn?: true;
22
+ };
20
23
  };
21
24
  interface DatabaseReturn<T> {
22
25
  [DatabaseType.Db]: T & {
@@ -34,13 +37,17 @@ interface DatabaseReturn<T> {
34
37
  }
35
38
  type DatabaseClassInstance<T extends Record<string, any>, D extends DatabaseType> = {
36
39
  dialect: Dialect;
37
- model: ModelStatic<Model>;
40
+ /** @description DatabaseType为Db时不使用 */
41
+ primaryKey: keyof T | undefined;
42
+ model: ModelStatic<Model> | undefined;
38
43
  databasePath: string;
39
44
  databaseType: D;
40
45
  /** @description 表名 */
41
46
  modelName: string;
42
47
  /** @description 表定义 */
43
- modelSchema: ModelAttributes<Model>;
48
+ modelSchema: ModelAttributes<Model, T>;
49
+ /** @description 表定义扩展 */
50
+ modelSchemaDefine: Partial<Record<keyof T, any>>;
44
51
  /** @description 检查数据库是否可用 */
45
52
  check(): Promise<boolean>;
46
53
  /**
@@ -50,7 +57,7 @@ type DatabaseClassInstance<T extends Record<string, any>, D extends DatabaseType
50
57
  * @param modelSchema 表定义
51
58
  * @param type 数据库类型
52
59
  */
53
- init(DataDir: string, modelName: string, modelSchema: Record<keyof T, ModelAttributeColumnOptions<Model>>, type: D): Promise<DatabaseClassInstance<T, D>>;
60
+ init(DataDir: string, modelName: string, modelSchema: ModelAttributes<Model, T>, modelSchemaDefine: Partial<Record<keyof T, any>>, type: D, primaryKey?: keyof T): Promise<DatabaseClassInstance<T, D>>;
54
61
  /** @description 将表定义转换为 JSON 对象 */
55
62
  schemaToJSON(pk: string): T;
56
63
  /** @description 获取用户数据文件路径 */
@@ -86,8 +93,12 @@ interface DatabaseClassStatic {
86
93
  /** @description 数据库说明 */
87
94
  description: string;
88
95
  Column<T>(type: keyof typeof DataTypes, def: T, option?: Partial<ModelAttributeColumnOptions<Model>>): ModelAttributeColumnOptions<Model>;
89
- ArrayColumn<T>(key: string, fn?: (data: DatabaseArray<T>) => T[]): ModelAttributeColumnOptions<Model>;
90
- JsonColumn<T extends Record<string, any>>(key: string, def: T): ModelAttributeColumnOptions<Model>;
96
+ ArrayColumn<T>(key: string, fn?: (data: DatabaseArray<T>) => T[]): ModelAttributeColumnOptions<Model> & {
97
+ ArrayColumn: true;
98
+ };
99
+ JsonColumn<T extends Record<string, any>>(key: string, def: T): ModelAttributeColumnOptions<Model> & {
100
+ JsonColumn: true;
101
+ };
91
102
  }
92
103
  declare class DatabaseArray<T> extends Array<T> {
93
104
  constructor(items: T[]);
@@ -2,5 +2,5 @@ export { DatabaseFn } from './database.js';
2
2
  export { DatabaseArray, DatabaseClassInstance, DatabaseClassStatic, DatabaseReturn, DatabaseType, Dialect, ModelAttributes } from './dbs/base.js';
3
3
  export { MysAccountInfoTableType, MysAccountType } from './tables/mysAccountInfo.js';
4
4
  export { MysDeviceInfoDatabaseBaseType, MysDeviceInfoDatabaseIdFpType, MysDeviceInfoTableType } from './tables/mysDeviceInfo.js';
5
- export { BaseGameUIDInfoTableType, BaseUserInfoTableType, UidPermission } from './tables/mysUserInfo.js';
5
+ export { BaseGameUIDInfoTableType, BaseUserInfoTableType, BindUidsItemType, UidPermission } from './tables/mysUserInfo.js';
6
6
  import 'sequelize';
@@ -1,5 +1,5 @@
1
1
  export { MysAccountInfoTableType, MysAccountType } from './mysAccountInfo.js';
2
2
  export { MysDeviceInfoDatabaseBaseType, MysDeviceInfoDatabaseIdFpType, MysDeviceInfoTableType } from './mysDeviceInfo.js';
3
- export { BaseGameUIDInfoTableType, BaseUserInfoTableType, UidPermission } from './mysUserInfo.js';
3
+ export { BaseGameUIDInfoTableType, BaseUserInfoTableType, BindUidsItemType, UidPermission } from './mysUserInfo.js';
4
4
  import '../dbs/base.js';
5
5
  import 'sequelize';
@@ -19,13 +19,14 @@ declare const enum UidPermission {
19
19
  /** @description 删除绑定 */
20
20
  DEL = 4
21
21
  }
22
+ interface BindUidsItemType {
23
+ perm: UidPermission;
24
+ ltuid: string;
25
+ }
22
26
  type BaseGameUIDInfoTableType<Game extends string> = {
23
27
  [P in `${Game}-main`]: string;
24
28
  } & {
25
- [P in `${Game}-uids`]: Partial<Record<string, {
26
- perm: UidPermission;
27
- ltuid: string;
28
- }>>;
29
+ [P in `${Game}-uids`]: Partial<Record<string, BindUidsItemType>>;
29
30
  };
30
31
 
31
- export { type BaseGameUIDInfoTableType, type BaseUserInfoTableType, UidPermission };
32
+ export { type BaseGameUIDInfoTableType, type BaseUserInfoTableType, type BindUidsItemType, UidPermission };
@@ -7,29 +7,29 @@ import {
7
7
  getUserFullInfo,
8
8
  getUserGameRolesByCookie,
9
9
  queryQRcode
10
- } from "../../../chunk-DJTJKSNN.js";
10
+ } from "../../../chunk-CZD74R2W.js";
11
+ import "../../../chunk-2BVJS5VE.js";
12
+ import "../../../chunk-G5W5WAY5.js";
11
13
  import "../../../chunk-7VAWV6ZE.js";
12
14
  import "../../../chunk-LJSDSOY6.js";
13
15
  import "../../../chunk-CFS2WFOO.js";
14
16
  import "../../../chunk-MWYDWDR4.js";
15
17
  import "../../../chunk-FOAQZIZ2.js";
16
18
  import "../../../chunk-WCX7WZAQ.js";
17
- import "../../../chunk-BH4S574A.js";
18
- import "../../../chunk-BWFWWHCT.js";
19
- import "../../../chunk-G5W5WAY5.js";
20
- import "../../../chunk-XQWTJIT4.js";
21
- import "../../../chunk-7SZX3RBZ.js";
22
- import "../../../chunk-2DHTKQ34.js";
19
+ import "../../../chunk-2WGBVGJM.js";
20
+ import "../../../chunk-3ERB3ILC.js";
21
+ import "../../../chunk-OYGNSYOG.js";
22
+ import "../../../chunk-PMFOX5HA.js";
23
23
  import "../../../chunk-W4DBT7AD.js";
24
24
  import "../../../chunk-Z5I6A73Y.js";
25
- import "../../../chunk-BNSHDFFN.js";
26
- import "../../../chunk-HTH25YE2.js";
27
- import "../../../chunk-7ZQQ76WC.js";
25
+ import "../../../chunk-EDNBKOMS.js";
26
+ import "../../../chunk-3R37ZEXD.js";
27
+ import "../../../chunk-HJ6HX5HB.js";
28
28
  import "../../../chunk-SEWEEPJN.js";
29
- import "../../../chunk-EAVXU4Q2.js";
30
- import "../../../chunk-G547WVGV.js";
31
- import "../../../chunk-EMAUATE3.js";
32
- import "../../../chunk-Y3J3J5B2.js";
29
+ import "../../../chunk-G7TMVDGP.js";
30
+ import "../../../chunk-DMJ5OQR6.js";
31
+ import "../../../chunk-MPZP23EX.js";
32
+ import "../../../chunk-3JN5WYUN.js";
33
33
  import "../../../chunk-7KEG6SDX.js";
34
34
  import "../../../chunk-FBWSEBAW.js";
35
35
  import "../../../chunk-JVJQKRJ4.js";
@@ -38,11 +38,11 @@ import "../../../chunk-SHW6FHIB.js";
38
38
  import "../../../chunk-K5U2O3HH.js";
39
39
  import "../../../chunk-I7XZONDN.js";
40
40
  import "../../../chunk-JRH4JC43.js";
41
- import "../../../chunk-UC6INRYV.js";
42
- import "../../../chunk-LG34FPBI.js";
41
+ import "../../../chunk-ARLTXJFJ.js";
42
+ import "../../../chunk-PYTECG57.js";
43
+ import "../../../chunk-T7W4DXRM.js";
44
+ import "../../../chunk-5DXIT7UB.js";
43
45
  import "../../../chunk-SHLPPEAY.js";
44
- import "../../../chunk-BXA3VAQC.js";
45
- import "../../../chunk-6PIXUPZ6.js";
46
46
  import "../../../chunk-MLKGABMK.js";
47
47
  export {
48
48
  fetchQRcode,
@@ -4,14 +4,14 @@ import {
4
4
  } from "../../../chunk-G5W5WAY5.js";
5
5
  import "../../../chunk-W4DBT7AD.js";
6
6
  import "../../../chunk-Z5I6A73Y.js";
7
- import "../../../chunk-BNSHDFFN.js";
8
- import "../../../chunk-HTH25YE2.js";
9
- import "../../../chunk-7ZQQ76WC.js";
7
+ import "../../../chunk-EDNBKOMS.js";
8
+ import "../../../chunk-3R37ZEXD.js";
9
+ import "../../../chunk-HJ6HX5HB.js";
10
10
  import "../../../chunk-SEWEEPJN.js";
11
- import "../../../chunk-EAVXU4Q2.js";
12
- import "../../../chunk-G547WVGV.js";
13
- import "../../../chunk-EMAUATE3.js";
14
- import "../../../chunk-Y3J3J5B2.js";
11
+ import "../../../chunk-G7TMVDGP.js";
12
+ import "../../../chunk-DMJ5OQR6.js";
13
+ import "../../../chunk-MPZP23EX.js";
14
+ import "../../../chunk-3JN5WYUN.js";
15
15
  import "../../../chunk-7KEG6SDX.js";
16
16
  import "../../../chunk-FBWSEBAW.js";
17
17
  import "../../../chunk-JVJQKRJ4.js";
@@ -20,8 +20,10 @@ import "../../../chunk-SHW6FHIB.js";
20
20
  import "../../../chunk-K5U2O3HH.js";
21
21
  import "../../../chunk-I7XZONDN.js";
22
22
  import "../../../chunk-JRH4JC43.js";
23
- import "../../../chunk-UC6INRYV.js";
24
- import "../../../chunk-LG34FPBI.js";
23
+ import "../../../chunk-ARLTXJFJ.js";
24
+ import "../../../chunk-PYTECG57.js";
25
+ import "../../../chunk-T7W4DXRM.js";
26
+ import "../../../chunk-5DXIT7UB.js";
25
27
  import "../../../chunk-SHLPPEAY.js";
26
28
  import "../../../chunk-MLKGABMK.js";
27
29
  export {
@@ -1,28 +1,28 @@
1
1
  import {
2
2
  DefineApi
3
- } from "../../../chunk-DJTJKSNN.js";
3
+ } from "../../../chunk-CZD74R2W.js";
4
+ import "../../../chunk-2BVJS5VE.js";
5
+ import "../../../chunk-G5W5WAY5.js";
4
6
  import "../../../chunk-7VAWV6ZE.js";
5
7
  import "../../../chunk-LJSDSOY6.js";
6
8
  import "../../../chunk-CFS2WFOO.js";
7
9
  import "../../../chunk-MWYDWDR4.js";
8
10
  import "../../../chunk-FOAQZIZ2.js";
9
11
  import "../../../chunk-WCX7WZAQ.js";
10
- import "../../../chunk-BH4S574A.js";
11
- import "../../../chunk-BWFWWHCT.js";
12
- import "../../../chunk-G5W5WAY5.js";
13
- import "../../../chunk-XQWTJIT4.js";
14
- import "../../../chunk-7SZX3RBZ.js";
15
- import "../../../chunk-2DHTKQ34.js";
12
+ import "../../../chunk-2WGBVGJM.js";
13
+ import "../../../chunk-3ERB3ILC.js";
14
+ import "../../../chunk-OYGNSYOG.js";
15
+ import "../../../chunk-PMFOX5HA.js";
16
16
  import "../../../chunk-W4DBT7AD.js";
17
17
  import "../../../chunk-Z5I6A73Y.js";
18
- import "../../../chunk-BNSHDFFN.js";
19
- import "../../../chunk-HTH25YE2.js";
20
- import "../../../chunk-7ZQQ76WC.js";
18
+ import "../../../chunk-EDNBKOMS.js";
19
+ import "../../../chunk-3R37ZEXD.js";
20
+ import "../../../chunk-HJ6HX5HB.js";
21
21
  import "../../../chunk-SEWEEPJN.js";
22
- import "../../../chunk-EAVXU4Q2.js";
23
- import "../../../chunk-G547WVGV.js";
24
- import "../../../chunk-EMAUATE3.js";
25
- import "../../../chunk-Y3J3J5B2.js";
22
+ import "../../../chunk-G7TMVDGP.js";
23
+ import "../../../chunk-DMJ5OQR6.js";
24
+ import "../../../chunk-MPZP23EX.js";
25
+ import "../../../chunk-3JN5WYUN.js";
26
26
  import "../../../chunk-7KEG6SDX.js";
27
27
  import "../../../chunk-FBWSEBAW.js";
28
28
  import "../../../chunk-JVJQKRJ4.js";
@@ -31,11 +31,11 @@ import "../../../chunk-SHW6FHIB.js";
31
31
  import "../../../chunk-K5U2O3HH.js";
32
32
  import "../../../chunk-I7XZONDN.js";
33
33
  import "../../../chunk-JRH4JC43.js";
34
- import "../../../chunk-UC6INRYV.js";
35
- import "../../../chunk-LG34FPBI.js";
34
+ import "../../../chunk-ARLTXJFJ.js";
35
+ import "../../../chunk-PYTECG57.js";
36
+ import "../../../chunk-T7W4DXRM.js";
37
+ import "../../../chunk-5DXIT7UB.js";
36
38
  import "../../../chunk-SHLPPEAY.js";
37
- import "../../../chunk-BXA3VAQC.js";
38
- import "../../../chunk-6PIXUPZ6.js";
39
39
  import "../../../chunk-MLKGABMK.js";
40
40
  export {
41
41
  DefineApi
@@ -8,32 +8,32 @@ import {
8
8
  getUserFullInfo,
9
9
  getUserGameRolesByCookie,
10
10
  queryQRcode
11
- } from "../../../chunk-DJTJKSNN.js";
11
+ } from "../../../chunk-CZD74R2W.js";
12
+ import "../../../chunk-2BVJS5VE.js";
13
+ import {
14
+ MysApp,
15
+ MysHosts
16
+ } from "../../../chunk-G5W5WAY5.js";
12
17
  import "../../../chunk-7VAWV6ZE.js";
13
18
  import "../../../chunk-LJSDSOY6.js";
14
19
  import "../../../chunk-CFS2WFOO.js";
15
20
  import "../../../chunk-MWYDWDR4.js";
16
21
  import "../../../chunk-FOAQZIZ2.js";
17
22
  import "../../../chunk-WCX7WZAQ.js";
18
- import "../../../chunk-BH4S574A.js";
19
- import "../../../chunk-BWFWWHCT.js";
20
- import {
21
- MysApp,
22
- MysHosts
23
- } from "../../../chunk-G5W5WAY5.js";
24
- import "../../../chunk-XQWTJIT4.js";
25
- import "../../../chunk-7SZX3RBZ.js";
26
- import "../../../chunk-2DHTKQ34.js";
23
+ import "../../../chunk-2WGBVGJM.js";
24
+ import "../../../chunk-3ERB3ILC.js";
25
+ import "../../../chunk-OYGNSYOG.js";
26
+ import "../../../chunk-PMFOX5HA.js";
27
27
  import "../../../chunk-W4DBT7AD.js";
28
28
  import "../../../chunk-Z5I6A73Y.js";
29
- import "../../../chunk-BNSHDFFN.js";
30
- import "../../../chunk-HTH25YE2.js";
31
- import "../../../chunk-7ZQQ76WC.js";
29
+ import "../../../chunk-EDNBKOMS.js";
30
+ import "../../../chunk-3R37ZEXD.js";
31
+ import "../../../chunk-HJ6HX5HB.js";
32
32
  import "../../../chunk-SEWEEPJN.js";
33
- import "../../../chunk-EAVXU4Q2.js";
34
- import "../../../chunk-G547WVGV.js";
35
- import "../../../chunk-EMAUATE3.js";
36
- import "../../../chunk-Y3J3J5B2.js";
33
+ import "../../../chunk-G7TMVDGP.js";
34
+ import "../../../chunk-DMJ5OQR6.js";
35
+ import "../../../chunk-MPZP23EX.js";
36
+ import "../../../chunk-3JN5WYUN.js";
37
37
  import "../../../chunk-7KEG6SDX.js";
38
38
  import "../../../chunk-FBWSEBAW.js";
39
39
  import "../../../chunk-JVJQKRJ4.js";
@@ -42,11 +42,11 @@ import "../../../chunk-SHW6FHIB.js";
42
42
  import "../../../chunk-K5U2O3HH.js";
43
43
  import "../../../chunk-I7XZONDN.js";
44
44
  import "../../../chunk-JRH4JC43.js";
45
- import "../../../chunk-UC6INRYV.js";
46
- import "../../../chunk-LG34FPBI.js";
45
+ import "../../../chunk-ARLTXJFJ.js";
46
+ import "../../../chunk-PYTECG57.js";
47
+ import "../../../chunk-T7W4DXRM.js";
48
+ import "../../../chunk-5DXIT7UB.js";
47
49
  import "../../../chunk-SHLPPEAY.js";
48
- import "../../../chunk-BXA3VAQC.js";
49
- import "../../../chunk-6PIXUPZ6.js";
50
50
  import "../../../chunk-MLKGABMK.js";
51
51
  export {
52
52
  DefineApi,