@minimaltech/node-infra 0.3.21 → 0.3.23

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 (127) hide show
  1. package/dist/base/applications/base.application.d.ts +4 -2
  2. package/dist/base/applications/base.application.js +8 -2
  3. package/dist/base/applications/base.application.js.map +1 -1
  4. package/dist/base/controllers/relational.controller.js +1 -1
  5. package/dist/base/controllers/relational.controller.js.map +1 -1
  6. package/dist/base/datasources/base.datasource.d.ts +11 -0
  7. package/dist/base/datasources/base.datasource.js +19 -0
  8. package/dist/base/datasources/base.datasource.js.map +1 -0
  9. package/dist/base/datasources/index.d.ts +2 -0
  10. package/dist/base/datasources/index.js +19 -0
  11. package/dist/base/datasources/index.js.map +1 -0
  12. package/dist/base/datasources/types.d.ts +4 -0
  13. package/dist/base/datasources/types.js +3 -0
  14. package/dist/base/datasources/types.js.map +1 -0
  15. package/dist/base/index.d.ts +1 -1
  16. package/dist/base/index.js +1 -1
  17. package/dist/base/index.js.map +1 -1
  18. package/dist/base/repositories/base.repository.d.ts +11 -1
  19. package/dist/base/repositories/base.repository.js +25 -3
  20. package/dist/base/repositories/base.repository.js.map +1 -1
  21. package/dist/base/repositories/index.d.ts +2 -1
  22. package/dist/base/repositories/index.js +2 -1
  23. package/dist/base/repositories/index.js.map +1 -1
  24. package/dist/base/repositories/relations/has-many-polymorphic/decorator.d.ts +11 -0
  25. package/dist/base/repositories/relations/has-many-polymorphic/decorator.js +21 -0
  26. package/dist/base/repositories/relations/has-many-polymorphic/decorator.js.map +1 -0
  27. package/dist/base/repositories/relations/has-many-polymorphic/factory.d.ts +33 -0
  28. package/dist/base/repositories/relations/has-many-polymorphic/factory.js +107 -0
  29. package/dist/base/repositories/relations/has-many-polymorphic/factory.js.map +1 -0
  30. package/dist/base/repositories/relations/has-many-polymorphic/index.d.ts +3 -0
  31. package/dist/base/repositories/relations/has-many-polymorphic/index.js +20 -0
  32. package/dist/base/repositories/relations/has-many-polymorphic/index.js.map +1 -0
  33. package/dist/base/repositories/relations/has-many-polymorphic/types.d.ts +10 -0
  34. package/dist/base/repositories/relations/has-many-polymorphic/types.js +3 -0
  35. package/dist/base/repositories/relations/has-many-polymorphic/types.js.map +1 -0
  36. package/dist/base/repositories/relations/index.d.ts +1 -0
  37. package/dist/base/repositories/relations/index.js +18 -0
  38. package/dist/base/repositories/relations/index.js.map +1 -0
  39. package/dist/base/repositories/searchable-tz-crud.repository.d.ts +16 -4
  40. package/dist/base/repositories/searchable-tz-crud.repository.js +57 -20
  41. package/dist/base/repositories/searchable-tz-crud.repository.js.map +1 -1
  42. package/dist/base/repositories/tz-crud.repository.js +11 -0
  43. package/dist/base/repositories/tz-crud.repository.js.map +1 -1
  44. package/dist/common/constants.d.ts +41 -5
  45. package/dist/common/constants.js +60 -9
  46. package/dist/common/constants.js.map +1 -1
  47. package/dist/common/types.d.ts +20 -3
  48. package/dist/components/authenticate/models/oauth2-client.model.js +3 -0
  49. package/dist/components/authenticate/models/oauth2-client.model.js.map +1 -1
  50. package/dist/components/authenticate/repositories/oauth2.repository.d.ts +1 -1
  51. package/dist/components/authenticate/repositories/oauth2.repository.js +4 -4
  52. package/dist/components/authenticate/repositories/oauth2.repository.js.map +1 -1
  53. package/dist/components/authorize/adapters/adapter-builder.d.ts +1 -1
  54. package/dist/components/authorize/adapters/base.adapter.d.ts +1 -1
  55. package/dist/components/authorize/adapters/casbin-postgres-adapter.helper.d.ts +1 -1
  56. package/dist/components/authorize/adapters/casbin-redis-adapter.helper.d.ts +1 -1
  57. package/dist/components/authorize/migrations/0000-create-view-policy.js +5 -5
  58. package/dist/components/authorize/migrations/0000-create-view-policy.js.map +1 -1
  59. package/dist/components/authorize/repositories/authorize.repository.d.ts +1 -1
  60. package/dist/components/authorize/repositories/authorize.repository.js +6 -6
  61. package/dist/components/authorize/repositories/authorize.repository.js.map +1 -1
  62. package/dist/components/authorize/services/enforcer.service.d.ts +1 -1
  63. package/dist/components/authorize/services/enforcer.service.js +2 -2
  64. package/dist/components/authorize/services/enforcer.service.js.map +1 -1
  65. package/dist/components/crash-report/common/keys.d.ts +1 -1
  66. package/dist/components/crash-report/common/keys.js +2 -2
  67. package/dist/components/crash-report/common/keys.js.map +1 -1
  68. package/dist/components/crash-report/component.js +1 -1
  69. package/dist/components/crash-report/component.js.map +1 -1
  70. package/dist/components/grpc/helpers/grpc-server.js +17 -7
  71. package/dist/components/grpc/helpers/grpc-server.js.map +1 -1
  72. package/dist/components/migration/repositories/migration.repository.d.ts +1 -1
  73. package/dist/components/migration/repositories/migration.repository.js +2 -2
  74. package/dist/components/migration/repositories/migration.repository.js.map +1 -1
  75. package/dist/components/socket-io/helpers/socket-io-server.helper.js +1 -7
  76. package/dist/components/socket-io/helpers/socket-io-server.helper.js.map +1 -1
  77. package/dist/datasources/index.d.ts +3 -2
  78. package/dist/datasources/index.js +3 -2
  79. package/dist/datasources/index.js.map +1 -1
  80. package/dist/datasources/kvmem/datasource.d.ts +5 -0
  81. package/dist/datasources/{kvmem.datasource.js → kvmem/datasource.js} +10 -10
  82. package/dist/datasources/kvmem/datasource.js.map +1 -0
  83. package/dist/datasources/kvmem/index.d.ts +1 -0
  84. package/dist/datasources/kvmem/index.js +18 -0
  85. package/dist/datasources/kvmem/index.js.map +1 -0
  86. package/dist/datasources/postgres/datasource.d.ts +7 -0
  87. package/dist/datasources/{postgres.datasource.js → postgres/datasource.js} +22 -21
  88. package/dist/datasources/postgres/datasource.js.map +1 -0
  89. package/dist/datasources/postgres/index.d.ts +2 -0
  90. package/dist/datasources/postgres/index.js +19 -0
  91. package/dist/datasources/postgres/index.js.map +1 -0
  92. package/dist/datasources/postgres/types.d.ts +9 -0
  93. package/dist/datasources/postgres/types.js +3 -0
  94. package/dist/datasources/postgres/types.js.map +1 -0
  95. package/dist/datasources/redis/connector.d.ts +36 -0
  96. package/dist/datasources/redis/connector.js +128 -0
  97. package/dist/datasources/redis/connector.js.map +1 -0
  98. package/dist/datasources/redis/datasource.d.ts +9 -0
  99. package/dist/datasources/redis/datasource.js +48 -0
  100. package/dist/datasources/redis/datasource.js.map +1 -0
  101. package/dist/datasources/redis/index.d.ts +3 -0
  102. package/dist/datasources/redis/index.js +20 -0
  103. package/dist/datasources/redis/index.js.map +1 -0
  104. package/dist/datasources/redis/types.d.ts +10 -0
  105. package/dist/datasources/redis/types.js +3 -0
  106. package/dist/datasources/redis/types.js.map +1 -0
  107. package/dist/helpers/crypto/algorithms/rsa.algorithm.d.ts +2 -2
  108. package/dist/helpers/redis.helper.d.ts +118 -42
  109. package/dist/helpers/redis.helper.js +163 -62
  110. package/dist/helpers/redis.helper.js.map +1 -1
  111. package/dist/utilities/date.utility.d.ts +7 -3
  112. package/dist/utilities/date.utility.js +28 -10
  113. package/dist/utilities/date.utility.js.map +1 -1
  114. package/dist/utilities/index.d.ts +1 -0
  115. package/dist/utilities/index.js +1 -0
  116. package/dist/utilities/index.js.map +1 -1
  117. package/dist/utilities/query.utility.d.ts +15 -0
  118. package/dist/utilities/query.utility.js +38 -0
  119. package/dist/utilities/query.utility.js.map +1 -0
  120. package/package.json +35 -36
  121. package/dist/base/base.datasource.d.ts +0 -9
  122. package/dist/base/base.datasource.js +0 -13
  123. package/dist/base/base.datasource.js.map +0 -1
  124. package/dist/datasources/kvmem.datasource.d.ts +0 -9
  125. package/dist/datasources/kvmem.datasource.js.map +0 -1
  126. package/dist/datasources/postgres.datasource.d.ts +0 -14
  127. package/dist/datasources/postgres.datasource.js.map +0 -1
@@ -22,32 +22,82 @@ class RedisHelper extends base_helper_1.BaseHelper {
22
22
  // ---------------------------------------------------------------------------------
23
23
  constructor(options) {
24
24
  super({ scope: RedisHelper.name, identifier: options.name });
25
- const { name, host, port, password, onConnected, onReady, onError } = options;
25
+ const { name, host, port, password,
26
+ // Optional
27
+ database = 0, autoConnect = true, maxRetry = 0, onInitialized, onConnected, onReady, onError, } = options;
26
28
  this.client = new ioredis_1.default({
27
29
  name,
28
30
  host,
29
- port,
31
+ port: (0, utilities_1.int)(port),
30
32
  password,
31
- retryStrategy: (times) => {
32
- return Math.max(Math.min(Math.exp(times), 20000), 1000);
33
+ db: database,
34
+ lazyConnect: !autoConnect,
35
+ showFriendlyErrorStack: true,
36
+ retryStrategy: (attemptCounter) => {
37
+ if (maxRetry > -1 && attemptCounter > maxRetry) {
38
+ return undefined;
39
+ }
40
+ const strategy = Math.max(Math.min(attemptCounter * 2000, 5000), 1000);
41
+ return strategy;
33
42
  },
34
43
  maxRetriesPerRequest: null,
35
44
  });
36
45
  this.logger.info('[configure] Redis client options: %j', options);
37
46
  this.client.on('connect', () => {
38
- this.logger.info(` ${name} CONNECTED`);
47
+ this.logger.info('[event][connect] Redis client %s CONNECTED', name);
39
48
  onConnected === null || onConnected === void 0 ? void 0 : onConnected({ name, helper: this });
40
49
  });
41
50
  this.client.on('ready', () => {
42
- this.logger.info(` ${name} READY`);
51
+ this.logger.info('[event][ready] Redis client %s READY', name);
43
52
  onReady === null || onReady === void 0 ? void 0 : onReady({ name, helper: this });
44
53
  });
45
54
  this.client.on('error', error => {
46
- this.logger.error(` ${name} ERROR: %j`, error);
55
+ this.logger.info('[event][error] Redis client %s READY | Error: %s', name, error);
47
56
  onError === null || onError === void 0 ? void 0 : onError({ name, helper: this, error });
48
57
  });
49
58
  this.client.on('reconnecting', () => {
50
- this.logger.error(` ${name} RECONNECTING...`);
59
+ this.logger.warn('[event][reconnecting] Redis client %s RECONNECTING', name);
60
+ });
61
+ onInitialized === null || onInitialized === void 0 ? void 0 : onInitialized({ name, helper: this });
62
+ }
63
+ ping() {
64
+ return this.client.ping();
65
+ }
66
+ connect() {
67
+ return new Promise((resolve, reject) => {
68
+ const invalidStatuses = [
69
+ 'ready',
70
+ 'reconnecting',
71
+ 'connecting',
72
+ ];
73
+ if (!this.client || invalidStatuses.includes(this.client.status)) {
74
+ this.logger.info('[connect] status: %s | Invalid redis status to invoke connect', this.client.status);
75
+ resolve(false);
76
+ return;
77
+ }
78
+ this.client
79
+ .connect()
80
+ .then(() => {
81
+ resolve(this.client.status === 'ready');
82
+ })
83
+ .catch(reject);
84
+ });
85
+ }
86
+ // ---------------------------------------------------------------------------------
87
+ disconnect() {
88
+ return new Promise((resolve, reject) => {
89
+ const invalidStatuses = ['end', 'close'];
90
+ if (!this.client || invalidStatuses.includes(this.client.status)) {
91
+ this.logger.info('[disconnect] status: %s | Invalid redis status to invoke connect', this.client.status);
92
+ resolve(false);
93
+ return;
94
+ }
95
+ this.client
96
+ .quit()
97
+ .then(rs => {
98
+ resolve(rs === 'OK');
99
+ })
100
+ .catch(reject);
51
101
  });
52
102
  }
53
103
  // ---------------------------------------------------------------------------------
@@ -67,25 +117,42 @@ class RedisHelper extends base_helper_1.BaseHelper {
67
117
  });
68
118
  }
69
119
  // ---------------------------------------------------------------------------------
70
- mset(opts) {
120
+ get(opts) {
71
121
  return __awaiter(this, void 0, void 0, function* () {
122
+ const { key, transform } = opts;
72
123
  if (!this.client) {
73
- this.logger.info('[set] No valid Redis connection!');
74
- return;
124
+ this.logger.info('[get] No valid Redis connection!');
125
+ return null;
75
126
  }
76
- const { payload, options } = opts;
77
- const serialized = payload === null || payload === void 0 ? void 0 : payload.reduce((current, el) => {
78
- const { key, value } = el;
79
- return Object.assign(Object.assign({}, current), { [key]: JSON.stringify(value) });
80
- }, {});
81
- yield this.client.mset(serialized);
82
- if (!(options === null || options === void 0 ? void 0 : options.log)) {
83
- return;
127
+ const value = yield this.client.get(key);
128
+ if (!transform || !value) {
129
+ return null;
84
130
  }
85
- this.logger.info('[mset] Payload: %j', serialized);
131
+ return transform(value);
86
132
  });
87
133
  }
88
134
  // ---------------------------------------------------------------------------------
135
+ del(opts) {
136
+ const { keys } = opts;
137
+ return this.client.del(keys);
138
+ }
139
+ // ---------------------------------------------------------------------------------
140
+ getString(opts) {
141
+ return this.get(opts);
142
+ }
143
+ // ---------------------------------------------------------------------------------
144
+ getStrings(opts) {
145
+ return this.mget(opts);
146
+ }
147
+ // ---------------------------------------------------------------------------------
148
+ getObject(opts) {
149
+ return this.get(Object.assign(Object.assign({}, opts), { transform: (cached) => JSON.parse(cached) }));
150
+ }
151
+ // ---------------------------------------------------------------------------------
152
+ getObjects(opts) {
153
+ return this.mget(Object.assign(Object.assign({}, opts), { transform: (cached) => JSON.parse(cached) }));
154
+ }
155
+ // ---------------------------------------------------------------------------------
89
156
  hset(opts) {
90
157
  return __awaiter(this, void 0, void 0, function* () {
91
158
  if (!this.client) {
@@ -102,21 +169,52 @@ class RedisHelper extends base_helper_1.BaseHelper {
102
169
  });
103
170
  }
104
171
  // ---------------------------------------------------------------------------------
105
- get(opts) {
172
+ hSet(opts) {
173
+ return this.hset(opts);
174
+ }
175
+ // ---------------------------------------------------------------------------------
176
+ hgetall(opts) {
106
177
  return __awaiter(this, void 0, void 0, function* () {
107
178
  const { key, transform } = opts;
108
179
  if (!this.client) {
109
180
  this.logger.info('[get] No valid Redis connection!');
110
181
  return null;
111
182
  }
112
- const value = yield this.client.get(key);
183
+ const value = yield this.client.hgetall(key);
113
184
  if (!transform || !value) {
114
- return null;
185
+ return value;
115
186
  }
116
187
  return transform(value);
117
188
  });
118
189
  }
119
190
  // ---------------------------------------------------------------------------------
191
+ hGetAll(opts) {
192
+ return this.hgetall(opts);
193
+ }
194
+ // ---------------------------------------------------------------------------------
195
+ mset(opts) {
196
+ return __awaiter(this, void 0, void 0, function* () {
197
+ if (!this.client) {
198
+ this.logger.info('[set] No valid Redis connection!');
199
+ return;
200
+ }
201
+ const { payload, options } = opts;
202
+ const serialized = payload === null || payload === void 0 ? void 0 : payload.reduce((current, el) => {
203
+ const { key, value } = el;
204
+ return Object.assign(Object.assign({}, current), { [key]: JSON.stringify(value) });
205
+ }, {});
206
+ yield this.client.mset(serialized);
207
+ if (!(options === null || options === void 0 ? void 0 : options.log)) {
208
+ return;
209
+ }
210
+ this.logger.info('[mset] Payload: %j', serialized);
211
+ });
212
+ }
213
+ // ---------------------------------------------------------------------------------
214
+ mSet(opts) {
215
+ return this.mset(opts);
216
+ }
217
+ // ---------------------------------------------------------------------------------
120
218
  mget(opts) {
121
219
  return __awaiter(this, void 0, void 0, function* () {
122
220
  const { keys, transform } = opts;
@@ -132,59 +230,62 @@ class RedisHelper extends base_helper_1.BaseHelper {
132
230
  });
133
231
  }
134
232
  // ---------------------------------------------------------------------------------
135
- hgetall(opts) {
233
+ mGet(opts) {
234
+ return this.mget(opts);
235
+ }
236
+ // ---------------------------------------------------------------------------------
237
+ keys(opts) {
136
238
  return __awaiter(this, void 0, void 0, function* () {
137
- const { key, transform } = opts;
239
+ const { key } = opts;
138
240
  if (!this.client) {
139
- this.logger.info('[get] No valid Redis connection!');
140
- return null;
141
- }
142
- const value = yield this.client.hgetall(key);
143
- if (!transform || !value) {
144
- return value;
241
+ this.logger.info('[keys] No valid Redis connection!');
242
+ return [];
145
243
  }
146
- return transform(value);
244
+ const existedKeys = yield this.client.keys(key);
245
+ return existedKeys;
147
246
  });
148
247
  }
149
248
  // ---------------------------------------------------------------------------------
150
- getString(opts) {
151
- return __awaiter(this, void 0, void 0, function* () {
152
- const rs = yield this.get(opts);
153
- return rs;
154
- });
249
+ jSet(opts) {
250
+ const { key, path, value } = opts;
251
+ return this.execute('JSON.SET', [key, path, JSON.stringify(value)]);
155
252
  }
156
253
  // ---------------------------------------------------------------------------------
157
- getStrings(opts) {
158
- return __awaiter(this, void 0, void 0, function* () {
159
- const rs = yield this.mget(opts);
160
- return rs;
161
- });
254
+ jGet(opts) {
255
+ const { key, path = '$' } = opts;
256
+ return this.execute('JSON.GET', [key, path]);
162
257
  }
163
258
  // ---------------------------------------------------------------------------------
164
- getObject(opts) {
165
- return __awaiter(this, void 0, void 0, function* () {
166
- const rs = yield this.get(Object.assign(Object.assign({}, opts), { transform: (cached) => JSON.parse(cached) }));
167
- return rs;
168
- });
259
+ jDelete(opts) {
260
+ const { key, path = '$' } = opts;
261
+ return this.execute('JSON.DEL', [key, path]);
169
262
  }
170
263
  // ---------------------------------------------------------------------------------
171
- getObjects(opts) {
172
- return __awaiter(this, void 0, void 0, function* () {
173
- const rs = yield this.mget(Object.assign(Object.assign({}, opts), { transform: (cached) => JSON.parse(cached) }));
174
- return rs;
175
- });
264
+ jNumberIncreaseBy(opts) {
265
+ const { key, path, value } = opts;
266
+ return this.execute('JSON.NUMINCRBY', [key, path, value]);
176
267
  }
177
268
  // ---------------------------------------------------------------------------------
178
- keys(opts) {
179
- return __awaiter(this, void 0, void 0, function* () {
180
- const { key } = opts;
181
- if (!this.client) {
182
- this.logger.info('[keys] No valid Redis connection!');
183
- return [];
184
- }
185
- const existedKeys = yield this.client.keys(key);
186
- return existedKeys;
187
- });
269
+ jStringAppend(opts) {
270
+ const { key, path, value } = opts;
271
+ return this.execute('JSON.STRAPPEND', [key, path, value]);
272
+ }
273
+ // ---------------------------------------------------------------------------------
274
+ jPush(opts) {
275
+ const { key, path, value } = opts;
276
+ return this.execute('JSON.ARRAPPEND', [key, path, JSON.stringify(value)]);
277
+ }
278
+ // ---------------------------------------------------------------------------------
279
+ jPop(opts) {
280
+ const { key, path } = opts;
281
+ return this.execute('JSON.ARRPOP', [key, path]);
282
+ }
283
+ // ---------------------------------------------------------------------------------
284
+ execute(command, parameters) {
285
+ if (!(parameters === null || parameters === void 0 ? void 0 : parameters.length)) {
286
+ return this.client.call(command);
287
+ }
288
+ return this.client.call(command, parameters);
188
289
  }
189
290
  // ---------------------------------------------------------------------------------
190
291
  publish(opts) {
@@ -1 +1 @@
1
- {"version":3,"file":"redis.helper.js","sourceRoot":"","sources":["../../src/helpers/redis.helper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"redis.helper.js","sourceRoot":"","sources":["../../src/helpers/redis.helper.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,12 @@
1
1
  import dayjs from 'dayjs';
2
2
  export declare const sleep: (ms: number) => Promise<unknown>;
3
- export declare const isWeekday: (date: dayjs.Dayjs) => boolean;
4
- export declare const getPreviousWeekday: () => dayjs.Dayjs;
5
- export declare const getNextWeekday: () => dayjs.Dayjs;
3
+ export declare const isWeekday: (date: string | dayjs.Dayjs) => boolean;
4
+ export declare const getPreviousWeekday: (opts?: {
5
+ date?: string | dayjs.Dayjs;
6
+ }) => dayjs.Dayjs;
7
+ export declare const getNextWeekday: (opts?: {
8
+ date?: string | dayjs.Dayjs;
9
+ }) => dayjs.Dayjs;
6
10
  export declare const getDateTz: (opts: {
7
11
  date: string;
8
12
  timezone: string;
@@ -30,20 +30,38 @@ const isWeekday = (date) => {
30
30
  return isoWeekday > 0 && isoWeekday < 6;
31
31
  };
32
32
  exports.isWeekday = isWeekday;
33
- const getPreviousWeekday = () => {
34
- let date = (0, dayjs_1.default)();
35
- while (!(0, exports.isWeekday)(date)) {
36
- date = date.subtract(1, 'day');
33
+ /* export const getPreviousWeekday = () => {
34
+ let date = dayjs();
35
+ while (!isWeekday(date)) {
36
+ date = date.subtract(1, 'day');
37
+ }
38
+
39
+ return date;
40
+ }; */
41
+ const getPreviousWeekday = (opts) => {
42
+ const { date } = opts !== null && opts !== void 0 ? opts : { date: (0, dayjs_1.default)() };
43
+ let rs = (0, dayjs_1.default)(date).clone().subtract(1, 'day');
44
+ while (!(0, exports.isWeekday)(rs.toISOString())) {
45
+ rs = rs.subtract(1, 'day');
37
46
  }
38
- return date;
47
+ return rs;
39
48
  };
40
49
  exports.getPreviousWeekday = getPreviousWeekday;
41
- const getNextWeekday = () => {
42
- let date = (0, dayjs_1.default)();
43
- while (!(0, exports.isWeekday)(date)) {
44
- date = date.add(1, 'day');
50
+ /* export const getNextWeekday = () => {
51
+ let date = dayjs();
52
+ while (!isWeekday(date)) {
53
+ date = date.add(1, 'day');
54
+ }
55
+
56
+ return date;
57
+ }; */
58
+ const getNextWeekday = (opts) => {
59
+ const { date } = opts !== null && opts !== void 0 ? opts : { date: (0, dayjs_1.default)() };
60
+ let rs = (0, dayjs_1.default)(date).clone().add(1, 'day');
61
+ while (!(0, exports.isWeekday)(rs.toISOString())) {
62
+ rs = rs.add(1, 'day');
45
63
  }
46
- return date;
64
+ return rs;
47
65
  };
48
66
  exports.getNextWeekday = getNextWeekday;
49
67
  const getDateTz = (opts) => {
@@ -1 +1 @@
1
- {"version":3,"file":"date.utility.js","sourceRoot":"","sources":["../../src/utilities/date.utility.ts"],"names":[],"mappings":";;;;;;;AAAA,kDAA0B;AA4DjB,gBA5DF,eAAK,CA4DE;AA1Dd,uFAAqE;AACrE,mEAAiD;AACjD,qEAAmD;AACnD,2DAAyC;AACzC,mEAAiD;AACjD,mDAAwC;AAExC,eAAK,CAAC,MAAM,CAAC,2BAAuB,CAAC,CAAC;AACtC,eAAK,CAAC,MAAM,CAAC,aAAS,CAAC,CAAC;AACxB,eAAK,CAAC,MAAM,CAAC,kBAAc,CAAC,CAAC;AAC7B,eAAK,CAAC,MAAM,CAAC,iBAAa,CAAC,CAAC;AAC5B,eAAK,CAAC,MAAM,CAAC,iBAAa,CAAC,CAAC;AAE5B,MAAM,EAAE,GAAG,MAAA,OAAO,CAAC,GAAG,CAAC,4BAA4B,mCAAI,kBAAkB,CAAC;AAC1E,eAAK,CAAC,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;AAEjB,MAAM,KAAK,GAAG,CAAC,EAAU,EAAE,EAAE;IAClC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AACzD,CAAC,CAAC;AAFW,QAAA,KAAK,SAEhB;AAEK,MAAM,SAAS,GAAG,CAAC,IAAiB,EAAE,EAAE;;IAC7C,MAAM,UAAU,GAAG,MAAA,IAAA,eAAK,EAAC,IAAI,CAAC,0CAAE,UAAU,EAAE,CAAC;IAC7C,OAAO,UAAU,GAAG,CAAC,IAAI,UAAU,GAAG,CAAC,CAAC;AAC1C,CAAC,CAAC;AAHW,QAAA,SAAS,aAGpB;AAEK,MAAM,kBAAkB,GAAG,GAAG,EAAE;IACrC,IAAI,IAAI,GAAG,IAAA,eAAK,GAAE,CAAC;IACnB,OAAO,CAAC,IAAA,iBAAS,EAAC,IAAI,CAAC,EAAE,CAAC;QACxB,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IACjC,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAPW,QAAA,kBAAkB,sBAO7B;AAEK,MAAM,cAAc,GAAG,GAAG,EAAE;IACjC,IAAI,IAAI,GAAG,IAAA,eAAK,GAAE,CAAC;IACnB,OAAO,CAAC,IAAA,iBAAS,EAAC,IAAI,CAAC,EAAE,CAAC;QACxB,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IAC5B,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAPW,QAAA,cAAc,kBAOzB;AAEK,MAAM,SAAS,GAAG,CAAC,IAKzB,EAAE,EAAE;IACH,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,GAAG,KAAK,EAAE,UAAU,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC;IACrE,OAAO,IAAA,eAAK,EAAC,IAAI,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;AACvE,CAAC,CAAC;AARW,QAAA,SAAS,aAQpB;AAEK,MAAM,MAAM,GAAG,GAAG,EAAE;IACzB,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAC9B,OAAO,IAAA,qBAAK,EAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,SAAA,EAAE,EAAI,CAAC,CAAA,EAAE,CAAC,CAAC,CAAC;AAC/C,CAAC,CAAC;AAHW,QAAA,MAAM,UAGjB"}
1
+ {"version":3,"file":"date.utility.js","sourceRoot":"","sources":["../../src/utilities/date.utility.ts"],"names":[],"mappings":"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"}
@@ -4,5 +4,6 @@ export * from './error.utility';
4
4
  export * from './parse.utility';
5
5
  export * from './performance.utility';
6
6
  export * from './promise.utility';
7
+ export * from './query.utility';
7
8
  export * from './request.utility';
8
9
  export * from './url.utility';
@@ -20,6 +20,7 @@ __exportStar(require("./error.utility"), exports);
20
20
  __exportStar(require("./parse.utility"), exports);
21
21
  __exportStar(require("./performance.utility"), exports);
22
22
  __exportStar(require("./promise.utility"), exports);
23
+ __exportStar(require("./query.utility"), exports);
23
24
  __exportStar(require("./request.utility"), exports);
24
25
  __exportStar(require("./url.utility"), exports);
25
26
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utilities/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAAiC;AACjC,iDAA+B;AAC/B,kDAAgC;AAChC,kDAAgC;AAChC,wDAAsC;AACtC,oDAAkC;AAClC,oDAAkC;AAClC,gDAA8B"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utilities/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAAiC;AACjC,iDAA+B;AAC/B,kDAAgC;AAChC,kDAAgC;AAChC,wDAAsC;AACtC,oDAAkC;AAClC,kDAAgC;AAChC,oDAAkC;AAClC,gDAA8B"}
@@ -0,0 +1,15 @@
1
+ import { BaseTzEntity } from '../base';
2
+ import { EntityClassType } from '../common';
3
+ export declare const getTableDefinition: <T extends BaseTzEntity>(opts: {
4
+ model: EntityClassType<T>;
5
+ alias?: string;
6
+ }) => {
7
+ table: {
8
+ name: string;
9
+ alias: string;
10
+ nameWithQuotation: string;
11
+ };
12
+ tableWithAlias: string;
13
+ columns: { [key in keyof T]: string; };
14
+ columnsNoAlias: { [key in keyof T]: string; };
15
+ };
@@ -0,0 +1,38 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.getTableDefinition = void 0;
4
+ const getTableDefinition = (opts) => {
5
+ const { model, alias } = opts;
6
+ const tableAlias = alias !== null && alias !== void 0 ? alias : model.name.toLowerCase();
7
+ const tableNameWithAlias = `"${model.name}" ${tableAlias}`;
8
+ const tableColumns = Object.entries(model.definition.properties)
9
+ .map(([key, value]) => {
10
+ var _a, _b, _c;
11
+ const columnName = (_c = (_a = value === null || value === void 0 ? void 0 : value.name) !== null && _a !== void 0 ? _a : (_b = value === null || value === void 0 ? void 0 : value.postgresql) === null || _b === void 0 ? void 0 : _b.columnName) !== null && _c !== void 0 ? _c : key;
12
+ return {
13
+ [`${key}`]: `${tableAlias}.${columnName}`,
14
+ };
15
+ })
16
+ .reduce((acc, cur) => {
17
+ return Object.assign(Object.assign({}, acc), cur);
18
+ }, {});
19
+ const tableColumnsNoAlias = Object.entries(model.definition.properties)
20
+ .map(([key, value]) => {
21
+ var _a, _b, _c;
22
+ const columnName = (_c = (_a = value === null || value === void 0 ? void 0 : value.name) !== null && _a !== void 0 ? _a : (_b = value === null || value === void 0 ? void 0 : value.postgresql) === null || _b === void 0 ? void 0 : _b.columnName) !== null && _c !== void 0 ? _c : key;
23
+ return {
24
+ [`${key}`]: `${columnName}`,
25
+ };
26
+ })
27
+ .reduce((acc, cur) => {
28
+ return Object.assign(Object.assign({}, acc), cur);
29
+ }, {});
30
+ return {
31
+ table: { name: model.name, alias: tableAlias, nameWithQuotation: `"${model.name}"` },
32
+ tableWithAlias: tableNameWithAlias,
33
+ columns: tableColumns,
34
+ columnsNoAlias: tableColumnsNoAlias,
35
+ };
36
+ };
37
+ exports.getTableDefinition = getTableDefinition;
38
+ //# sourceMappingURL=query.utility.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"query.utility.js","sourceRoot":"","sources":["../../src/utilities/query.utility.ts"],"names":[],"mappings":";;;AAGO,MAAM,kBAAkB,GAAG,CAAyB,IAG1D,EAAE,EAAE;IACH,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IAE9B,MAAM,UAAU,GAAG,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;IAErD,MAAM,kBAAkB,GAAG,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;IAE3D,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC;SAC7D,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;;QACpB,MAAM,UAAU,GAAG,MAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,mCAAI,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,UAAU,0CAAE,UAAU,mCAAI,GAAG,CAAC;QACvE,OAAO;YACL,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,GAAG,UAAU,IAAI,UAAU,EAAE;SAC1C,CAAC;IACJ,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACnB,uCAAY,GAAG,GAAK,GAAG,EAAG;IAC5B,CAAC,EAAE,EAAE,CAAC,CAAC;IAET,MAAM,mBAAmB,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC;SACpE,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;;QACpB,MAAM,UAAU,GAAG,MAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,mCAAI,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,UAAU,0CAAE,UAAU,mCAAI,GAAG,CAAC;QACvE,OAAO;YACL,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,GAAG,UAAU,EAAE;SAC5B,CAAC;IACJ,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACnB,uCAAY,GAAG,GAAK,GAAG,EAAG;IAC5B,CAAC,EAAE,EAAE,CAAC,CAAC;IAET,OAAO;QACL,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,IAAI,KAAK,CAAC,IAAI,GAAG,EAAE;QACpF,cAAc,EAAE,kBAAkB;QAClC,OAAO,EAAE,YAAY;QACrB,cAAc,EAAE,mBAAmB;KAMpC,CAAC;AACJ,CAAC,CAAC;AA3CW,QAAA,kBAAkB,sBA2C7B"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@minimaltech/node-infra",
3
- "version": "0.3.21",
3
+ "version": "0.3.23",
4
4
  "description": "Minimal Technology NodeJS Infrastructure - Loopback 4 Framework",
5
5
  "keywords": [
6
6
  "web",
@@ -108,29 +108,29 @@
108
108
  "access": "public"
109
109
  },
110
110
  "dependencies": {
111
- "@grpc/grpc-js": "^1.11.3",
111
+ "@grpc/grpc-js": "^1.12.3",
112
112
  "@grpc/proto-loader": "^0.7.13",
113
- "@loopback/authentication": "^11.0.6",
114
- "@loopback/authentication-jwt": "^0.15.6",
115
- "@loopback/authentication-passport": "^7.0.6",
116
- "@loopback/authorization": "^0.15.6",
117
- "@loopback/boot": "^7.0.6",
118
- "@loopback/core": "^6.1.3",
119
- "@loopback/http-server": "^6.0.6",
120
- "@loopback/metadata": "^7.0.6",
121
- "@loopback/repository": "^7.0.6",
122
- "@loopback/rest": "^14.0.6",
123
- "@loopback/rest-crud": "^0.18.6",
124
- "@loopback/rest-explorer": "^7.0.6",
125
- "@loopback/security": "^0.11.6",
126
- "@loopback/service-proxy": "^7.0.6",
113
+ "@loopback/authentication": "^11.0.8",
114
+ "@loopback/authentication-jwt": "^0.15.8",
115
+ "@loopback/authentication-passport": "^7.0.8",
116
+ "@loopback/authorization": "^0.15.8",
117
+ "@loopback/boot": "^7.0.8",
118
+ "@loopback/core": "^6.1.5",
119
+ "@loopback/http-server": "^6.0.8",
120
+ "@loopback/metadata": "^7.0.8",
121
+ "@loopback/repository": "^7.0.8",
122
+ "@loopback/rest": "^14.0.8",
123
+ "@loopback/rest-crud": "^0.18.8",
124
+ "@loopback/rest-explorer": "^7.0.8",
125
+ "@loopback/security": "^0.11.8",
126
+ "@loopback/service-proxy": "^7.0.8",
127
127
  "@node-oauth/oauth2-server": "^5.2.0",
128
128
  "@socket.io/redis-adapter": "^8.3.0",
129
129
  "@socket.io/redis-emitter": "^5.1.0",
130
- "axios": "^1.7.7",
131
- "bullmq": "^5.13.2",
132
- "casbin": "^5.31.0",
133
- "cron": "^3.1.7",
130
+ "axios": "^1.7.8",
131
+ "bullmq": "^5.31.0",
132
+ "casbin": "^5.36.0",
133
+ "cron": "^3.2.1",
134
134
  "dayjs": "^1.11.13",
135
135
  "dotenv-flow": "4.1.0",
136
136
  "ejs": "^3.1.10",
@@ -138,34 +138,33 @@
138
138
  "jsonwebtoken": "^9.0.2",
139
139
  "knex": "^3.1.0",
140
140
  "lodash": "^4.17.21",
141
- "minio": "^8.0.1",
142
- "mocha": "^10.7.3",
143
- "mqtt": "^5.10.1",
141
+ "minio": "^8.0.2",
142
+ "mocha": "^11.0.1",
143
+ "mqtt": "^5.10.3",
144
144
  "multer": "1.4.5-lts.1",
145
- "rxjs": "^7.8.1",
146
- "socket.io": "^4.8.0",
147
- "socket.io-client": "^4.8.0",
148
- "winston": "^3.14.2",
145
+ "socket.io": "^4.8.1",
146
+ "socket.io-client": "^4.8.1",
147
+ "winston": "^3.17.0",
149
148
  "winston-daily-rotate-file": "^5.0.0"
150
149
  },
151
150
  "devDependencies": {
152
- "@loopback/build": "^11.0.6",
153
- "@loopback/testlab": "^7.0.6",
151
+ "@loopback/build": "^11.0.7",
152
+ "@loopback/testlab": "^7.0.7",
154
153
  "@minimaltech/eslint-node": "^0.1.15",
155
- "@types/express": "^4.17.21",
154
+ "@types/express": "4.17.21",
156
155
  "@types/jsonwebtoken": "^9.0.7",
157
- "@types/lodash": "^4.17.9",
158
- "@types/mocha": "^10.0.8",
156
+ "@types/lodash": "^4.17.13",
157
+ "@types/mocha": "^10.0.10",
159
158
  "@types/multer": "^1.4.12",
160
- "@types/node": "^20.16.10",
159
+ "@types/node": "^20.17.9",
161
160
  "eslint": "^8.57.1",
162
- "husky": "^9.1.6",
163
- "prettier": "^3.3.3",
161
+ "husky": "^9.1.7",
162
+ "prettier": "^3.4.1",
164
163
  "source-map-support": "^0.5.21",
165
164
  "ts-node": "^10.9.2",
166
165
  "tsc-alias": "^1.8.10",
167
166
  "tsconfig-paths": "^4.2.0",
168
- "typescript": "^5.6.2"
167
+ "typescript": "^5.7.2"
169
168
  },
170
169
  "scripts": {
171
170
  "build": "sh ./scripts/build.sh",
@@ -1,9 +0,0 @@
1
- import { juggler } from '@loopback/repository';
2
- import { ApplicationLogger } from '../helpers';
3
- export declare class BaseDataSource extends juggler.DataSource {
4
- protected logger: ApplicationLogger;
5
- constructor(opts: {
6
- dsConfig: object;
7
- scope: string;
8
- });
9
- }