@minimaltech/node-infra 0.5.10-0 → 0.5.10-2
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/configs/tsconfig.common.json +67 -1
- package/dist/base/applications/base.application.js +26 -39
- package/dist/base/applications/base.application.js.map +1 -1
- package/dist/base/applications/default.application.js +1 -2
- package/dist/base/applications/default.application.js.map +1 -1
- package/dist/base/base.component.js +1 -2
- package/dist/base/base.component.js.map +1 -1
- package/dist/base/base.helper.js +2 -3
- package/dist/base/base.helper.js.map +1 -1
- package/dist/base/base.provider.js +1 -2
- package/dist/base/base.provider.js.map +1 -1
- package/dist/base/base.sequence.js +14 -25
- package/dist/base/base.sequence.js.map +1 -1
- package/dist/base/controllers/common.js +6 -6
- package/dist/base/controllers/common.js.map +1 -1
- package/dist/base/controllers/crud.controller.js +52 -56
- package/dist/base/controllers/crud.controller.js.map +1 -1
- package/dist/base/controllers/kv.controller.js +5 -16
- package/dist/base/controllers/kv.controller.js.map +1 -1
- package/dist/base/controllers/relational.controller.js +36 -43
- package/dist/base/controllers/relational.controller.js.map +1 -1
- package/dist/base/controllers/service-crud.controller.js +42 -35
- package/dist/base/controllers/service-crud.controller.js.map +1 -1
- package/dist/base/repositories/base.repository.js +4 -15
- package/dist/base/repositories/base.repository.js.map +1 -1
- package/dist/base/repositories/relations/has-many-polymorphic/decorator.js +11 -2
- package/dist/base/repositories/relations/has-many-polymorphic/decorator.js.map +1 -1
- package/dist/base/repositories/relations/has-many-polymorphic/factory.js +12 -17
- package/dist/base/repositories/relations/has-many-polymorphic/factory.js.map +1 -1
- package/dist/base/repositories/searchable-tz-crud.repository.js +131 -150
- package/dist/base/repositories/searchable-tz-crud.repository.js.map +1 -1
- package/dist/base/repositories/tz-crud.repository.js +23 -40
- package/dist/base/repositories/tz-crud.repository.js.map +1 -1
- package/dist/base/services/base-crud.service.js +5 -9
- package/dist/base/services/base-crud.service.js.map +1 -1
- package/dist/base/services/base.service.js +1 -2
- package/dist/base/services/base.service.js.map +1 -1
- package/dist/common/configurations.d.ts +18 -0
- package/dist/common/configurations.d.ts.map +1 -0
- package/dist/common/configurations.js +34 -0
- package/dist/common/configurations.js.map +1 -0
- package/dist/common/constants.d.ts +35 -0
- package/dist/common/constants.d.ts.map +1 -0
- package/dist/common/constants.js +52 -0
- package/dist/common/constants.js.map +1 -0
- package/dist/common/environments.js +25 -25
- package/dist/common/environments.js.map +1 -1
- package/dist/common/formatters.d.ts +13 -0
- package/dist/common/formatters.d.ts.map +1 -0
- package/dist/common/formatters.js +17 -0
- package/dist/common/formatters.js.map +1 -0
- package/dist/common/index.d.ts +6 -3
- package/dist/common/index.d.ts.map +1 -1
- package/dist/common/index.js +6 -3
- package/dist/common/index.js.map +1 -1
- package/dist/common/keys.js +2 -2
- package/dist/common/keys.js.map +1 -1
- package/dist/common/result-codes.d.ts +30 -0
- package/dist/common/result-codes.d.ts.map +1 -0
- package/dist/common/result-codes.js +37 -0
- package/dist/common/result-codes.js.map +1 -0
- package/dist/common/statuses.js +28 -31
- package/dist/common/statuses.js.map +1 -1
- package/dist/common/users.js +3 -5
- package/dist/common/users.js.map +1 -1
- package/dist/components/authenticate/common/constants.js +13 -13
- package/dist/components/authenticate/common/constants.js.map +1 -1
- package/dist/components/authenticate/common/keys.js +7 -7
- package/dist/components/authenticate/common/keys.js.map +1 -1
- package/dist/components/authenticate/component.js +2 -3
- package/dist/components/authenticate/component.js.map +1 -1
- package/dist/components/authenticate/controllers/auth.controller.js +10 -7
- package/dist/components/authenticate/controllers/auth.controller.js.map +1 -1
- package/dist/components/authenticate/controllers/oauth2.controller.js +13 -12
- package/dist/components/authenticate/controllers/oauth2.controller.js.map +1 -1
- package/dist/components/authenticate/middleware.js +23 -35
- package/dist/components/authenticate/middleware.js.map +1 -1
- package/dist/components/authenticate/oauth2-handlers/authorization-code.handler.js +4 -5
- package/dist/components/authenticate/oauth2-handlers/authorization-code.handler.js.map +1 -1
- package/dist/components/authenticate/oauth2-handlers/base.js +93 -111
- package/dist/components/authenticate/oauth2-handlers/base.js.map +1 -1
- package/dist/components/authenticate/oauth2-handlers/client-credential.handler.js +2 -3
- package/dist/components/authenticate/oauth2-handlers/client-credential.handler.js.map +1 -1
- package/dist/components/authenticate/oauth2-handlers/oauth2.js +2 -2
- package/dist/components/authenticate/oauth2-handlers/oauth2.js.map +1 -1
- package/dist/components/authenticate/services/basic-token.service.js +18 -29
- package/dist/components/authenticate/services/basic-token.service.js.map +1 -1
- package/dist/components/authenticate/services/basic.strategy.js +5 -16
- package/dist/components/authenticate/services/basic.strategy.js.map +1 -1
- package/dist/components/authenticate/services/jwt-token.service.js +22 -34
- package/dist/components/authenticate/services/jwt-token.service.js.map +1 -1
- package/dist/components/authenticate/services/oauth2.service.js +97 -105
- package/dist/components/authenticate/services/oauth2.service.js.map +1 -1
- package/dist/components/authenticate/services/oauth2.strategy.js +23 -37
- package/dist/components/authenticate/services/oauth2.strategy.js.map +1 -1
- package/dist/components/authorize/adapters/casbin-postgres-adapter.helper.js +40 -52
- package/dist/components/authorize/adapters/casbin-postgres-adapter.helper.js.map +1 -1
- package/dist/components/authorize/common/constants.js +10 -12
- package/dist/components/authorize/common/constants.js.map +1 -1
- package/dist/components/authorize/common/keys.js +15 -15
- package/dist/components/authorize/common/keys.js.map +1 -1
- package/dist/components/authorize/common/types.js +2 -2
- package/dist/components/authorize/common/types.js.map +1 -1
- package/dist/components/authorize/component.js +28 -39
- package/dist/components/authorize/component.js.map +1 -1
- package/dist/components/authorize/decorators/index.js +1 -1
- package/dist/components/authorize/decorators/index.js.map +1 -1
- package/dist/components/authorize/interceptor.js +75 -80
- package/dist/components/authorize/interceptor.js.map +1 -1
- package/dist/components/authorize/migrations/0000-create-view-policy.js +3 -12
- package/dist/components/authorize/migrations/0000-create-view-policy.js.map +1 -1
- package/dist/components/authorize/provider.js +80 -93
- package/dist/components/authorize/provider.js.map +1 -1
- package/dist/components/authorize/services/enforcer.service.js +16 -26
- package/dist/components/authorize/services/enforcer.service.js.map +1 -1
- package/dist/components/authorize/services/generator.service.js +62 -76
- package/dist/components/authorize/services/generator.service.js.map +1 -1
- package/dist/components/crash-report/common/keys.js +8 -10
- package/dist/components/crash-report/common/keys.js.map +1 -1
- package/dist/components/crash-report/component.js +29 -41
- package/dist/components/crash-report/component.js.map +1 -1
- package/dist/components/crash-report/providers/third-parties/base.js +1 -2
- package/dist/components/crash-report/providers/third-parties/base.js.map +1 -1
- package/dist/components/crash-report/services/mt-crash-report.service.js +3 -4
- package/dist/components/crash-report/services/mt-crash-report.service.js.map +1 -1
- package/dist/components/grpc/common/keys.js +4 -4
- package/dist/components/grpc/common/keys.js.map +1 -1
- package/dist/components/grpc/components/server.component.js +1 -2
- package/dist/components/grpc/components/server.component.js.map +1 -1
- package/dist/components/grpc/helpers/grpc-client.js +2 -3
- package/dist/components/grpc/helpers/grpc-client.js.map +1 -1
- package/dist/components/grpc/helpers/grpc-server.js +9 -11
- package/dist/components/grpc/helpers/grpc-server.js.map +1 -1
- package/dist/components/grpc/persistents/grpc.connector.js +1 -2
- package/dist/components/grpc/persistents/grpc.connector.js.map +1 -1
- package/dist/components/grpc/persistents/grpc.datasource.js +1 -1
- package/dist/components/grpc/persistents/grpc.datasource.js.map +1 -1
- package/dist/components/grpc/persistents/grpc.repository.js +1 -2
- package/dist/components/grpc/persistents/grpc.repository.js.map +1 -1
- package/dist/components/migration/common/keys.js +3 -3
- package/dist/components/migration/common/keys.js.map +1 -1
- package/dist/components/socket-io/common/constants.js +10 -10
- package/dist/components/socket-io/common/constants.js.map +1 -1
- package/dist/components/socket-io/common/keys.js +6 -6
- package/dist/components/socket-io/common/keys.js.map +1 -1
- package/dist/components/socket-io/component.js +1 -1
- package/dist/components/socket-io/component.js.map +1 -1
- package/dist/components/socket-io/helpers/socket-io-client.helper.js +2 -4
- package/dist/components/socket-io/helpers/socket-io-client.helper.js.map +1 -1
- package/dist/components/socket-io/helpers/socket-io-server.helper.js +13 -15
- package/dist/components/socket-io/helpers/socket-io-server.helper.js.map +1 -1
- package/dist/components/static-asset/common/keys.js +4 -4
- package/dist/components/static-asset/common/keys.js.map +1 -1
- package/dist/components/static-asset/controllers/asset.controller.js +67 -84
- package/dist/components/static-asset/controllers/asset.controller.js.map +1 -1
- package/dist/components/static-asset/controllers/resource.controller.js +2 -3
- package/dist/components/static-asset/controllers/resource.controller.js.map +1 -1
- package/dist/datasources/memory/datasource.js +3 -2
- package/dist/datasources/memory/datasource.js.map +1 -1
- package/dist/datasources/postgres/datasource.js +10 -10
- package/dist/datasources/postgres/datasource.js.map +1 -1
- package/dist/datasources/redis/connector.js +13 -7
- package/dist/datasources/redis/connector.js.map +1 -1
- package/dist/datasources/redis/datasource.js +7 -7
- package/dist/datasources/redis/datasource.js.map +1 -1
- package/dist/helpers/application-environment.helper.js +1 -2
- package/dist/helpers/application-environment.helper.js.map +1 -1
- package/dist/helpers/cron.helper.js +2 -3
- package/dist/helpers/cron.helper.js.map +1 -1
- package/dist/helpers/crypto/algorithms/aes.algorithm.js +8 -7
- package/dist/helpers/crypto/algorithms/aes.algorithm.js.map +1 -1
- package/dist/helpers/crypto/algorithms/base.algorithm.js +2 -4
- package/dist/helpers/crypto/algorithms/base.algorithm.js.map +1 -1
- package/dist/helpers/crypto/algorithms/rsa.algorithm.js +4 -5
- package/dist/helpers/crypto/algorithms/rsa.algorithm.js.map +1 -1
- package/dist/helpers/logger/application-logger.js +4 -6
- package/dist/helpers/logger/application-logger.js.map +1 -1
- package/dist/helpers/logger/common/types.js +20 -22
- package/dist/helpers/logger/common/types.js.map +1 -1
- package/dist/helpers/logger/default-logger.js +2 -3
- package/dist/helpers/logger/default-logger.js.map +1 -1
- package/dist/helpers/logger/factory.js +1 -1
- package/dist/helpers/logger/factory.js.map +1 -1
- package/dist/helpers/logger/transports/dgram.transport.js +10 -25
- package/dist/helpers/logger/transports/dgram.transport.js.map +1 -1
- package/dist/helpers/network/http-request/base-network-request.helper.js +32 -29
- package/dist/helpers/network/http-request/base-network-request.helper.js.map +1 -1
- package/dist/helpers/network/http-request/fetcher/axios-fetcher.js +10 -18
- package/dist/helpers/network/http-request/fetcher/axios-fetcher.js.map +1 -1
- package/dist/helpers/network/http-request/fetcher/base-fetcher.js +10 -21
- package/dist/helpers/network/http-request/fetcher/base-fetcher.js.map +1 -1
- package/dist/helpers/network/http-request/fetcher/node-fetcher.js +36 -55
- package/dist/helpers/network/http-request/fetcher/node-fetcher.js.map +1 -1
- package/dist/helpers/network/tcp-socket/base-tcp-client.helper.js +16 -23
- package/dist/helpers/network/tcp-socket/base-tcp-client.helper.js.map +1 -1
- package/dist/helpers/network/tcp-socket/base-tcp-server.helper.js +9 -16
- package/dist/helpers/network/tcp-socket/base-tcp-server.helper.js.map +1 -1
- package/dist/helpers/network/tcp-socket/network-tcp-client.helper.js +5 -1
- package/dist/helpers/network/tcp-socket/network-tcp-client.helper.js.map +1 -1
- package/dist/helpers/network/tcp-socket/network-tcp-server.helper.js +5 -1
- package/dist/helpers/network/tcp-socket/network-tcp-server.helper.js.map +1 -1
- package/dist/helpers/network/tcp-socket/network-tls-tcp-client.helper.js +5 -1
- package/dist/helpers/network/tcp-socket/network-tls-tcp-client.helper.js.map +1 -1
- package/dist/helpers/network/tcp-socket/network-tls-tcp-server.helper.js +5 -1
- package/dist/helpers/network/tcp-socket/network-tls-tcp-server.helper.js.map +1 -1
- package/dist/helpers/network/udp-socket/network-udp-client.helper.js +11 -18
- package/dist/helpers/network/udp-socket/network-udp-client.helper.js.map +1 -1
- package/dist/helpers/queue/bullmq.helper.js +11 -18
- package/dist/helpers/queue/bullmq.helper.js.map +1 -1
- package/dist/helpers/queue/mqtt.helper.js +7 -14
- package/dist/helpers/queue/mqtt.helper.js.map +1 -1
- package/dist/helpers/queue/queue.helper.js +63 -85
- package/dist/helpers/queue/queue.helper.js.map +1 -1
- package/dist/helpers/redis/default.helper.js +115 -134
- package/dist/helpers/redis/default.helper.js.map +1 -1
- package/dist/helpers/redis/redis-cluster.helper.js +7 -2
- package/dist/helpers/redis/redis-cluster.helper.js.map +1 -1
- package/dist/helpers/redis/redis.helper.js +7 -2
- package/dist/helpers/redis/redis.helper.js.map +1 -1
- package/dist/helpers/storage/minio.helper.d.ts +1 -1
- package/dist/helpers/storage/minio.helper.js +87 -115
- package/dist/helpers/storage/minio.helper.js.map +1 -1
- package/dist/helpers/testing/common.js +3 -3
- package/dist/helpers/testing/common.js.map +1 -1
- package/dist/helpers/testing/describe.js +12 -21
- package/dist/helpers/testing/describe.js.map +1 -1
- package/dist/helpers/testing/test-handler.js +19 -30
- package/dist/helpers/testing/test-handler.js.map +1 -1
- package/dist/helpers/testing/test-plan/base.js +4 -6
- package/dist/helpers/testing/test-plan/base.js.map +1 -1
- package/dist/helpers/worker-thread/base.js +6 -12
- package/dist/helpers/worker-thread/base.js.map +1 -1
- package/dist/helpers/worker-thread/worker-bus.js +5 -6
- package/dist/helpers/worker-thread/worker-bus.js.map +1 -1
- package/dist/helpers/worker-thread/worker-pool.js +13 -25
- package/dist/helpers/worker-thread/worker-pool.js.map +1 -1
- package/dist/interceptors/content-range.interceptor.js +116 -128
- package/dist/interceptors/content-range.interceptor.js.map +1 -1
- package/dist/middlewares/request-body-parser.middleware.js +4 -16
- package/dist/middlewares/request-body-parser.middleware.js.map +1 -1
- package/dist/middlewares/request-spy.middleware.js +4 -5
- package/dist/middlewares/request-spy.middleware.js.map +1 -1
- package/dist/migrations/handler.js +13 -22
- package/dist/migrations/handler.js.map +1 -1
- package/dist/mixins/tz.mixin.js +7 -8
- package/dist/mixins/tz.mixin.js.map +1 -1
- package/dist/mixins/user-audit.mixin.js +1 -1
- package/dist/mixins/user-audit.mixin.js.map +1 -1
- package/dist/mixins/vector.mixin.js +5 -6
- package/dist/mixins/vector.mixin.js.map +1 -1
- package/dist/tsconfig.base.json +2 -3
- package/dist/utilities/date.utility.js +5 -7
- package/dist/utilities/date.utility.js.map +1 -1
- package/dist/utilities/model.utility.js +2 -4
- package/dist/utilities/model.utility.js.map +1 -1
- package/dist/utilities/parse.utility.js +6 -8
- package/dist/utilities/parse.utility.js.map +1 -1
- package/dist/utilities/performance.utility.js +1 -2
- package/dist/utilities/performance.utility.js.map +1 -1
- package/dist/utilities/promise.utility.js +5 -14
- package/dist/utilities/promise.utility.js.map +1 -1
- package/dist/utilities/query.utility.js +8 -10
- package/dist/utilities/query.utility.js.map +1 -1
- package/dist/utilities/request.utility.js +2 -3
- package/dist/utilities/request.utility.js.map +1 -1
- package/package.json +2 -3
|
@@ -8,15 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
12
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
13
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
14
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
15
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
16
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
17
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
18
|
-
});
|
|
19
|
-
};
|
|
20
11
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
21
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
22
13
|
};
|
|
@@ -31,140 +22,132 @@ const get_1 = __importDefault(require("lodash/get"));
|
|
|
31
22
|
const set_1 = __importDefault(require("lodash/set"));
|
|
32
23
|
let SearchableTzCrudRepository = SearchableTzCrudRepository_1 = class SearchableTzCrudRepository extends tz_crud_repository_1.TzCrudRepository {
|
|
33
24
|
constructor(entityClass, dataSource, opts, scope) {
|
|
34
|
-
|
|
35
|
-
super(entityClass, dataSource, scope !== null && scope !== void 0 ? scope : SearchableTzCrudRepository_1.name);
|
|
25
|
+
super(entityClass, dataSource, scope ?? SearchableTzCrudRepository_1.name);
|
|
36
26
|
this.isInclusionRelations = opts.isInclusionRelations;
|
|
37
|
-
this.searchableInclusions =
|
|
27
|
+
this.searchableInclusions = opts.searchableInclusions ?? [];
|
|
38
28
|
}
|
|
39
29
|
// ----------------------------------------------------------------------------------------------------
|
|
40
|
-
registerOnInclusionChanged(relation, relationRepositoryGetter) {
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
});
|
|
61
|
-
}));
|
|
30
|
+
async registerOnInclusionChanged(relation, relationRepositoryGetter) {
|
|
31
|
+
const relationRepository = await relationRepositoryGetter();
|
|
32
|
+
relationRepository.modelClass.observe('after save', async (context) => {
|
|
33
|
+
const { isNewInstance, where, instance, options } = context;
|
|
34
|
+
let entities = [];
|
|
35
|
+
if (isNewInstance) {
|
|
36
|
+
entities.push(instance);
|
|
37
|
+
}
|
|
38
|
+
else {
|
|
39
|
+
entities = await relationRepository.find({ where }, options);
|
|
40
|
+
}
|
|
41
|
+
await this.onInclusionChanged({ relation, relationRepository, entities, options });
|
|
42
|
+
});
|
|
43
|
+
relationRepository.modelClass.observe('after deleteWithReturn', async (context) => {
|
|
44
|
+
const { data } = context;
|
|
45
|
+
await this.onInclusionChanged({
|
|
46
|
+
relation,
|
|
47
|
+
relationRepository,
|
|
48
|
+
entities: data,
|
|
49
|
+
});
|
|
62
50
|
});
|
|
63
51
|
}
|
|
64
52
|
// ----------------------------------------------------------------------------------------------------
|
|
65
|
-
handleInclusionChanged(opts) {
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
const rs = resolved;
|
|
79
|
-
if (!(rs === null || rs === void 0 ? void 0 : rs.length)) {
|
|
80
|
-
break;
|
|
81
|
-
}
|
|
82
|
-
for (const r1 of rs) {
|
|
83
|
-
if (!r1) {
|
|
84
|
-
continue;
|
|
85
|
-
}
|
|
86
|
-
promises.push(this.updateById(r1.id,
|
|
87
|
-
// TODO: handle type
|
|
88
|
-
{
|
|
89
|
-
objectSearch: this.renderObjectSearch({ entity: r1 }),
|
|
90
|
-
}, { ignoreMixSearchFields: true, options }));
|
|
91
|
-
}
|
|
53
|
+
async handleInclusionChanged(opts) {
|
|
54
|
+
const { relationName, relationType, entities, relationRepository, options } = opts;
|
|
55
|
+
const resolved = await relationRepository.inclusionResolvers.get(relationName)?.(entities, {
|
|
56
|
+
relation: relationName,
|
|
57
|
+
scope: {
|
|
58
|
+
include: this.searchableInclusions,
|
|
59
|
+
},
|
|
60
|
+
}, options);
|
|
61
|
+
const promises = [];
|
|
62
|
+
switch (relationType) {
|
|
63
|
+
case 'belongsTo': {
|
|
64
|
+
const rs = resolved;
|
|
65
|
+
if (!rs?.length) {
|
|
92
66
|
break;
|
|
93
67
|
}
|
|
94
|
-
|
|
68
|
+
for (const r1 of rs) {
|
|
69
|
+
if (!r1) {
|
|
70
|
+
continue;
|
|
71
|
+
}
|
|
72
|
+
promises.push(this.updateById(r1.id,
|
|
73
|
+
// TODO: handle type
|
|
74
|
+
{
|
|
75
|
+
objectSearch: this.renderObjectSearch({ entity: r1 }),
|
|
76
|
+
}, { ignoreMixSearchFields: true, options }));
|
|
77
|
+
}
|
|
78
|
+
break;
|
|
79
|
+
}
|
|
80
|
+
case 'hasOne': {
|
|
81
|
+
break;
|
|
82
|
+
}
|
|
83
|
+
case 'hasMany':
|
|
84
|
+
case 'hasManyThrough': {
|
|
85
|
+
const rs = resolved;
|
|
86
|
+
if (!rs?.length) {
|
|
95
87
|
break;
|
|
96
88
|
}
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
const rs = resolved;
|
|
100
|
-
if (!(rs === null || rs === void 0 ? void 0 : rs.length)) {
|
|
89
|
+
for (const r1 of rs) {
|
|
90
|
+
if (!r1?.length) {
|
|
101
91
|
break;
|
|
102
92
|
}
|
|
103
|
-
for (const
|
|
104
|
-
if (!
|
|
105
|
-
|
|
106
|
-
}
|
|
107
|
-
for (const r2 of r1) {
|
|
108
|
-
if (!rs) {
|
|
109
|
-
continue;
|
|
110
|
-
}
|
|
111
|
-
promises.push(this.updateById(r2.id,
|
|
112
|
-
// TODO: handle type
|
|
113
|
-
{
|
|
114
|
-
objectSearch: this.renderObjectSearch({ entity: r2 }),
|
|
115
|
-
}, { ignoreMixSearchFields: true, options }));
|
|
93
|
+
for (const r2 of r1) {
|
|
94
|
+
if (!rs) {
|
|
95
|
+
continue;
|
|
116
96
|
}
|
|
97
|
+
promises.push(this.updateById(r2.id,
|
|
98
|
+
// TODO: handle type
|
|
99
|
+
{
|
|
100
|
+
objectSearch: this.renderObjectSearch({ entity: r2 }),
|
|
101
|
+
}, { ignoreMixSearchFields: true, options }));
|
|
117
102
|
}
|
|
118
|
-
break;
|
|
119
|
-
}
|
|
120
|
-
default: {
|
|
121
|
-
break;
|
|
122
103
|
}
|
|
104
|
+
break;
|
|
123
105
|
}
|
|
124
|
-
|
|
125
|
-
|
|
106
|
+
default: {
|
|
107
|
+
break;
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
await Promise.all(promises);
|
|
126
111
|
}
|
|
127
112
|
// ----------------------------------------------------------------------------------------------------
|
|
128
|
-
renderSearchable(field, data, options) {
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
113
|
+
async renderSearchable(field, data, options) {
|
|
114
|
+
const where = (0, get_1.default)(options, 'where');
|
|
115
|
+
const isSearchable = (0, get_1.default)(this.modelClass.definition.properties, field, null) !== null;
|
|
116
|
+
if (!isSearchable) {
|
|
117
|
+
return null;
|
|
118
|
+
}
|
|
119
|
+
let resolved = [data];
|
|
120
|
+
if (this.isInclusionRelations && this.searchableInclusions.length) {
|
|
121
|
+
resolved = await this.includeRelatedModels([data], this.searchableInclusions, options);
|
|
122
|
+
}
|
|
123
|
+
switch (field) {
|
|
124
|
+
case 'textSearch': {
|
|
125
|
+
return this.renderTextSearch({ data, entity: resolved?.[0] });
|
|
138
126
|
}
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
127
|
+
case 'objectSearch': {
|
|
128
|
+
let currentObjectSearch = {};
|
|
129
|
+
if (where) {
|
|
130
|
+
const found = await this.findOne({
|
|
131
|
+
where,
|
|
132
|
+
include: this.searchableInclusions,
|
|
133
|
+
});
|
|
134
|
+
if (found) {
|
|
135
|
+
currentObjectSearch = this.renderObjectSearch({
|
|
136
|
+
data,
|
|
137
|
+
entity: found,
|
|
149
138
|
});
|
|
150
|
-
if (found) {
|
|
151
|
-
currentObjectSearch = this.renderObjectSearch({
|
|
152
|
-
data,
|
|
153
|
-
entity: found,
|
|
154
|
-
});
|
|
155
|
-
}
|
|
156
139
|
}
|
|
157
|
-
const newObjectSearch = this.renderObjectSearch({
|
|
158
|
-
data,
|
|
159
|
-
entity: resolved === null || resolved === void 0 ? void 0 : resolved[0],
|
|
160
|
-
});
|
|
161
|
-
return Object.assign(Object.assign({}, currentObjectSearch), newObjectSearch);
|
|
162
|
-
}
|
|
163
|
-
default: {
|
|
164
|
-
return null;
|
|
165
140
|
}
|
|
141
|
+
const newObjectSearch = this.renderObjectSearch({
|
|
142
|
+
data,
|
|
143
|
+
entity: resolved?.[0],
|
|
144
|
+
});
|
|
145
|
+
return { ...currentObjectSearch, ...newObjectSearch };
|
|
166
146
|
}
|
|
167
|
-
|
|
147
|
+
default: {
|
|
148
|
+
return null;
|
|
149
|
+
}
|
|
150
|
+
}
|
|
168
151
|
}
|
|
169
152
|
// ----------------------------------------------------------------------------------------------------
|
|
170
153
|
mixSearchFields(data, options) {
|
|
@@ -191,7 +174,7 @@ let SearchableTzCrudRepository = SearchableTzCrudRepository_1 = class Searchable
|
|
|
191
174
|
}
|
|
192
175
|
// ----------------------------------------------------------------------------------------------------
|
|
193
176
|
create(data, options) {
|
|
194
|
-
const tmp = this.mixUserAudit(data, { newInstance: true, authorId: options
|
|
177
|
+
const tmp = this.mixUserAudit(data, { newInstance: true, authorId: options?.authorId });
|
|
195
178
|
return new Promise((resolve, reject) => {
|
|
196
179
|
this.mixSearchFields(tmp, options)
|
|
197
180
|
.then(enriched => {
|
|
@@ -204,7 +187,7 @@ let SearchableTzCrudRepository = SearchableTzCrudRepository_1 = class Searchable
|
|
|
204
187
|
createAll(data, options) {
|
|
205
188
|
return new Promise((resolve, reject) => {
|
|
206
189
|
Promise.all(data.map(el => {
|
|
207
|
-
const tmp = this.mixUserAudit(el, { newInstance: true, authorId: options
|
|
190
|
+
const tmp = this.mixUserAudit(el, { newInstance: true, authorId: options?.authorId });
|
|
208
191
|
return this.mixSearchFields(tmp, options);
|
|
209
192
|
}))
|
|
210
193
|
.then(enriched => {
|
|
@@ -215,9 +198,9 @@ let SearchableTzCrudRepository = SearchableTzCrudRepository_1 = class Searchable
|
|
|
215
198
|
}
|
|
216
199
|
// ----------------------------------------------------------------------------------------------------
|
|
217
200
|
updateById(id, data, options) {
|
|
218
|
-
const tmp = this.mixUserAudit(data, { newInstance: false, authorId: options
|
|
201
|
+
const tmp = this.mixUserAudit(data, { newInstance: false, authorId: options?.authorId });
|
|
219
202
|
return new Promise((resolve, reject) => {
|
|
220
|
-
this.mixSearchFields(tmp,
|
|
203
|
+
this.mixSearchFields(tmp, { ...options, where: { id } })
|
|
221
204
|
.then(enriched => {
|
|
222
205
|
resolve(super.updateById(id, enriched, options));
|
|
223
206
|
})
|
|
@@ -226,7 +209,7 @@ let SearchableTzCrudRepository = SearchableTzCrudRepository_1 = class Searchable
|
|
|
226
209
|
}
|
|
227
210
|
// ----------------------------------------------------------------------------------------------------
|
|
228
211
|
replaceById(id, data, options) {
|
|
229
|
-
const tmp = this.mixUserAudit(data, { newInstance: false, authorId: options
|
|
212
|
+
const tmp = this.mixUserAudit(data, { newInstance: false, authorId: options?.authorId });
|
|
230
213
|
return new Promise((resolve, reject) => {
|
|
231
214
|
this.mixSearchFields(tmp, options)
|
|
232
215
|
.then(enriched => {
|
|
@@ -265,32 +248,30 @@ let SearchableTzCrudRepository = SearchableTzCrudRepository_1 = class Searchable
|
|
|
265
248
|
return this.execute(query, undefined, options);
|
|
266
249
|
}
|
|
267
250
|
// ----------------------------------------------------------------------------------------------------
|
|
268
|
-
syncSearchFields(where, options) {
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
break;
|
|
288
|
-
}
|
|
251
|
+
async syncSearchFields(where, options) {
|
|
252
|
+
const t = performance.now();
|
|
253
|
+
const pagingLimit = (0, get_1.default)(options, 'pagingLimit', 50);
|
|
254
|
+
let pagingOffset = 0;
|
|
255
|
+
this.logger.info('[syncSearchFields] Start sync searchable fields');
|
|
256
|
+
const tasks = [];
|
|
257
|
+
while (true) {
|
|
258
|
+
const entities = await this.find({ where, include: this.searchableInclusions, limit: pagingLimit, offset: pagingOffset }, options);
|
|
259
|
+
this.logger.info('[syncSearchFields] Where: %j | Found: %d', where, entities.length);
|
|
260
|
+
tasks.push(() => this._syncSearchFields(entities, options)
|
|
261
|
+
.then(() => {
|
|
262
|
+
this.logger.info(`[syncSearchFields] Sucess sync %d rows`, entities.length);
|
|
263
|
+
})
|
|
264
|
+
.catch(e => {
|
|
265
|
+
this.logger.error(`[syncSearchFields] Error: %j`, e);
|
|
266
|
+
}));
|
|
267
|
+
pagingOffset += pagingLimit;
|
|
268
|
+
if (entities.length < pagingLimit) {
|
|
269
|
+
break;
|
|
289
270
|
}
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
271
|
+
}
|
|
272
|
+
await (0, utilities_1.executePromiseWithLimit)({ tasks, limit: 5 });
|
|
273
|
+
this.logger.info('[syncSearchFields] End sync searchable fields | Took: %d (ms)', performance.now() - t);
|
|
274
|
+
return;
|
|
294
275
|
}
|
|
295
276
|
};
|
|
296
277
|
exports.SearchableTzCrudRepository = SearchableTzCrudRepository;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"searchable-tz-crud.repository.js","sourceRoot":"","sources":["../../../src/base/repositories/searchable-tz-crud.repository.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"searchable-tz-crud.repository.js","sourceRoot":"","sources":["../../../src/base/repositories/searchable-tz-crud.repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
4
|
};
|
|
@@ -34,28 +25,26 @@ class TzCrudRepository extends base_repository_1.AbstractTzRepository {
|
|
|
34
25
|
}
|
|
35
26
|
// ----------------------------------------------------------------------------------------------------
|
|
36
27
|
create(data, options) {
|
|
37
|
-
var _a;
|
|
38
28
|
let enriched = this.mixTimestamp(data, {
|
|
39
29
|
newInstance: true,
|
|
40
|
-
ignoreModified:
|
|
30
|
+
ignoreModified: options?.ignoreModified ?? false,
|
|
41
31
|
});
|
|
42
32
|
enriched = this.mixUserAudit(enriched, {
|
|
43
33
|
newInstance: true,
|
|
44
|
-
authorId: options
|
|
34
|
+
authorId: options?.authorId,
|
|
45
35
|
});
|
|
46
36
|
return super.create(enriched, options);
|
|
47
37
|
}
|
|
48
38
|
// ----------------------------------------------------------------------------------------------------
|
|
49
39
|
createAll(datum, options) {
|
|
50
40
|
const enriched = datum.map(data => {
|
|
51
|
-
var _a;
|
|
52
41
|
const tmp = this.mixTimestamp(data, {
|
|
53
42
|
newInstance: true,
|
|
54
|
-
ignoreModified:
|
|
43
|
+
ignoreModified: options?.ignoreModified ?? false,
|
|
55
44
|
});
|
|
56
45
|
return this.mixUserAudit(tmp, {
|
|
57
46
|
newInstance: true,
|
|
58
|
-
authorId: options
|
|
47
|
+
authorId: options?.authorId,
|
|
59
48
|
});
|
|
60
49
|
});
|
|
61
50
|
return super.createAll(enriched, options);
|
|
@@ -68,14 +57,13 @@ class TzCrudRepository extends base_repository_1.AbstractTzRepository {
|
|
|
68
57
|
}
|
|
69
58
|
// ----------------------------------------------------------------------------------------------------
|
|
70
59
|
updateById(id, data, options) {
|
|
71
|
-
var _a;
|
|
72
60
|
let enriched = this.mixTimestamp(data, {
|
|
73
61
|
newInstance: false,
|
|
74
|
-
ignoreModified:
|
|
62
|
+
ignoreModified: options?.ignoreModified ?? false,
|
|
75
63
|
});
|
|
76
64
|
enriched = this.mixUserAudit(enriched, {
|
|
77
65
|
newInstance: false,
|
|
78
|
-
authorId: options
|
|
66
|
+
authorId: options?.authorId,
|
|
79
67
|
});
|
|
80
68
|
return super.updateById(id, enriched, options);
|
|
81
69
|
}
|
|
@@ -95,47 +83,43 @@ class TzCrudRepository extends base_repository_1.AbstractTzRepository {
|
|
|
95
83
|
}
|
|
96
84
|
// ----------------------------------------------------------------------------------------------------
|
|
97
85
|
updateAll(data, where, options) {
|
|
98
|
-
var _a;
|
|
99
86
|
let enriched = this.mixTimestamp(data, {
|
|
100
87
|
newInstance: false,
|
|
101
|
-
ignoreModified:
|
|
88
|
+
ignoreModified: options?.ignoreModified ?? false,
|
|
102
89
|
});
|
|
103
90
|
enriched = this.mixUserAudit(enriched, {
|
|
104
91
|
newInstance: false,
|
|
105
|
-
authorId: options
|
|
92
|
+
authorId: options?.authorId,
|
|
106
93
|
});
|
|
107
94
|
return super.updateAll(enriched, where, options);
|
|
108
95
|
}
|
|
109
96
|
// ----------------------------------------------------------------------------------------------------
|
|
110
|
-
upsertWith(data, where, options) {
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
const rs = yield this.findOne({ where }, options);
|
|
116
|
-
return rs;
|
|
117
|
-
}
|
|
118
|
-
const rs = yield this.create(data, options);
|
|
97
|
+
async upsertWith(data, where, options) {
|
|
98
|
+
const isExisted = await this.existsWith(where, options);
|
|
99
|
+
if (isExisted) {
|
|
100
|
+
await this.updateAll(data, where, options);
|
|
101
|
+
const rs = await this.findOne({ where }, options);
|
|
119
102
|
return rs;
|
|
120
|
-
}
|
|
103
|
+
}
|
|
104
|
+
const rs = await this.create(data, options);
|
|
105
|
+
return rs;
|
|
121
106
|
}
|
|
122
107
|
// ----------------------------------------------------------------------------------------------------
|
|
123
108
|
replaceById(id, data, options) {
|
|
124
|
-
var _a;
|
|
125
109
|
let enriched = this.mixTimestamp(data, {
|
|
126
110
|
newInstance: false,
|
|
127
|
-
ignoreModified:
|
|
111
|
+
ignoreModified: options?.ignoreModified ?? false,
|
|
128
112
|
});
|
|
129
113
|
enriched = this.mixUserAudit(enriched, {
|
|
130
114
|
newInstance: false,
|
|
131
|
-
authorId: options
|
|
115
|
+
authorId: options?.authorId,
|
|
132
116
|
});
|
|
133
117
|
return super.replaceById(id, enriched, options);
|
|
134
118
|
}
|
|
135
119
|
// ----------------------------------------------------------------------------------------------------
|
|
136
120
|
_softDelete(where, options) {
|
|
137
121
|
return new Promise((resolve, reject) => {
|
|
138
|
-
const { databaseSchema, connectorType = 'postgresql', softDeleteField = 'isDeleted', useIgnoreModified = false, authorId, } = options
|
|
122
|
+
const { databaseSchema, connectorType = 'postgresql', softDeleteField = 'isDeleted', useIgnoreModified = false, authorId, } = options ?? {};
|
|
139
123
|
const tableName = this.modelClass.definition.tableName(connectorType);
|
|
140
124
|
const softDeleteColumnName = this.modelClass.definition.columnName(connectorType, softDeleteField);
|
|
141
125
|
// Mix Timestamp
|
|
@@ -152,9 +136,8 @@ class TzCrudRepository extends base_repository_1.AbstractTzRepository {
|
|
|
152
136
|
const now = new Date();
|
|
153
137
|
this.find({ fields: { id: true }, where })
|
|
154
138
|
.then(rs => {
|
|
155
|
-
var _a;
|
|
156
139
|
const sqlBuilder = helpers_1.QueryBuilderHelper.getPostgresQueryBuilder()
|
|
157
|
-
.withSchema(
|
|
140
|
+
.withSchema(databaseSchema ?? schema ?? 'public')
|
|
158
141
|
.from(tableName)
|
|
159
142
|
.update({ [softDeleteColumnName]: true })
|
|
160
143
|
.whereIn('id', rs.map(el => el.id));
|
|
@@ -201,7 +184,7 @@ class TzCrudRepository extends base_repository_1.AbstractTzRepository {
|
|
|
201
184
|
newInstance: false,
|
|
202
185
|
ignoreModified: false,
|
|
203
186
|
}) {
|
|
204
|
-
if (options
|
|
187
|
+
if (options?.newInstance) {
|
|
205
188
|
entity.createdAt = new Date();
|
|
206
189
|
}
|
|
207
190
|
if (!options.ignoreModified) {
|
|
@@ -210,10 +193,10 @@ class TzCrudRepository extends base_repository_1.AbstractTzRepository {
|
|
|
210
193
|
return entity;
|
|
211
194
|
}
|
|
212
195
|
mixUserAudit(entity, options) {
|
|
213
|
-
if (!
|
|
196
|
+
if (!options?.authorId) {
|
|
214
197
|
return entity;
|
|
215
198
|
}
|
|
216
|
-
if (options
|
|
199
|
+
if (options?.newInstance) {
|
|
217
200
|
entity.createdBy = options.authorId;
|
|
218
201
|
}
|
|
219
202
|
entity.modifiedBy = options.authorId;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tz-crud.repository.js","sourceRoot":"","sources":["../../../src/base/repositories/tz-crud.repository.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tz-crud.repository.js","sourceRoot":"","sources":["../../../src/base/repositories/tz-crud.repository.ts"],"names":[],"mappings":"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"}
|