@comet/cms-api 9.0.0-canary-20250915134805 → 9.0.0-canary-20251002064922
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/lib/auth/services/jwt.auth-service.d.ts.map +1 -1
- package/lib/auth/services/jwt.auth-service.js +2 -6
- package/lib/auth/services/jwt.auth-service.js.map +1 -1
- package/lib/blocks/blocks-transformer.d.ts.map +1 -1
- package/lib/blocks/blocks-transformer.js +2 -5
- package/lib/blocks/blocks-transformer.js.map +1 -1
- package/lib/common/entityInfo/entity-info.service.d.ts +0 -1
- package/lib/common/entityInfo/entity-info.service.d.ts.map +1 -1
- package/lib/common/entityInfo/entity-info.service.js +2 -6
- package/lib/common/entityInfo/entity-info.service.js.map +1 -1
- package/lib/common/filter/mikro-orm.d.ts +6 -1
- package/lib/common/filter/mikro-orm.d.ts.map +1 -1
- package/lib/common/filter/mikro-orm.js +16 -0
- package/lib/common/filter/mikro-orm.js.map +1 -1
- package/lib/common/helper/is-injectable-service.helper.d.ts +3 -0
- package/lib/common/helper/is-injectable-service.helper.d.ts.map +1 -0
- package/lib/common/helper/is-injectable-service.helper.js +8 -0
- package/lib/common/helper/is-injectable-service.helper.js.map +1 -0
- package/lib/dam/dam.module.d.ts.map +1 -1
- package/lib/dam/dam.module.js +1 -6
- package/lib/dam/dam.module.js.map +1 -1
- package/lib/index.d.ts +2 -1
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +6 -3
- package/lib/index.js.map +1 -1
- package/lib/mailer/entities/mailer-log-status.enum.d.ts +5 -0
- package/lib/mailer/entities/mailer-log-status.enum.d.ts.map +1 -0
- package/lib/mailer/entities/mailer-log-status.enum.js +13 -0
- package/lib/mailer/entities/mailer-log-status.enum.js.map +1 -0
- package/lib/mailer/entities/mailer-log.entity.d.ts +17 -0
- package/lib/mailer/entities/mailer-log.entity.d.ts.map +1 -0
- package/lib/mailer/entities/mailer-log.entity.js +74 -0
- package/lib/mailer/entities/mailer-log.entity.js.map +1 -0
- package/lib/mailer/mailer.module.d.ts +3 -0
- package/lib/mailer/mailer.module.d.ts.map +1 -1
- package/lib/mailer/mailer.module.js +3 -0
- package/lib/mailer/mailer.module.js.map +1 -1
- package/lib/mailer/mailer.service.d.ts +12 -4
- package/lib/mailer/mailer.service.d.ts.map +1 -1
- package/lib/mailer/mailer.service.js +46 -3
- package/lib/mailer/mailer.service.js.map +1 -1
- package/lib/mikro-orm/migrations/Migration20250612134629.d.ts +5 -0
- package/lib/mikro-orm/migrations/Migration20250612134629.d.ts.map +1 -0
- package/lib/mikro-orm/migrations/Migration20250612134629.js +34 -0
- package/lib/mikro-orm/migrations/Migration20250612134629.js.map +1 -0
- package/lib/mikro-orm/mikro-orm.module.d.ts.map +1 -1
- package/lib/mikro-orm/mikro-orm.module.js +2 -0
- package/lib/mikro-orm/mikro-orm.module.js.map +1 -1
- package/lib/tsconfig.build.tsbuildinfo +1 -1
- package/lib/user-permissions/content-scope.service.d.ts +0 -1
- package/lib/user-permissions/content-scope.service.d.ts.map +1 -1
- package/lib/user-permissions/content-scope.service.js +2 -6
- package/lib/user-permissions/content-scope.service.js.map +1 -1
- package/lib/warnings/warning-checker.command.d.ts +0 -2
- package/lib/warnings/warning-checker.command.d.ts.map +1 -1
- package/lib/warnings/warning-checker.command.js +11 -12
- package/lib/warnings/warning-checker.command.js.map +1 -1
- package/lib/warnings/warning-event-subscriber.d.ts +0 -2
- package/lib/warnings/warning-event-subscriber.d.ts.map +1 -1
- package/lib/warnings/warning-event-subscriber.js +11 -12
- package/lib/warnings/warning-event-subscriber.js.map +1 -1
- package/package.json +4 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"content-scope.service.d.ts","sourceRoot":"","sources":["../../src/user-permissions/content-scope.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,gBAAgB,
|
|
1
|
+
{"version":3,"file":"content-scope.service.d.ts","sourceRoot":"","sources":["../../src/user-permissions/content-scope.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAwB,MAAM,gBAAgB,CAAC;AACxE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAKpD,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEjE,OAAO,EAAE,YAAY,EAAE,MAAM,wDAAwD,CAAC;AAItF,qBACa,mBAAmB;IAExB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,SAAS;IACd,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC;gBAHrC,SAAS,EAAE,SAAS,EACX,GAAG,EAAE,QAAQ,EACb,SAAS,EAAE,SAAS,EACR,eAAe,CAAC,EAAE,eAAe,YAAA;IAGlE,cAAc,CAAC,MAAM,EAAE,YAAY,GAAG,SAAS,EAAE,MAAM,EAAE,YAAY,GAAG,SAAS,GAAG,OAAO;IAQrF,2BAA2B,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC;IAejF,+BAA+B,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAIzF,eAAe,CAAC,MAAM,EAAE,YAAY,EAAE,EAAE,GAAG,YAAY,EAAE;YAY3C,0BAA0B;YAiE1B,OAAO;CAQxB"}
|
|
@@ -27,10 +27,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
27
27
|
exports.ContentScopeService = void 0;
|
|
28
28
|
const postgresql_1 = require("@mikro-orm/postgresql");
|
|
29
29
|
const common_1 = require("@nestjs/common");
|
|
30
|
-
const constants_1 = require("@nestjs/common/constants");
|
|
31
30
|
const core_1 = require("@nestjs/core");
|
|
32
31
|
const graphql_1 = require("@nestjs/graphql");
|
|
33
32
|
const lodash_isequal_1 = __importDefault(require("lodash.isequal"));
|
|
33
|
+
const is_injectable_service_helper_1 = require("../common/helper/is-injectable-service.helper");
|
|
34
34
|
const page_tree_service_1 = require("../page-tree/page-tree.service");
|
|
35
35
|
const scoped_entity_decorator_1 = require("../user-permissions/decorators/scoped-entity.decorator");
|
|
36
36
|
const affected_entity_decorator_1 = require("./decorators/affected-entity.decorator");
|
|
@@ -102,7 +102,7 @@ let ContentScopeService = class ContentScopeService {
|
|
|
102
102
|
if (!scoped)
|
|
103
103
|
throw new Error(`Entity ${affectedEntity.entity} is missing @ScopedEntity decorator`);
|
|
104
104
|
let scopes;
|
|
105
|
-
if (
|
|
105
|
+
if ((0, is_injectable_service_helper_1.isInjectableService)(scoped)) {
|
|
106
106
|
const service = this.moduleRef.get(scoped, { strict: false });
|
|
107
107
|
scopes = yield service.getEntityScope(row);
|
|
108
108
|
}
|
|
@@ -154,10 +154,6 @@ let ContentScopeService = class ContentScopeService {
|
|
|
154
154
|
}
|
|
155
155
|
});
|
|
156
156
|
}
|
|
157
|
-
isService(meta) {
|
|
158
|
-
// Check if class has @Injectable() decorator -> if true it's a service class else it's a function
|
|
159
|
-
return Reflect.hasMetadata(constants_1.INJECTABLE_WATERMARK, meta);
|
|
160
|
-
}
|
|
161
157
|
};
|
|
162
158
|
exports.ContentScopeService = ContentScopeService;
|
|
163
159
|
exports.ContentScopeService = ContentScopeService = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"content-scope.service.js","sourceRoot":"","sources":["../../src/user-permissions/content-scope.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAAiD;AACjD,
|
|
1
|
+
{"version":3,"file":"content-scope.service.js","sourceRoot":"","sources":["../../src/user-permissions/content-scope.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAAiD;AACjD,2CAAwE;AACxE,uCAAoD;AACpD,6CAAsD;AACtD,oEAAqC;AAErC,gGAAoF;AACpF,sEAAiE;AACjE,oGAAsH;AAEtH,sFAA0G;AAE1G,mGAAmG;AAE5F,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC5B,YACY,SAAoB,EACX,GAAa,EACb,SAAoB,EACR,eAAiC;QAHtD,cAAS,GAAT,SAAS,CAAW;QACX,QAAG,GAAH,GAAG,CAAU;QACb,cAAS,GAAT,SAAS,CAAW;QACR,oBAAe,GAAf,eAAe,CAAkB;IAC/D,CAAC;IAEJ,cAAc,CAAC,MAAgC,EAAE,MAAgC;QAC7E,8CAA8C;QAC9C,6CAA6C;QAC7C,+CAA+C;QAC/C,yEAAyE;QACzE,OAAO,IAAA,wBAAO,oBAAM,MAAM,qBAAS,MAAM,EAAG,CAAC;IACjD,CAAC;IAEK,2BAA2B,CAAC,OAAyB;;YACvD,MAAM,aAAa,GAAqB,EAAE,CAAC;YAC3C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YACzC,MAAM,QAAQ,GAAG,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,IAAI,KAAK,OAAO,CAAC,UAAU,EAAE,CAAC,IAAI,IAAI,CAAC;YAE9E,MAAM,gBAAgB,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAuB,wDAA4B,EAAE,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;YAC5I,KAAK,MAAM,cAAc,IAAI,gBAAgB,EAAE,CAAC;gBAC5C,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,0BAA0B,CAAC,cAAc,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;YACnG,CAAC;YACD,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBACb,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,KAAqB,CAAC,CAAC,CAAC;YACrD,CAAC;YACD,OAAO,aAAa,CAAC;QACzB,CAAC;KAAA;IAEK,+BAA+B,CAAC,OAAyB;;YAC3D,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,IAAI,CAAC,2BAA2B,CAAC,OAAO,CAAC,CAAC,CAAC;QACjF,CAAC;KAAA;IAED,eAAe,CAAC,MAAwB;QACpC,MAAM,YAAY,GAAmB,EAAE,CAAC;QAExC,MAAM,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE;YACpC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,aAAa,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC;gBAC3F,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YACrC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,YAAY,CAAC;IACxB,CAAC;IAEa,0BAA0B,CACpC,cAAkC,EAClC,IAA4B,EAC5B,QAAgB;;YAEhB,MAAM,aAAa,GAAqB,EAAE,CAAC;YAC3C,IAAI,cAAc,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;gBAC/B,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;oBAC1E,MAAM,IAAI,KAAK,CAAC,GAAG,cAAc,CAAC,OAAO,CAAC,KAAK,gBAAgB,CAAC,CAAC;gBACrE,CAAC;gBAED,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;oBACrC,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,aAAa,CAA2B,cAAc,CAAC,MAAM,CAAC,CAAC;oBACxF,MAAM,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;oBAC9C,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;oBAE1C,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;wBACnB,MAAM,IAAI,KAAK,CACX,6CAA6C,cAAc,CAAC,OAAO,CAAC,KAAK,QAAQ,QAAQ,2DAA2D,CACvJ,CAAC;oBACN,CAAC;oBAED,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;wBACnB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,oDAAoD;wBAClH,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;4BACZ,aAAa,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,KAAqB,CAAC,CAAC,CAAC;wBACpD,CAAC;6BAAM,CAAC;4BACJ,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAmB,oDAA0B,EAAE,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;4BACvH,IAAI,CAAC,MAAM;gCAAE,MAAM,IAAI,KAAK,CAAC,UAAU,cAAc,CAAC,MAAM,qCAAqC,CAAC,CAAC;4BACnG,IAAI,MAAM,CAAC;4BACX,IAAI,IAAA,kDAAmB,EAAC,MAAM,CAAC,EAAE,CAAC;gCAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;gCAC9D,MAAM,GAAG,MAAM,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;4BAC/C,CAAC;iCAAM,CAAC;gCACJ,MAAM,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,CAAC;4BAC/B,CAAC;4BACD,IAAI,CAAC,MAAM;gCAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,cAAc,CAAC,MAAM,2BAA2B,CAAC,CAAC;4BAC7G,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;wBAClE,CAAC;oBACL,CAAC;gBACL,CAAC;YACL,CAAC;iBAAM,IAAI,cAAc,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC;gBAClD,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,QAAQ;oBACnF,MAAM,IAAI,KAAK,CAAC,GAAG,cAAc,CAAC,OAAO,CAAC,iBAAiB,gBAAgB,CAAC,CAAC;gBAEjF,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,CAAC;oBACjD,IAAI,IAAI,CAAC,eAAe,KAAK,SAAS;wBAAE,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;oBAC3H,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;oBACpF,MAAM,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;oBAC1D,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;oBAC1C,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;wBACnB,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;wBAC3C,IAAI,CAAC,IAAI;4BAAE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;wBACtD,IAAI,CAAC,IAAI,CAAC,KAAK;4BAAE,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;wBACtE,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,KAAqB,CAAC,CAAC,CAAC;oBACrD,CAAC;gBACL,CAAC;YACL,CAAC;iBAAM,CAAC;gBACJ,0HAA0H;gBAC1H,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;YAC9D,CAAC;YACD,OAAO,aAAa,CAAC;QACzB,CAAC;KAAA;IAED,8DAA8D;IAChD,OAAO,CAAC,OAAyB;;YAC3C,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,KAAK,SAAS,EAAE,CAAC;gBAC7C,OAAO,6BAAmB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC;YACzD,CAAC;iBAAM,CAAC;gBACJ,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAC;gBACpD,uCAAY,OAAO,CAAC,MAAM,GAAK,OAAO,CAAC,KAAK,EAAG;YACnD,CAAC;QACL,CAAC;KAAA;CACJ,CAAA;AAxHY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;IAMJ,WAAA,IAAA,iBAAQ,GAAE,CAAA;qCAHQ,gBAAS;QACN,qBAAQ;QACF,gBAAS;QACU,mCAAe;GALzD,mBAAmB,CAwH/B"}
|
|
@@ -14,8 +14,6 @@ export declare class WarningCheckerCommand extends CommandRunner {
|
|
|
14
14
|
constructor(orm: MikroORM, discoverService: DiscoverService, entityManager: EntityManager, warningService: WarningService, reflector: Reflector, moduleRef: ModuleRef);
|
|
15
15
|
run(): Promise<void>;
|
|
16
16
|
private processEntityWarningsIndividually;
|
|
17
|
-
private isService;
|
|
18
|
-
private isBlockWarningService;
|
|
19
17
|
private groupRootBlockDataByEntity;
|
|
20
18
|
}
|
|
21
19
|
//# sourceMappingURL=warning-checker.command.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"warning-checker.command.d.ts","sourceRoot":"","sources":["../../src/warnings/warning-checker.command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqC,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAE,aAAa,EAAoB,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"warning-checker.command.d.ts","sourceRoot":"","sources":["../../src/warnings/warning-checker.command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqC,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAE,aAAa,EAAoB,MAAM,uBAAuB,CAAC;AAExE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAW,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAKxD,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAKnE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAenD,qBAKa,qBAAsB,SAAQ,aAAa;IAEhD,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,QAAQ,CAAC,SAAS;gBALT,GAAG,EAAE,QAAQ,EACb,eAAe,EAAE,eAAe,EAChC,aAAa,EAAE,aAAa,EAC5B,cAAc,EAAE,cAAc,EACvC,SAAS,EAAE,SAAS,EACX,SAAS,EAAE,SAAS;IAMnC,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;YA2IZ,iCAAiC;IAmC/C,OAAO,CAAC,0BAA0B;CA4BrC"}
|
|
@@ -29,10 +29,10 @@ exports.WarningCheckerCommand = void 0;
|
|
|
29
29
|
const core_1 = require("@mikro-orm/core");
|
|
30
30
|
const postgresql_1 = require("@mikro-orm/postgresql");
|
|
31
31
|
const common_1 = require("@nestjs/common");
|
|
32
|
-
const constants_1 = require("@nestjs/common/constants");
|
|
33
32
|
const core_2 = require("@nestjs/core");
|
|
34
33
|
const nest_commander_1 = require("nest-commander");
|
|
35
34
|
const flat_blocks_1 = require("../blocks/flat-blocks/flat-blocks");
|
|
35
|
+
const is_injectable_service_helper_1 = require("../common/helper/is-injectable-service.helper");
|
|
36
36
|
const discover_service_1 = require("../dependencies/discover.service");
|
|
37
37
|
const scoped_entity_decorator_1 = require("../user-permissions/decorators/scoped-entity.decorator");
|
|
38
38
|
const create_warnings_decorator_1 = require("./decorators/create-warnings.decorator");
|
|
@@ -75,8 +75,14 @@ let WarningCheckerCommand = class WarningCheckerCommand extends nest_commander_1
|
|
|
75
75
|
const entity = this.orm.getMetadata().get(className).class;
|
|
76
76
|
const scoped = this.reflector.getAllAndOverride(scoped_entity_decorator_1.SCOPED_ENTITY_METADATA_KEY, [entity]);
|
|
77
77
|
if (scoped) {
|
|
78
|
-
|
|
79
|
-
|
|
78
|
+
let scopedEntityScope;
|
|
79
|
+
if ((0, is_injectable_service_helper_1.isInjectableService)(scoped)) {
|
|
80
|
+
const service = this.moduleRef.get(scoped, { strict: false });
|
|
81
|
+
scopedEntityScope = yield service.getEntityScope(rootBlock);
|
|
82
|
+
}
|
|
83
|
+
else {
|
|
84
|
+
scopedEntityScope = yield scoped(rootBlock);
|
|
85
|
+
}
|
|
80
86
|
if (Array.isArray(scopedEntityScope)) {
|
|
81
87
|
throw new Error("Multiple scopes are not supported for warnings");
|
|
82
88
|
}
|
|
@@ -93,7 +99,7 @@ let WarningCheckerCommand = class WarningCheckerCommand extends nest_commander_1
|
|
|
93
99
|
for (const node of flatBlocks.depthFirst()) {
|
|
94
100
|
const warningsOrWarningsService = yield node.block.warnings();
|
|
95
101
|
let warnings = [];
|
|
96
|
-
if (
|
|
102
|
+
if ((0, is_injectable_service_helper_1.isInjectableService)(warningsOrWarningsService)) {
|
|
97
103
|
const warningsService = warningsOrWarningsService;
|
|
98
104
|
const service = yield this.moduleRef.get(warningsService, { strict: false });
|
|
99
105
|
warnings = yield service.warnings(node.block);
|
|
@@ -127,7 +133,7 @@ let WarningCheckerCommand = class WarningCheckerCommand extends nest_commander_1
|
|
|
127
133
|
const createWarnings = this.reflector.getAllAndOverride(create_warnings_decorator_1.CREATE_WARNINGS_METADATA_KEY, [entity]);
|
|
128
134
|
if (createWarnings) {
|
|
129
135
|
const repository = this.entityManager.getRepository(entity);
|
|
130
|
-
if (
|
|
136
|
+
if ((0, is_injectable_service_helper_1.isInjectableService)(createWarnings)) {
|
|
131
137
|
const service = this.moduleRef.get(createWarnings, { strict: false });
|
|
132
138
|
if (service.bulkCreateWarnings) {
|
|
133
139
|
const warningGenerator = service.bulkCreateWarnings();
|
|
@@ -202,13 +208,6 @@ let WarningCheckerCommand = class WarningCheckerCommand extends nest_commander_1
|
|
|
202
208
|
} while (rows.length > 0);
|
|
203
209
|
});
|
|
204
210
|
}
|
|
205
|
-
isService(meta) {
|
|
206
|
-
// Check if class has @Injectable() decorator -> if true it's a service class else it's a function
|
|
207
|
-
return Reflect.hasMetadata(constants_1.INJECTABLE_WATERMARK, meta);
|
|
208
|
-
}
|
|
209
|
-
isBlockWarningService(transformResponse) {
|
|
210
|
-
return Reflect.hasMetadata(constants_1.INJECTABLE_WATERMARK, transformResponse);
|
|
211
|
-
}
|
|
212
211
|
// Group root block data by tableName and className to reduce database calls.
|
|
213
212
|
// This allows the query builder to efficiently load all root blocks of an entity in one database call
|
|
214
213
|
groupRootBlockDataByEntity() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"warning-checker.command.js","sourceRoot":"","sources":["../../src/warnings/warning-checker.command.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAA8E;AAC9E,sDAAwE;AACxE,
|
|
1
|
+
{"version":3,"file":"warning-checker.command.js","sourceRoot":"","sources":["../../src/warnings/warning-checker.command.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAA8E;AAC9E,sDAAwE;AACxE,2CAA4C;AAC5C,uCAAoD;AACpD,mDAAwD;AAGxD,mEAA+D;AAC/D,gGAAoF;AACpF,uEAAmE;AACnE,oGAAsH;AAEtH,sFAAkI;AAClI,8DAAoD;AACpD,uDAAmD;AAoB5C,IAAM,qBAAqB,GAA3B,MAAM,qBAAsB,SAAQ,8BAAa;IACpD,YACqB,GAAa,EACb,eAAgC,EAChC,aAA4B,EAC5B,cAA8B,EACvC,SAAoB,EACX,SAAoB;QAErC,KAAK,EAAE,CAAC;QAPS,QAAG,GAAH,GAAG,CAAU;QACb,oBAAe,GAAf,eAAe,CAAiB;QAChC,kBAAa,GAAb,aAAa,CAAe;QAC5B,mBAAc,GAAd,cAAc,CAAgB;QACvC,cAAS,GAAT,SAAS,CAAW;QACX,cAAS,GAAT,SAAS,CAAW;IAGzC,CAAC;IAGK,GAAG;;;YACL,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC;YAE7B,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,0BAA0B,EAAE,EAAE,CAAC;gBACnD,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;gBAE/D,MAAM,iBAAiB,GAAG,GAAG,CAAC;gBAC9B,MAAM,gBAAgB,GAAG,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;gBAE1E,MAAM,YAAY,GAAG,CAAC,GAAG,IAAI,CAAC,UAAU,QAAQ,EAAE,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;gBAChG,IAAI,QAAQ,EAAE,CAAC;oBACX,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAC/B,CAAC;gBAED,gBAAgB,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;gBAC/E,IAAI,UAAU,GAAoB,EAAE,CAAC;gBACrC,IAAI,MAAM,GAAG,CAAC,CAAC;gBAEf,GAAG,CAAC;oBACA,MAAM,YAAY,GAAG,gBAAgB,CAAC,KAAK,EAAE,CAAC;oBAC9C,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;oBAC5B,UAAU,GAAG,CAAC,MAAM,YAAY,CAAC,SAAS,EAAE,CAAoB,CAAC;oBAEjE,KAAK,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,aAAa,EAAE,CAAC;wBAC5C,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;4BACjC,IAAI,KAAK,GAA6B,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;4BAChF,MAAM,SAAS,GAAG,SAAS,CAAC,MAAM,CAAc,CAAC;4BAEjD,IAAI,CAAC,KAAK,EAAE,CAAC;gCACT,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC;gCAC3D,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAmB,oDAA0B,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;gCAExG,IAAI,MAAM,EAAE,CAAC;oCACT,IAAI,iBAAgD,CAAC;oCAErD,IAAI,IAAA,kDAAmB,EAAC,MAAM,CAAC,EAAE,CAAC;wCAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;wCAC9D,iBAAiB,GAAG,MAAM,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;oCAChE,CAAC;yCAAM,CAAC;wCACJ,iBAAiB,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,CAAC;oCAChD,CAAC;oCAED,IAAI,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,CAAC;wCACnC,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;oCACtE,CAAC;yCAAM,CAAC;wCACJ,KAAK,GAAG,iBAAiB,CAAC;oCAC9B,CAAC;gCACL,CAAC;4BACL,CAAC;4BAED,MAAM,UAAU,GAAG,IAAI,wBAAU,CAAC,SAAS,EAAE;gCACzC,IAAI,EAAE,KAAK,CAAC,IAAI;gCAChB,OAAO,EAAE,IAAI;gCACb,QAAQ,EAAE,MAAM;6BACnB,CAAC,CAAC;4BACH,KAAK,MAAM,IAAI,IAAI,UAAU,CAAC,UAAU,EAAE,EAAE,CAAC;gCACzC,MAAM,yBAAyB,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;gCAC9D,IAAI,QAAQ,GAAmB,EAAE,CAAC;gCAElC,IAAI,IAAA,kDAAmB,EAAC,yBAAyB,CAAC,EAAE,CAAC;oCACjD,MAAM,eAAe,GAAG,yBAAyB,CAAC;oCAClD,MAAM,OAAO,GAAkC,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,eAAe,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;oCAE5G,QAAQ,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gCAClD,CAAC;qCAAM,CAAC;oCACJ,QAAQ,GAAG,yBAAyB,CAAC;gCACzC,CAAC;gCAED,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC;oCAC7B,QAAQ;oCACR,KAAK;oCACL,UAAU,EAAE;wCACR,cAAc,EAAE,SAAS;wCACzB,cAAc,EAAE,MAAM;wCACtB,cAAc,EAAE,IAAI,CAAC,UAAU;wCAC/B,QAAQ,EAAE,SAAS,CAAC,EAAE;wCACtB,QAAQ,EAAE,IAAI,CAAC,YAAY,EAAE;qCAChC;iCACJ,CAAC,CAAC;4BACP,CAAC;wBACL,CAAC;oBACL,CAAC;oBAED,MAAM,IAAI,iBAAiB,CAAC;gBAChC,CAAC,QAAQ,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;YACpC,CAAC;YACD,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;YAEjC,8DAA8D;YAC9D,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAuB,CAAC;YACvE,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC;YAElD,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE,CAAC;gBAC5B,MAAM,cAAc,GAAG,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBACxD,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAqB,wDAA4B,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;gBACpH,IAAI,cAAc,EAAE,CAAC;oBACjB,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;oBAE5D,IAAI,IAAA,kDAAmB,EAAC,cAAc,CAAC,EAAE,CAAC;wBACtC,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,cAAc,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;wBAEtE,IAAI,OAAO,CAAC,kBAAkB,EAAE,CAAC;4BAC7B,MAAM,gBAAgB,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;;gCACtD,KAAkD,eAAA,oCAAA,cAAA,gBAAgB,CAAA,CAAA,sBAAA,0GAAE,CAAC;oCAAnB,gCAAgB;oCAAhB,WAAgB;oCAAvD,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAA,CAAA;oCAC1C,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;wCAC7B,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC;4CACnC,QAAQ,EAAE,MAAM,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC;4CAC/C,UAAU,EAAE;gDACR,cAAc,EAAE,MAAM,CAAC,IAAI;gDAC3B,cAAc,EAAE,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC;gDAC7C,QAAQ;6CACX;4CACD,KAAK;yCACR,CAAC,CAAC;oCACP,CAAC;gCACL,CAAC;;;;;;;;;wBACL,CAAC;6BAAM,CAAC;4BACJ,MAAM,IAAI,CAAC,iCAAiC,CAAC;gCACzC,UAAU;gCACV,cAAc,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC;gCAC1D,cAAc,EAAE,MAAM,CAAC,IAAI;gCAC3B,cAAc,EAAE,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC;6BAChD,CAAC,CAAC;wBACP,CAAC;oBACL,CAAC;yBAAM,CAAC;wBACJ,MAAM,IAAI,CAAC,iCAAiC,CAAC;4BACzC,UAAU;4BACV,cAAc;4BACd,cAAc,EAAE,MAAM,CAAC,IAAI;4BAC3B,cAAc,EAAE,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC;yBAChD,CAAC,CAAC;oBACP,CAAC;gBACL,CAAC;YACL,CAAC;YAED,mDAAmD;YACnD,MAAM,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,wBAAO,EAAE,EAAE,SAAS,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;QACtF,CAAC;KAAA;IAEa,iCAAiC;6DAAC,EAC5C,UAAU,EACV,cAAc,EACd,cAAc,EACd,cAAc,GAOjB;YACG,IAAI,IAAI,GAAG,EAAE,CAAC;YACd,MAAM,KAAK,GAAG,EAAE,CAAC;YACjB,IAAI,MAAM,GAAG,CAAC,CAAC;YACf,GAAG,CAAC;gBACA,IAAI,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;gBACpD,MAAM,IAAI,KAAK,CAAC;gBAEhB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;oBACrB,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC;wBACnC,QAAQ,EAAE,MAAM,cAAc,CAAC,GAAG,CAAC;wBACnC,UAAU,EAAE;4BACR,cAAc;4BACd,cAAc;4BACd,QAAQ,EAAE,GAAG,CAAC,cAAc,CAAC;yBAChC;wBACD,KAAK,EAAE,GAAG,CAAC,KAAK;qBACnB,CAAC,CAAC;gBACP,CAAC;YACL,CAAC,QAAQ,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;QAC9B,CAAC;KAAA;IAED,6EAA6E;IAC7E,sGAAsG;IAC9F,0BAA0B;QAC9B,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAA+B,CAAC;QAEnE,KAAK,MAAM,EACP,QAAQ,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,iBAAiB,EAAE,EAClE,KAAK,EACL,MAAM,GACT,IAAI,IAAI,CAAC,eAAe,CAAC,kBAAkB,EAAE,EAAE,CAAC;YAC7C,MAAM,GAAG,GAAG,GAAG,SAAS,IAAI,SAAS,EAAE,CAAC;YAExC,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;gBAChC,mBAAmB,CAAC,GAAG,CAAC,GAAG,EAAE;oBACzB,SAAS;oBACT,SAAS;oBACT,QAAQ,EAAE,OAAO,IAAI,iBAAiB;oBACtC,aAAa,EAAE,EAAE;oBACjB,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC;iBAC7B,CAAC,CAAC;YACP,CAAC;YAED,MAAM,cAAc,GAAG,mBAAmB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACpD,IAAI,cAAc,EAAE,CAAC;gBACjB,cAAc,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;YACzD,CAAC;QACL,CAAC;QAED,OAAO,mBAAmB,CAAC,MAAM,EAAE,CAAC;IACxC,CAAC;CACJ,CAAA;AAvNY,sDAAqB;AAaxB;IADL,IAAA,2BAAoB,GAAE;;;;gDA0ItB;gCAtJQ,qBAAqB;IALjC,IAAA,mBAAU,GAAE;IACZ,IAAA,wBAAO,EAAC;QACL,IAAI,EAAE,gBAAgB;QACtB,WAAW,EAAE,qBAAqB;KACrC,CAAC;qCAG4B,eAAQ;QACI,kCAAe;QACjB,0BAAa;QACZ,gCAAc;QAC5B,gBAAS;QACA,gBAAS;GAPhC,qBAAqB,CAuNjC"}
|
|
@@ -13,7 +13,5 @@ export declare class WarningEventSubscriber implements EventSubscriber {
|
|
|
13
13
|
afterUpdate(args: EventArgs<unknown>): Promise<void>;
|
|
14
14
|
afterCreate(args: EventArgs<unknown>): Promise<void>;
|
|
15
15
|
private handleUpdateAndCreate;
|
|
16
|
-
private isService;
|
|
17
|
-
private isBlockWarningService;
|
|
18
16
|
}
|
|
19
17
|
//# sourceMappingURL=warning-event-subscriber.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"warning-event-subscriber.d.ts","sourceRoot":"","sources":["../../src/warnings/warning-event-subscriber.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACzE,OAAO,EAAe,aAAa,EAAoB,QAAQ,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"warning-event-subscriber.d.ts","sourceRoot":"","sources":["../../src/warnings/warning-event-subscriber.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACzE,OAAO,EAAe,aAAa,EAAoB,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAE/F,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAWpD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,qBACa,sBAAuB,YAAW,eAAe;IAEtD,QAAQ,CAAC,aAAa,EAAE,aAAa;IACrC,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAJjB,aAAa,EAAE,aAAa,EACpB,GAAG,EAAE,QAAQ,EACb,cAAc,EAAE,cAAc,EACvC,SAAS,EAAE,SAAS,EACX,SAAS,EAAE,SAAS;IAKzC,qBAAqB,IAAI,UAAU,CAAC,OAAO,CAAC,EAAE;IAgBxC,WAAW,CAAC,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAIpD,WAAW,CAAC,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;YAK5C,qBAAqB;CAgGtC"}
|
|
@@ -21,11 +21,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
21
21
|
exports.WarningEventSubscriber = void 0;
|
|
22
22
|
const postgresql_1 = require("@mikro-orm/postgresql");
|
|
23
23
|
const common_1 = require("@nestjs/common");
|
|
24
|
-
const constants_1 = require("@nestjs/common/constants");
|
|
25
24
|
const core_1 = require("@nestjs/core");
|
|
26
25
|
const root_block_1 = require("../blocks/decorators/root-block");
|
|
27
26
|
const root_block_entity_1 = require("../blocks/decorators/root-block-entity");
|
|
28
27
|
const flat_blocks_1 = require("../blocks/flat-blocks/flat-blocks");
|
|
28
|
+
const is_injectable_service_helper_1 = require("../common/helper/is-injectable-service.helper");
|
|
29
29
|
const scoped_entity_decorator_1 = require("../user-permissions/decorators/scoped-entity.decorator");
|
|
30
30
|
const create_warnings_decorator_1 = require("./decorators/create-warnings.decorator");
|
|
31
31
|
const warning_service_1 = require("./warning.service");
|
|
@@ -71,8 +71,14 @@ let WarningEventSubscriber = class WarningEventSubscriber {
|
|
|
71
71
|
if (!scope) {
|
|
72
72
|
const scoped = this.reflector.getAllAndOverride(scoped_entity_decorator_1.SCOPED_ENTITY_METADATA_KEY, [entity]);
|
|
73
73
|
if (scoped) {
|
|
74
|
-
|
|
75
|
-
|
|
74
|
+
let scopedEntityScope;
|
|
75
|
+
if ((0, is_injectable_service_helper_1.isInjectableService)(scoped)) {
|
|
76
|
+
const service = this.moduleRef.get(scoped, { strict: false });
|
|
77
|
+
scopedEntityScope = yield service.getEntityScope(args.entity);
|
|
78
|
+
}
|
|
79
|
+
else {
|
|
80
|
+
scopedEntityScope = yield scoped(args.entity);
|
|
81
|
+
}
|
|
76
82
|
if (Array.isArray(scopedEntityScope)) {
|
|
77
83
|
throw new Error("Multiple scopes are not supported for warnings");
|
|
78
84
|
}
|
|
@@ -92,7 +98,7 @@ let WarningEventSubscriber = class WarningEventSubscriber {
|
|
|
92
98
|
const startDate = new Date();
|
|
93
99
|
const warningsOrWarningsService = yield node.block.warnings();
|
|
94
100
|
let warnings = [];
|
|
95
|
-
if (
|
|
101
|
+
if ((0, is_injectable_service_helper_1.isInjectableService)(warningsOrWarningsService)) {
|
|
96
102
|
const warningsService = warningsOrWarningsService;
|
|
97
103
|
const service = yield this.moduleRef.get(warningsService, { strict: false });
|
|
98
104
|
warnings = yield service.warnings(node.block);
|
|
@@ -120,7 +126,7 @@ let WarningEventSubscriber = class WarningEventSubscriber {
|
|
|
120
126
|
const repository = this.entityManager.getRepository(entity);
|
|
121
127
|
const row = yield repository.findOneOrFail(args.entity.id);
|
|
122
128
|
let warnings = [];
|
|
123
|
-
if (
|
|
129
|
+
if ((0, is_injectable_service_helper_1.isInjectableService)(createWarnings)) {
|
|
124
130
|
const service = this.moduleRef.get(createWarnings, { strict: false });
|
|
125
131
|
warnings = yield service.createWarnings(row);
|
|
126
132
|
}
|
|
@@ -143,13 +149,6 @@ let WarningEventSubscriber = class WarningEventSubscriber {
|
|
|
143
149
|
}
|
|
144
150
|
});
|
|
145
151
|
}
|
|
146
|
-
isService(meta) {
|
|
147
|
-
// Check if class has @Injectable() decorator -> if true it's a service class else it's a function
|
|
148
|
-
return Reflect.hasMetadata(constants_1.INJECTABLE_WATERMARK, meta);
|
|
149
|
-
}
|
|
150
|
-
isBlockWarningService(transformResponse) {
|
|
151
|
-
return Reflect.hasMetadata(constants_1.INJECTABLE_WATERMARK, transformResponse);
|
|
152
|
-
}
|
|
153
152
|
};
|
|
154
153
|
exports.WarningEventSubscriber = WarningEventSubscriber;
|
|
155
154
|
exports.WarningEventSubscriber = WarningEventSubscriber = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"warning-event-subscriber.js","sourceRoot":"","sources":["../../src/warnings/warning-event-subscriber.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AACA,sDAA+F;AAC/F,
|
|
1
|
+
{"version":3,"file":"warning-event-subscriber.js","sourceRoot":"","sources":["../../src/warnings/warning-event-subscriber.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@comet/cms-api",
|
|
3
|
-
"version": "9.0.0-canary-
|
|
3
|
+
"version": "9.0.0-canary-20251002064922",
|
|
4
4
|
"description": "Comet CMS API package",
|
|
5
5
|
"repository": {
|
|
6
6
|
"directory": "packages/api/cms-api",
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
"@aws-sdk/lib-storage": "^3.850.0",
|
|
21
21
|
"@azure-rest/ai-translation-text": "^1.0.1",
|
|
22
22
|
"@azure/storage-blob": "^12.27.0",
|
|
23
|
-
"@fast-csv/parse": "^
|
|
23
|
+
"@fast-csv/parse": "^5.0.0",
|
|
24
24
|
"@golevelup/nestjs-discovery": "^5.0.0",
|
|
25
25
|
"@hapi/accept": "^6.0.3",
|
|
26
26
|
"@nestjs/mapped-types": "^2.1.0",
|
|
@@ -93,14 +93,14 @@
|
|
|
93
93
|
"jest": "^29.7.0",
|
|
94
94
|
"jest-junit": "^16.0.0",
|
|
95
95
|
"nest-commander": "^3.17.0",
|
|
96
|
-
"npm-run-all2": "^
|
|
96
|
+
"npm-run-all2": "^8.0.0",
|
|
97
97
|
"prettier": "^3.6.2",
|
|
98
98
|
"reflect-metadata": "^0.2.2",
|
|
99
99
|
"rxjs": "^7.8.2",
|
|
100
100
|
"ts-jest": "^29.4.0",
|
|
101
101
|
"ts-node": "^10.9.2",
|
|
102
102
|
"typescript": "5.8.3",
|
|
103
|
-
"@comet/eslint-config": "9.0.0-canary-
|
|
103
|
+
"@comet/eslint-config": "9.0.0-canary-20251002064922"
|
|
104
104
|
},
|
|
105
105
|
"peerDependencies": {
|
|
106
106
|
"@kubernetes/client-node": "^1.0.0",
|