tspace-mysql 1.9.4-beta.4 → 1.9.4-beta.5
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.
- package/dist/lib/core/Abstracts/AbstractModel.d.ts +1 -2
- package/dist/lib/core/Abstracts/AbstractModel.js +0 -1
- package/dist/lib/core/Abstracts/AbstractModel.js.map +1 -1
- package/dist/lib/core/Cache/DBCache.js +6 -5
- package/dist/lib/core/Cache/DBCache.js.map +1 -1
- package/dist/lib/core/Cache/index.js +1 -1
- package/dist/lib/core/Cache/index.js.map +1 -1
- package/dist/lib/core/Model.d.ts +7 -15
- package/dist/lib/core/Model.js +65 -32
- package/dist/lib/core/Model.js.map +1 -1
- package/dist/lib/core/Queue/types.d.ts +4 -2
- package/dist/lib/core/Queue/worker.d.ts +3 -1
- package/dist/lib/core/Queue/worker.js +20 -4
- package/dist/lib/core/Queue/worker.js.map +1 -1
- package/dist/lib/core/StateManager.d.ts +2 -0
- package/dist/lib/core/StateManager.js +5 -4
- package/dist/lib/core/StateManager.js.map +1 -1
- package/dist/lib/core/UtilityTypes.d.ts +3 -1
- package/dist/lib/core/UtilityTypes.js.map +1 -1
- package/dist/lib/types/index.d.ts +7 -7
- package/package.json +1 -1
|
@@ -3,10 +3,9 @@ import { Builder } from '../Builder';
|
|
|
3
3
|
import { RelationManager } from '../RelationManager';
|
|
4
4
|
import { Model } from '../Model';
|
|
5
5
|
import type { T } from '../UtilityTypes';
|
|
6
|
-
import type { TPattern, TValidateSchema,
|
|
6
|
+
import type { TPattern, TValidateSchema, TRelationOptions, TRelationQueryOptions, TModelOrObject } from '../../types';
|
|
7
7
|
import { JoinModel } from '../JoinModel';
|
|
8
8
|
declare abstract class AbstractModel extends Builder<any> {
|
|
9
|
-
protected $cache: TCache;
|
|
10
9
|
protected $relation: RelationManager;
|
|
11
10
|
protected $schema: Record<string, Blueprint>;
|
|
12
11
|
protected $validateSchema: TValidateSchema;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractModel.js","sourceRoot":"","sources":["../../../../src/lib/core/Abstracts/AbstractModel.ts"],"names":[],"mappings":";;;AACA,wCAA8C;
|
|
1
|
+
{"version":3,"file":"AbstractModel.js","sourceRoot":"","sources":["../../../../src/lib/core/Abstracts/AbstractModel.ts"],"names":[],"mappings":";;;AACA,wCAA8C;AAY9C,MAAe,aAAc,SAAQ,iBAAY;IAEnC,SAAS,CAA4B;IACrC,OAAO,CAAyC;IAChD,eAAe,CAAsB;IACrC,MAAM,CAAsB;IAC5B,QAAQ,CAAsB;IAC9B,QAAQ,CAAqC;IAC7C,OAAO,CAAsC;IAC7C,UAAU,CAAmC;IAC7C,cAAc,CAA+B;IAC7C,UAAU,CAAmB;IAC7B,WAAW,CAAkB;IAC7B,KAAK,CAAwB;IAC7B,WAAW,CAAiB;IAC5B,iBAAiB,CAAgD;IACjE,iBAAiB,CAAW;IAC5B,SAAS,CAKjB;IACQ,WAAW,CAGZ;CAuJZ;AAEQ,sCAAa;AACtB,kBAAe,aAAa,CAAA"}
|
|
@@ -6,11 +6,11 @@ const DB_1 = require("../DB");
|
|
|
6
6
|
const Blueprint_1 = require("../Blueprint");
|
|
7
7
|
const utils_1 = require("../../utils");
|
|
8
8
|
class DBCache {
|
|
9
|
-
_cacheTable = '
|
|
9
|
+
_cacheTable = () => new Model_1.Model()['$state'].get('TABLE_CACHE');
|
|
10
10
|
_v0x = 'v0x';
|
|
11
11
|
_maxAddress = 10;
|
|
12
12
|
_maxLength = 100;
|
|
13
|
-
_db = () => new DB_1.DB(this._cacheTable);
|
|
13
|
+
_db = () => new DB_1.DB(this._cacheTable());
|
|
14
14
|
provider() {
|
|
15
15
|
return 'db';
|
|
16
16
|
}
|
|
@@ -59,8 +59,9 @@ class DBCache {
|
|
|
59
59
|
return null;
|
|
60
60
|
}
|
|
61
61
|
const value = this._safetyJsonParse(cached[this._addressNumber(0)]);
|
|
62
|
-
if (!Array.isArray(value))
|
|
62
|
+
if (!Array.isArray(value)) {
|
|
63
63
|
return value;
|
|
64
|
+
}
|
|
64
65
|
const values = [];
|
|
65
66
|
for (let i = 0; i < this._maxAddress; i++) {
|
|
66
67
|
const find = cached[this._addressNumber(i)];
|
|
@@ -73,7 +74,7 @@ class DBCache {
|
|
|
73
74
|
}
|
|
74
75
|
values.push(parsed);
|
|
75
76
|
}
|
|
76
|
-
return values
|
|
77
|
+
return values;
|
|
77
78
|
}
|
|
78
79
|
catch (err) {
|
|
79
80
|
const message = String(err?.message ?? '');
|
|
@@ -130,7 +131,7 @@ class DBCache {
|
|
|
130
131
|
return `${this._v0x}${index}`;
|
|
131
132
|
}
|
|
132
133
|
async _checkTableCacheExists() {
|
|
133
|
-
const table = this._cacheTable;
|
|
134
|
+
const table = this._cacheTable();
|
|
134
135
|
const hasTable = await new DB_1.DB().hasTable(table);
|
|
135
136
|
if (hasTable)
|
|
136
137
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DBCache.js","sourceRoot":"","sources":["../../../../src/lib/core/Cache/DBCache.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"DBCache.js","sourceRoot":"","sources":["../../../../src/lib/core/Cache/DBCache.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ const DBCache_1 = require("./DBCache");
|
|
|
6
6
|
const RedisCache_1 = require("./RedisCache");
|
|
7
7
|
const config_1 = require("../../config");
|
|
8
8
|
class Cache {
|
|
9
|
-
_driver
|
|
9
|
+
_driver;
|
|
10
10
|
constructor() {
|
|
11
11
|
this._chooseDriver(config_1.Config.CACHE);
|
|
12
12
|
return this;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/core/Cache/index.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/lib/core/Cache/index.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/core/Model.d.ts
CHANGED
|
@@ -787,7 +787,7 @@ declare class Model<TS extends Record<string, any> = any, TR = unknown, TA exten
|
|
|
787
787
|
* selecting a cache driver, managing cache entries, and optionally generating
|
|
788
788
|
* model-scoped cache keys.
|
|
789
789
|
*
|
|
790
|
-
* When the `namespace`
|
|
790
|
+
* When the `namespace` is default true, cache keys are automatically prefixed
|
|
791
791
|
* with the current database and table name in the following format:
|
|
792
792
|
*
|
|
793
793
|
* `database:table:key`
|
|
@@ -802,27 +802,19 @@ declare class Model<TS extends Record<string, any> = any, TR = unknown, TA exten
|
|
|
802
802
|
*
|
|
803
803
|
* @example
|
|
804
804
|
* // Store a value using a model-scoped cache key.
|
|
805
|
-
* await User.cache.set("users", users, 60_000
|
|
806
|
-
* namespace: true
|
|
807
|
-
* });
|
|
805
|
+
* await User.cache.set("users", users, 60_000);
|
|
808
806
|
*
|
|
809
807
|
* @example
|
|
810
808
|
* // Retrieve a model-scoped cache value.
|
|
811
|
-
* const users = await User.cache.get("users"
|
|
812
|
-
* namespace: true
|
|
813
|
-
* });
|
|
809
|
+
* const users = await User.cache.get("users");
|
|
814
810
|
*
|
|
815
811
|
* @example
|
|
816
812
|
* // Check whether a cache entry exists.
|
|
817
|
-
* const exists = await User.cache.exists("users"
|
|
818
|
-
* namespace: true
|
|
819
|
-
* });
|
|
813
|
+
* const exists = await User.cache.exists("users");
|
|
820
814
|
*
|
|
821
815
|
* @example
|
|
822
816
|
* // Delete a cache entry.
|
|
823
|
-
* await User.cache.delete("users"
|
|
824
|
-
* namespace: true
|
|
825
|
-
* });
|
|
817
|
+
* await User.cache.delete("users");
|
|
826
818
|
*
|
|
827
819
|
* @example
|
|
828
820
|
* // Clear all cache entries.
|
|
@@ -1416,10 +1408,10 @@ declare class Model<TS extends Record<string, any> = any, TR = unknown, TA exten
|
|
|
1416
1408
|
* @param {Object} object
|
|
1417
1409
|
* @property {string} key key of cache
|
|
1418
1410
|
* @property {number} expires ms
|
|
1419
|
-
* @property {boolean} namespace whether to use namespace for cache key, default is
|
|
1411
|
+
* @property {boolean} namespace whether to use namespace for cache key, default is true, namespace is `${database}:${table}:${key}`
|
|
1420
1412
|
* @returns {this} this
|
|
1421
1413
|
*/
|
|
1422
|
-
cache({ key, expires, namespace }: {
|
|
1414
|
+
cache({ key, expires, namespace, }: {
|
|
1423
1415
|
key: string;
|
|
1424
1416
|
expires: number;
|
|
1425
1417
|
namespace?: boolean;
|
package/dist/lib/core/Model.js
CHANGED
|
@@ -912,7 +912,7 @@ class Model extends AbstractModel_1.AbstractModel {
|
|
|
912
912
|
* selecting a cache driver, managing cache entries, and optionally generating
|
|
913
913
|
* model-scoped cache keys.
|
|
914
914
|
*
|
|
915
|
-
* When the `namespace`
|
|
915
|
+
* When the `namespace` is default true, cache keys are automatically prefixed
|
|
916
916
|
* with the current database and table name in the following format:
|
|
917
917
|
*
|
|
918
918
|
* `database:table:key`
|
|
@@ -927,61 +927,95 @@ class Model extends AbstractModel_1.AbstractModel {
|
|
|
927
927
|
*
|
|
928
928
|
* @example
|
|
929
929
|
* // Store a value using a model-scoped cache key.
|
|
930
|
-
* await User.cache.set("users", users, 60_000
|
|
931
|
-
* namespace: true
|
|
932
|
-
* });
|
|
930
|
+
* await User.cache.set("users", users, 60_000);
|
|
933
931
|
*
|
|
934
932
|
* @example
|
|
935
933
|
* // Retrieve a model-scoped cache value.
|
|
936
|
-
* const users = await User.cache.get("users"
|
|
937
|
-
* namespace: true
|
|
938
|
-
* });
|
|
934
|
+
* const users = await User.cache.get("users");
|
|
939
935
|
*
|
|
940
936
|
* @example
|
|
941
937
|
* // Check whether a cache entry exists.
|
|
942
|
-
* const exists = await User.cache.exists("users"
|
|
943
|
-
* namespace: true
|
|
944
|
-
* });
|
|
938
|
+
* const exists = await User.cache.exists("users");
|
|
945
939
|
*
|
|
946
940
|
* @example
|
|
947
941
|
* // Delete a cache entry.
|
|
948
|
-
* await User.cache.delete("users"
|
|
949
|
-
* namespace: true
|
|
950
|
-
* });
|
|
942
|
+
* await User.cache.delete("users");
|
|
951
943
|
*
|
|
952
944
|
* @example
|
|
953
945
|
* // Clear all cache entries.
|
|
954
946
|
* await User.cache.clear();
|
|
955
947
|
*/
|
|
956
948
|
static get cache() {
|
|
957
|
-
const
|
|
949
|
+
const keyWithNamespace = (key) => {
|
|
958
950
|
const db = new this().database();
|
|
959
951
|
const table = new this().getTableName();
|
|
960
952
|
return `${db}:${table}:${key}`;
|
|
961
953
|
};
|
|
962
954
|
return {
|
|
955
|
+
/** Returns the configured cache provider. */
|
|
963
956
|
provider: () => Cache_1.Cache.provider(),
|
|
957
|
+
/**
|
|
958
|
+
* Sets the cache driver.
|
|
959
|
+
*
|
|
960
|
+
* @param driver - The cache driver to use: `db`, `memory`, or `redis`.
|
|
961
|
+
*/
|
|
964
962
|
driver: (driver) => Cache_1.Cache.driver(driver),
|
|
963
|
+
/** Retrieves all cached entries. */
|
|
965
964
|
all: async () => {
|
|
966
965
|
return await Cache_1.Cache.all();
|
|
967
966
|
},
|
|
967
|
+
/** Removes all cached entries. */
|
|
968
968
|
clear: async () => {
|
|
969
969
|
return await Cache_1.Cache.clear();
|
|
970
970
|
},
|
|
971
|
-
|
|
972
|
-
|
|
971
|
+
/**
|
|
972
|
+
* Retrieves a cached value by key.
|
|
973
|
+
*
|
|
974
|
+
* @param key - The cache key.
|
|
975
|
+
* @param options - Cache options.
|
|
976
|
+
* @param options.namespace - Whether to prefix the key with the model's database and table. Defaults to `true`.
|
|
977
|
+
* @returns The cached value, or the result returned by the cache provider when the key is missing.
|
|
978
|
+
*/
|
|
979
|
+
get: async (key, { namespace = true } = {}) => {
|
|
980
|
+
const cacheKey = namespace ? keyWithNamespace(key) : key;
|
|
973
981
|
return await Cache_1.Cache.get(cacheKey);
|
|
974
982
|
},
|
|
975
|
-
|
|
976
|
-
|
|
983
|
+
/**
|
|
984
|
+
* Checks whether a cache key exists.
|
|
985
|
+
*
|
|
986
|
+
* @param key - The cache key.
|
|
987
|
+
* @param options - Cache options.
|
|
988
|
+
* @param options.namespace - Whether to prefix the key with the model's database and table. Defaults to `true`.
|
|
989
|
+
* @returns Whether the cache key exists.
|
|
990
|
+
*/
|
|
991
|
+
exists: async (key, { namespace = true } = {}) => {
|
|
992
|
+
const cacheKey = namespace ? keyWithNamespace(key) : key;
|
|
977
993
|
return await Cache_1.Cache.exists(cacheKey);
|
|
978
994
|
},
|
|
979
|
-
|
|
980
|
-
|
|
995
|
+
/**
|
|
996
|
+
* Stores a value in the cache.
|
|
997
|
+
*
|
|
998
|
+
* @param key - The cache key.
|
|
999
|
+
* @param value - The value to cache.
|
|
1000
|
+
* @param ms - The cache expiration time in milliseconds.
|
|
1001
|
+
* @param options - Cache options.
|
|
1002
|
+
* @param options.namespace - Whether to prefix the key with the model's database and table. Defaults to `true`.
|
|
1003
|
+
* @returns The result returned by the cache provider.
|
|
1004
|
+
*/
|
|
1005
|
+
set: async (key, value, ms, { namespace = true } = {}) => {
|
|
1006
|
+
const cacheKey = namespace ? keyWithNamespace(key) : key;
|
|
981
1007
|
return await Cache_1.Cache.set(cacheKey, value, ms);
|
|
982
1008
|
},
|
|
983
|
-
|
|
984
|
-
|
|
1009
|
+
/**
|
|
1010
|
+
* Deletes a cached value by key.
|
|
1011
|
+
*
|
|
1012
|
+
* @param key - The cache key.
|
|
1013
|
+
* @param options - Cache options.
|
|
1014
|
+
* @param options.namespace - Whether to prefix the key with the model's database and table. Defaults to `true`.
|
|
1015
|
+
* @returns The result returned by the cache provider.
|
|
1016
|
+
*/
|
|
1017
|
+
delete: async (key, { namespace = true } = {}) => {
|
|
1018
|
+
const cacheKey = namespace ? keyWithNamespace(key) : key;
|
|
985
1019
|
return await Cache_1.Cache.delete(cacheKey);
|
|
986
1020
|
},
|
|
987
1021
|
};
|
|
@@ -1846,16 +1880,16 @@ class Model extends AbstractModel_1.AbstractModel {
|
|
|
1846
1880
|
* @param {Object} object
|
|
1847
1881
|
* @property {string} key key of cache
|
|
1848
1882
|
* @property {number} expires ms
|
|
1849
|
-
* @property {boolean} namespace whether to use namespace for cache key, default is
|
|
1883
|
+
* @property {boolean} namespace whether to use namespace for cache key, default is true, namespace is `${database}:${table}:${key}`
|
|
1850
1884
|
* @returns {this} this
|
|
1851
1885
|
*/
|
|
1852
|
-
cache({ key, expires, namespace }) {
|
|
1853
|
-
const
|
|
1886
|
+
cache({ key, expires, namespace = true, }) {
|
|
1887
|
+
const keyWithNamespace = (key) => {
|
|
1854
1888
|
const db = this.database();
|
|
1855
1889
|
const table = this.getTableName();
|
|
1856
1890
|
return `${db}:${table}:${key}`;
|
|
1857
1891
|
};
|
|
1858
|
-
const cacheKey = namespace ?
|
|
1892
|
+
const cacheKey = namespace ? keyWithNamespace(key) : key;
|
|
1859
1893
|
this.$state.set("CACHE", {
|
|
1860
1894
|
key: cacheKey,
|
|
1861
1895
|
expires
|
|
@@ -6363,12 +6397,12 @@ class Model extends AbstractModel_1.AbstractModel {
|
|
|
6363
6397
|
if (cache == null)
|
|
6364
6398
|
return;
|
|
6365
6399
|
const startTime = +new Date();
|
|
6366
|
-
const findCache = await
|
|
6400
|
+
const findCache = await Cache_1.Cache.get(cache.key);
|
|
6367
6401
|
if (findCache == null)
|
|
6368
6402
|
return;
|
|
6369
6403
|
if (this.$state.get("DEBUG")) {
|
|
6370
6404
|
this.$utils.consoleCache({
|
|
6371
|
-
driver:
|
|
6405
|
+
driver: Cache_1.Cache.provider(),
|
|
6372
6406
|
key: cache.key,
|
|
6373
6407
|
expires: cache.expires,
|
|
6374
6408
|
type: this.$utils.typeOf(findCache),
|
|
@@ -6386,10 +6420,10 @@ class Model extends AbstractModel_1.AbstractModel {
|
|
|
6386
6420
|
const cache = this.$state.get("CACHE");
|
|
6387
6421
|
if (cache == null)
|
|
6388
6422
|
return;
|
|
6389
|
-
const exists = await
|
|
6423
|
+
const exists = await Cache_1.Cache.exists(cache.key);
|
|
6390
6424
|
if (exists)
|
|
6391
6425
|
return;
|
|
6392
|
-
await
|
|
6426
|
+
await Cache_1.Cache.set(cache.key, data, cache.expires);
|
|
6393
6427
|
}
|
|
6394
6428
|
async _execute({ sql, type, message, options }) {
|
|
6395
6429
|
const middlewares = this.$state.get("MIDDLEWARES");
|
|
@@ -7281,7 +7315,6 @@ class Model extends AbstractModel_1.AbstractModel {
|
|
|
7281
7315
|
return formatObject(data);
|
|
7282
7316
|
}
|
|
7283
7317
|
_initialModel() {
|
|
7284
|
-
this.$cache = Cache_1.Cache;
|
|
7285
7318
|
this.$state = new StateManager_1.StateManager("model");
|
|
7286
7319
|
this.metaTag("MAIN");
|
|
7287
7320
|
this._makeTableName();
|
|
@@ -7294,7 +7327,7 @@ class Model extends AbstractModel_1.AbstractModel {
|
|
|
7294
7327
|
this.useUUID();
|
|
7295
7328
|
if (globalSettings.timestamp)
|
|
7296
7329
|
this.useTimestamp();
|
|
7297
|
-
if (globalSettings.logger
|
|
7330
|
+
if (globalSettings.logger) {
|
|
7298
7331
|
this.useLogger({
|
|
7299
7332
|
selected: globalSettings.logger?.selected,
|
|
7300
7333
|
inserted: globalSettings.logger?.inserted,
|