@comet/cms-api 9.0.0-beta.1 → 9.0.0-beta.3

package/lib/builds/builds.resolver.js

@@ -11,15 +11,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BuildsResolver = void 0;
 const common_1 = require("@nestjs/common");
@@ -42,32 +33,25 @@ let BuildsResolver = class BuildsResolver {
         this.buildsService = buildsService;
         this.accessControlService = accessControlService;
     }
-    createBuilds(user_1, _a) {
-        return __awaiter(this, arguments, void 0, function* (user, { names }) {
-            var _b, _c, _d;
-            const cronJobs = [];
-            for (const name of names) {
-                const cronJob = yield this.kubernetesService.getCronJob(name);
-                if (this.kubernetesService.helmRelease !== ((_c = (_b = cronJob.metadata) === null || _b === void 0 ? void 0 : _b.labels) === null || _c === void 0 ? void 0 : _c[kubernetes_constants_1.INSTANCE_LABEL])) {
-                    throw new Error("Triggering build from different instance is not allowed");
-                }
-                if (!this.accessControlService.isAllowed(user, "builds", (_d = this.kubernetesService.getContentScope(cronJob)) !== null && _d !== void 0 ? _d : {})) {
-                    throw new Error("Triggering build not allowed");
-                }
-                cronJobs.push(cronJob);
+    async createBuilds(user, { names }) {
+        const cronJobs = [];
+        for (const name of names) {
+            const cronJob = await this.kubernetesService.getCronJob(name);
+            if (this.kubernetesService.helmRelease !== cronJob.metadata?.labels?.[kubernetes_constants_1.INSTANCE_LABEL]) {
+                throw new Error("Triggering build from different instance is not allowed");
+            }
+            if (!this.accessControlService.isAllowed(user, "builds", this.kubernetesService.getContentScope(cronJob) ?? {})) {
+                throw new Error("Triggering build not allowed");
             }
-            return this.buildsService.createBuilds("manual", cronJobs);
-        });
+            cronJobs.push(cronJob);
+        }
+        return this.buildsService.createBuilds("manual", cronJobs);
     }
-    builds(user, limit) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.buildsService.getBuilds(user, { limit: limit });
-        });
+    async builds(user, limit) {
+        return this.buildsService.getBuilds(user, { limit: limit });
     }
-    autoBuildStatus(user) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.buildsService.getAutoBuildStatus(user);
-        });
+    async autoBuildStatus(user) {
+        return this.buildsService.getAutoBuildStatus(user);
     }
 };
 exports.BuildsResolver = BuildsResolver;

package/lib/builds/builds.resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"builds.resolver.js","sourceRoot":"","sources":["../../src/builds/builds.resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"builds.resolver.js","sourceRoot":"","sources":["../../src/builds/builds.resolver.ts"],"names":[],"mappings":"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"}

package/lib/builds/builds.service.js

@@ -11,15 +11,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -49,161 +40,134 @@ let BuildsService = BuildsService_1 = class BuildsService {
         this.entityManager = entityManager;
         this.logger = new common_1.Logger(BuildsService_1.name);
     }
-    getAllowedBuildJobs(user) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const allJobs = yield this.kubernetesService.getAllJobs(`${builds_constants_1.BUILDER_LABEL} = true, ${kubernetes_constants_1.INSTANCE_LABEL} = ${this.kubernetesService.helmRelease}`);
-            return allJobs.filter((job) => {
-                var _a;
-                return this.accessControlService.isAllowed(user, "builds", (_a = this.kubernetesService.getContentScope(job)) !== null && _a !== void 0 ? _a : {});
-            });
+    async getAllowedBuildJobs(user) {
+        const allJobs = await this.kubernetesService.getAllJobs(`${builds_constants_1.BUILDER_LABEL} = true, ${kubernetes_constants_1.INSTANCE_LABEL} = ${this.kubernetesService.helmRelease}`);
+        return allJobs.filter((job) => {
+            return this.accessControlService.isAllowed(user, "builds", this.kubernetesService.getContentScope(job) ?? {});
         });
     }
-    createBuilds(trigger, builderCronJobs) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d;
-            // No ACL here, because this is only used for clean-up
-            const builderJobs = yield this.kubernetesService.getAllJobs(`${builds_constants_1.BUILDER_LABEL} = true, ${kubernetes_constants_1.INSTANCE_LABEL} = ${this.kubernetesService.helmRelease}`);
-            if (builderJobs.length > JOB_HISTORY_LIMIT - builderCronJobs.length) {
-                // Deletes all jobs except JOB_HISTORY_LIMIT most recent
-                // This cleans Kubernetes as manually created jobs are not garbage collected by the CronJobController
-                for (const job of builderJobs.slice(JOB_HISTORY_LIMIT)) {
-                    const name = (_a = job.metadata) === null || _a === void 0 ? void 0 : _a.name;
-                    if (!name) {
-                        throw new Error(`Error deleting namespaced job: No name returned`);
-                    }
-                    yield this.kubernetesService.deleteJob(name);
+    async createBuilds(trigger, builderCronJobs) {
+        // No ACL here, because this is only used for clean-up
+        const builderJobs = await this.kubernetesService.getAllJobs(`${builds_constants_1.BUILDER_LABEL} = true, ${kubernetes_constants_1.INSTANCE_LABEL} = ${this.kubernetesService.helmRelease}`);
+        if (builderJobs.length > JOB_HISTORY_LIMIT - builderCronJobs.length) {
+            // Deletes all jobs except JOB_HISTORY_LIMIT most recent
+            // This cleans Kubernetes as manually created jobs are not garbage collected by the CronJobController
+            for (const job of builderJobs.slice(JOB_HISTORY_LIMIT)) {
+                const name = job.metadata?.name;
+                if (!name) {
+                    throw new Error(`Error deleting namespaced job: No name returned`);
                 }
+                await this.kubernetesService.deleteJob(name);
             }
-            for (const cronJob of builderCronJobs) {
-                const jobs = yield this.kubernetesService.getAllJobs(`${kubernetes_constants_1.PARENT_CRON_JOB_LABEL} = ${(_b = cronJob.metadata) === null || _b === void 0 ? void 0 : _b.name}`);
-                const mostRecentJob = jobs.shift();
-                if (mostRecentJob) {
-                    // check if another build is already running and skip if so, to prevent overwhelming the cluster
-                    const status = this.kubernetesService.getStatusForKubernetesJob(mostRecentJob);
-                    if (status === job_status_enum_1.KubernetesJobStatus.active || status === job_status_enum_1.KubernetesJobStatus.pending) {
-                        console.warn(`Job for ${(_c = cronJob.metadata) === null || _c === void 0 ? void 0 : _c.name} already running; skipping this run`);
-                        continue;
-                    }
+        }
+        for (const cronJob of builderCronJobs) {
+            const jobs = await this.kubernetesService.getAllJobs(`${kubernetes_constants_1.PARENT_CRON_JOB_LABEL} = ${cronJob.metadata?.name}`);
+            const mostRecentJob = jobs.shift();
+            if (mostRecentJob) {
+                // check if another build is already running and skip if so, to prevent overwhelming the cluster
+                const status = this.kubernetesService.getStatusForKubernetesJob(mostRecentJob);
+                if (status === job_status_enum_1.KubernetesJobStatus.active || status === job_status_enum_1.KubernetesJobStatus.pending) {
+                    console.warn(`Job for ${cronJob.metadata?.name} already running; skipping this run`);
+                    continue;
                 }
-                yield this.kubernetesService.createJobFromCronJob(cronJob, {
-                    name: `${(_d = cronJob.metadata) === null || _d === void 0 ? void 0 : _d.name}-${(0, date_fns_1.format)(new Date(), "yyyy-MM-dd-HH-mm-ss")}`,
-                    annotations: { [builds_constants_1.TRIGGER_ANNOTATION]: trigger },
-                });
             }
-            return true;
-        });
+            await this.kubernetesService.createJobFromCronJob(cronJob, {
+                name: `${cronJob.metadata?.name}-${(0, date_fns_1.format)(new Date(), "yyyy-MM-dd-HH-mm-ss")}`,
+                annotations: { [builds_constants_1.TRIGGER_ANNOTATION]: trigger },
+            });
+        }
+        return true;
     }
     /**
      * Should only be used internally
      */
-    createBuildsForAllScopes(trigger) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const builderCronJobs = yield this.kubernetesService.getAllCronJobs(`${builds_constants_1.BUILDER_LABEL} = true, ${kubernetes_constants_1.INSTANCE_LABEL} = ${this.kubernetesService.helmRelease}`);
-            return this.createBuilds(trigger, builderCronJobs);
-        });
+    async createBuildsForAllScopes(trigger) {
+        const builderCronJobs = await this.kubernetesService.getAllCronJobs(`${builds_constants_1.BUILDER_LABEL} = true, ${kubernetes_constants_1.INSTANCE_LABEL} = ${this.kubernetesService.helmRelease}`);
+        return this.createBuilds(trigger, builderCronJobs);
     }
-    getBuilds(user, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const buildJobs = yield this.getAllowedBuildJobs(user);
-            return Promise.all(buildJobs.slice(0, options === null || options === void 0 ? void 0 : options.limit).map((job) => __awaiter(this, void 0, void 0, function* () {
-                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-                return {
-                    id: (_a = job.metadata) === null || _a === void 0 ? void 0 : _a.uid, // uid can be null if the object is used for creating a Job, but not for reading
-                    name: (_b = job.metadata) === null || _b === void 0 ? void 0 : _b.name,
-                    status: this.kubernetesService.getStatusForKubernetesJob(job),
-                    startTime: (_c = job.status) === null || _c === void 0 ? void 0 : _c.startTime,
-                    completionTime: (_d = job.status) === null || _d === void 0 ? void 0 : _d.completionTime,
-                    estimatedCompletionTime: yield this.kubernetesService.estimateJobCompletionTime(job, `${kubernetes_constants_1.PARENT_CRON_JOB_LABEL} = ${(_f = (_e = job.metadata) === null || _e === void 0 ? void 0 : _e.labels) === null || _f === void 0 ? void 0 : _f[kubernetes_constants_1.PARENT_CRON_JOB_LABEL]}`),
-                    trigger: (_h = (_g = job.metadata) === null || _g === void 0 ? void 0 : _g.annotations) === null || _h === void 0 ? void 0 : _h[builds_constants_1.TRIGGER_ANNOTATION],
-                    label: (_k = (_j = job.metadata) === null || _j === void 0 ? void 0 : _j.annotations) === null || _k === void 0 ? void 0 : _k[kubernetes_constants_1.LABEL_ANNOTATION],
-                };
-            })));
-        });
+    async getBuilds(user, options) {
+        const buildJobs = await this.getAllowedBuildJobs(user);
+        return Promise.all(buildJobs.slice(0, options?.limit).map(async (job) => {
+            return {
+                id: job.metadata?.uid, // uid can be null if the object is used for creating a Job, but not for reading
+                name: job.metadata?.name,
+                status: this.kubernetesService.getStatusForKubernetesJob(job),
+                startTime: job.status?.startTime,
+                completionTime: job.status?.completionTime,
+                estimatedCompletionTime: await this.kubernetesService.estimateJobCompletionTime(job, `${kubernetes_constants_1.PARENT_CRON_JOB_LABEL} = ${job.metadata?.labels?.[kubernetes_constants_1.PARENT_CRON_JOB_LABEL]}`),
+                trigger: job.metadata?.annotations?.[builds_constants_1.TRIGGER_ANNOTATION],
+                label: job.metadata?.annotations?.[kubernetes_constants_1.LABEL_ANNOTATION],
+            };
+        }));
     }
-    getAutoBuildStatus(user) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            const autoBuildStatus = new auto_build_status_object_1.AutoBuildStatus();
-            autoBuildStatus.hasChangesSinceLastBuild = yield this.hasChangesSinceLastBuild();
-            const cronJobs = yield this.buildTemplatesService.getAllowedBuilderCronJobs(user);
-            const cronJob = cronJobs === null || cronJobs === void 0 ? void 0 : cronJobs[0];
-            if (!cronJob) {
-                throw new Error("BuildChecker CronJob not found.");
-            }
-            autoBuildStatus.lastCheck = (_a = cronJob.status) === null || _a === void 0 ? void 0 : _a.lastScheduleTime;
-            const interval = cron_parser_1.default.parseExpression((_b = cronJob.spec) === null || _b === void 0 ? void 0 : _b.schedule);
-            autoBuildStatus.nextCheck = interval.next().toDate();
-            return autoBuildStatus;
-        });
+    async getAutoBuildStatus(user) {
+        const autoBuildStatus = new auto_build_status_object_1.AutoBuildStatus();
+        autoBuildStatus.hasChangesSinceLastBuild = await this.hasChangesSinceLastBuild();
+        const cronJobs = await this.buildTemplatesService.getAllowedBuilderCronJobs(user);
+        const cronJob = cronJobs?.[0];
+        if (!cronJob) {
+            throw new Error("BuildChecker CronJob not found.");
+        }
+        autoBuildStatus.lastCheck = cronJob.status?.lastScheduleTime;
+        const interval = cron_parser_1.default.parseExpression(cronJob.spec?.schedule);
+        autoBuildStatus.nextCheck = interval.next().toDate();
+        return autoBuildStatus;
     }
-    setChangesSinceLastBuild() {
-        return __awaiter(this, arguments, void 0, function* (scope = "all") {
-            const isEmptyScope = scope !== "all" && Object.keys(scope).length === 0; // Caused by features with optional scoping, e.g. redirects
-            if (isEmptyScope) {
-                scope = "all";
-            }
-            if ((yield this.changesRepository.findOne({ scope })) === null) {
-                yield this.entityManager.persistAndFlush(this.changesRepository.create({ scope }));
-            }
-        });
+    async setChangesSinceLastBuild(scope = "all") {
+        const isEmptyScope = scope !== "all" && Object.keys(scope).length === 0; // Caused by features with optional scoping, e.g. redirects
+        if (isEmptyScope) {
+            scope = "all";
+        }
+        if ((await this.changesRepository.findOne({ scope })) === null) {
+            await this.entityManager.persistAndFlush(this.changesRepository.create({ scope }));
+        }
     }
-    hasChangesSinceLastBuild() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return (yield this.changesRepository.count()) > 0;
-        });
+    async hasChangesSinceLastBuild() {
+        return (await this.changesRepository.count()) > 0;
     }
-    deleteChangesSinceLastBuild() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.changesRepository.createQueryBuilder().truncate().execute();
-        });
+    async deleteChangesSinceLastBuild() {
+        await this.changesRepository.createQueryBuilder().truncate().execute();
     }
-    shouldRebuildAllScopes() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return (yield this.changesRepository.findOne({ scope: "all" })) !== null;
-        });
+    async shouldRebuildAllScopes() {
+        return (await this.changesRepository.findOne({ scope: "all" })) !== null;
     }
-    getScopesWithChanges() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return (yield this.changesRepository.find({ scope: { $ne: "all" } })).map((change) => change.scope);
-        });
+    async getScopesWithChanges() {
+        return (await this.changesRepository.find({ scope: { $ne: "all" } })).map((change) => change.scope);
     }
-    getBuilderCronJobsToStart(scopesWithChanges) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const builderCronJobs = yield this.buildTemplatesService.getAllBuilderCronJobs();
-            const getMatchingBuilderCronJobs = (scope) => {
-                var _a;
-                const partiallyMatchingCronJobs = [];
-                const exactlyMatchingCronJobs = [];
-                for (const cronJob of builderCronJobs) {
-                    const cronJobScope = this.kubernetesService.getContentScope(cronJob);
-                    if (!cronJobScope) {
-                        this.logger.warn(`CronJob ${(_a = cronJob.metadata) === null || _a === void 0 ? void 0 : _a.name} has no scope, skipping...`);
-                        continue;
-                    }
-                    // Exact match between job's scope and the scope with changes.
-                    if (Object.entries(cronJobScope).every(([key, value]) => scope[key] === value)) {
-                        exactlyMatchingCronJobs.push(cronJob);
-                    }
-                    // Check if scopes match partially. For instance, a job's scope may be { "domain": "main" }, but the change was in
-                    // { "domain": "main", "language": "en" }. Or the job's scope may be { "domain": "main", "language": "en" }, but the change
-                    // was in { "domain": "main" }. In both cases, the job should still be started.
-                    if (Object.entries(cronJobScope).some(([key, value]) => scope[key] === value)) {
-                        partiallyMatchingCronJobs.push(cronJob);
-                    }
+    async getBuilderCronJobsToStart(scopesWithChanges) {
+        const builderCronJobs = await this.buildTemplatesService.getAllBuilderCronJobs();
+        const getMatchingBuilderCronJobs = (scope) => {
+            const partiallyMatchingCronJobs = [];
+            const exactlyMatchingCronJobs = [];
+            for (const cronJob of builderCronJobs) {
+                const cronJobScope = this.kubernetesService.getContentScope(cronJob);
+                if (!cronJobScope) {
+                    this.logger.warn(`CronJob ${cronJob.metadata?.name} has no scope, skipping...`);
+                    continue;
                 }
-                if (exactlyMatchingCronJobs.length === 0 && partiallyMatchingCronJobs.length === 0) {
-                    throw new Error(`Found changes in scope ${JSON.stringify(scope)} but no matching builder cron job!`);
+                // Exact match between job's scope and the scope with changes.
+                if (Object.entries(cronJobScope).every(([key, value]) => scope[key] === value)) {
+                    exactlyMatchingCronJobs.push(cronJob);
                 }
-                return exactlyMatchingCronJobs.length > 0 ? exactlyMatchingCronJobs : partiallyMatchingCronJobs;
-            };
-            const uniqueMatchingCronJobs = new Set();
-            for (const scope of scopesWithChanges) {
-                for (const job of getMatchingBuilderCronJobs(scope)) {
-                    uniqueMatchingCronJobs.add(job);
+                // Check if scopes match partially. For instance, a job's scope may be { "domain": "main" }, but the change was in
+                // { "domain": "main", "language": "en" }. Or the job's scope may be { "domain": "main", "language": "en" }, but the change
+                // was in { "domain": "main" }. In both cases, the job should still be started.
+                if (Object.entries(cronJobScope).some(([key, value]) => scope[key] === value)) {
+                    partiallyMatchingCronJobs.push(cronJob);
                 }
             }
-            return Array.from(uniqueMatchingCronJobs);
-        });
+            if (exactlyMatchingCronJobs.length === 0 && partiallyMatchingCronJobs.length === 0) {
+                throw new Error(`Found changes in scope ${JSON.stringify(scope)} but no matching builder cron job!`);
+            }
+            return exactlyMatchingCronJobs.length > 0 ? exactlyMatchingCronJobs : partiallyMatchingCronJobs;
+        };
+        const uniqueMatchingCronJobs = new Set();
+        for (const scope of scopesWithChanges) {
+            for (const job of getMatchingBuilderCronJobs(scope)) {
+                uniqueMatchingCronJobs.add(job);
+            }
+        }
+        return Array.from(uniqueMatchingCronJobs);
     }
 };
 exports.BuildsService = BuildsService;

package/lib/builds/builds.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"builds.service.js","sourceRoot":"","sources":["../../src/builds/builds.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"builds.service.js","sourceRoot":"","sources":["../../src/builds/builds.service.ts"],"names":[],"mappings":"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"}

package/lib/builds/changes-checker.command.js

@@ -8,15 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var ChangesCheckerCommand_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChangesCheckerCommand = void 0;
@@ -32,28 +23,26 @@ let ChangesCheckerCommand = ChangesCheckerCommand_1 = class ChangesCheckerComman
         this.buildsService = buildsService;
         this.logger = new common_1.Logger(ChangesCheckerCommand_1.name);
     }
-    run() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.logger.log("Checking if changes since last build occurred...");
-            if (yield this.buildsService.hasChangesSinceLastBuild()) {
-                if (yield this.buildsService.shouldRebuildAllScopes()) {
-                    this.logger.log("Starting build(s) for all scopes...");
-                    yield this.buildsService.createBuildsForAllScopes("changesDetected");
-                }
-                else {
-                    const scopesWithChanges = yield this.buildsService.getScopesWithChanges();
-                    const builderCronJobsToStart = yield this.buildsService.getBuilderCronJobsToStart(scopesWithChanges);
-                    this.logger.log(`Starting build(s) for scopes: ${JSON.stringify(scopesWithChanges)}...`);
-                    yield this.buildsService.createBuilds("changesDetected", builderCronJobsToStart);
-                }
-                this.logger.log("Build(s) successfully started, resetting changesSinceLastBuild...");
-                yield this.buildsService.deleteChangesSinceLastBuild();
-                this.logger.log("Resetting changesSinceLastBuild successful!");
+    async run() {
+        this.logger.log("Checking if changes since last build occurred...");
+        if (await this.buildsService.hasChangesSinceLastBuild()) {
+            if (await this.buildsService.shouldRebuildAllScopes()) {
+                this.logger.log("Starting build(s) for all scopes...");
+                await this.buildsService.createBuildsForAllScopes("changesDetected");
             }
             else {
-                this.logger.log("No changes detected, skipping build...");
+                const scopesWithChanges = await this.buildsService.getScopesWithChanges();
+                const builderCronJobsToStart = await this.buildsService.getBuilderCronJobsToStart(scopesWithChanges);
+                this.logger.log(`Starting build(s) for scopes: ${JSON.stringify(scopesWithChanges)}...`);
+                await this.buildsService.createBuilds("changesDetected", builderCronJobsToStart);
             }
-        });
+            this.logger.log("Build(s) successfully started, resetting changesSinceLastBuild...");
+            await this.buildsService.deleteChangesSinceLastBuild();
+            this.logger.log("Resetting changesSinceLastBuild successful!");
+        }
+        else {
+            this.logger.log("No changes detected, skipping build...");
+        }
     }
 };
 exports.ChangesCheckerCommand = ChangesCheckerCommand;

package/lib/builds/changes-checker.command.js.map

@@ -1 +1 @@
-{"version":3,"file":"changes-checker.command.js","sourceRoot":"","sources":["../../src/builds/changes-checker.command.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,sDAAuE;AACvE,2CAAwC;AACxC,mDAAwD;AAExD,qDAAiD;AAM1C,IAAM,qBAAqB,6BAA3B,MAAM,qBAAsB,SAAQ,8BAAa;IAGpD,YACqB,GAAa,EAAE,yDAAyD;IACxE,aAA4B;QAE7C,KAAK,EAAE,CAAC;QAHS,QAAG,GAAH,GAAG,CAAU;QACb,kBAAa,GAAb,aAAa,CAAe;QAJhC,WAAM,GAAG,IAAI,eAAM,CAAC,uBAAqB,CAAC,IAAI,CAAC,CAAC;IAOjE,CAAC;IAGK,GAAG;;YACL,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,kDAAkD,CAAC,CAAC;YAEpE,IAAI,MAAM,IAAI,CAAC,aAAa,CAAC,wBAAwB,EAAE,EAAE,CAAC;gBACtD,IAAI,MAAM,IAAI,CAAC,aAAa,CAAC,sBAAsB,EAAE,EAAE,CAAC;oBACpD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;oBACvD,MAAM,IAAI,CAAC,aAAa,CAAC,wBAAwB,CAAC,iBAAiB,CAAC,CAAC;gBACzE,CAAC;qBAAM,CAAC;oBACJ,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,oBAAoB,EAAE,CAAC;oBAC1E,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,yBAAyB,CAAC,iBAAiB,CAAC,CAAC;oBAErG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,iCAAiC,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;oBACzF,MAAM,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,iBAAiB,EAAE,sBAAsB,CAAC,CAAC;gBACrF,CAAC;gBAED,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,mEAAmE,CAAC,CAAC;gBACrF,MAAM,IAAI,CAAC,aAAa,CAAC,2BAA2B,EAAE,CAAC;gBACvD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,6CAA6C,CAAC,CAAC;YACnE,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC;YAC9D,CAAC;QACL,CAAC;KAAA;CACJ,CAAA;AAjCY,sDAAqB;AAWxB;IADL,IAAA,iCAAoB,GAAE;;;;gDAsBtB;gCAhCQ,qBAAqB;IAJjC,IAAA,wBAAO,EAAC;QACL,IAAI,EAAE,eAAe;QACrB,WAAW,EAAE,4EAA4E;KAC5F,CAAC;qCAK4B,qBAAQ;QACE,8BAAa;GALxC,qBAAqB,CAiCjC"}
+{"version":3,"file":"changes-checker.command.js","sourceRoot":"","sources":["../../src/builds/changes-checker.command.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,sDAAuE;AACvE,2CAAwC;AACxC,mDAAwD;AAExD,qDAAiD;AAM1C,IAAM,qBAAqB,6BAA3B,MAAM,qBAAsB,SAAQ,8BAAa;IAGpD,YACqB,GAAa,EAAE,yDAAyD;IACxE,aAA4B;QAE7C,KAAK,EAAE,CAAC;QAHS,QAAG,GAAH,GAAG,CAAU;QACb,kBAAa,GAAb,aAAa,CAAe;QAJhC,WAAM,GAAG,IAAI,eAAM,CAAC,uBAAqB,CAAC,IAAI,CAAC,CAAC;IAOjE,CAAC;IAGK,AAAN,KAAK,CAAC,GAAG;QACL,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,kDAAkD,CAAC,CAAC;QAEpE,IAAI,MAAM,IAAI,CAAC,aAAa,CAAC,wBAAwB,EAAE,EAAE,CAAC;YACtD,IAAI,MAAM,IAAI,CAAC,aAAa,CAAC,sBAAsB,EAAE,EAAE,CAAC;gBACpD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;gBACvD,MAAM,IAAI,CAAC,aAAa,CAAC,wBAAwB,CAAC,iBAAiB,CAAC,CAAC;YACzE,CAAC;iBAAM,CAAC;gBACJ,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,oBAAoB,EAAE,CAAC;gBAC1E,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,yBAAyB,CAAC,iBAAiB,CAAC,CAAC;gBAErG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,iCAAiC,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;gBACzF,MAAM,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,iBAAiB,EAAE,sBAAsB,CAAC,CAAC;YACrF,CAAC;YAED,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,mEAAmE,CAAC,CAAC;YACrF,MAAM,IAAI,CAAC,aAAa,CAAC,2BAA2B,EAAE,CAAC;YACvD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,6CAA6C,CAAC,CAAC;QACnE,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC;QAC9D,CAAC;IACL,CAAC;CACJ,CAAA;AAjCY,sDAAqB;AAWxB;IADL,IAAA,iCAAoB,GAAE;;;;gDAsBtB;gCAhCQ,qBAAqB;IAJjC,IAAA,wBAAO,EAAC;QACL,IAAI,EAAE,eAAe;QACrB,WAAW,EAAE,4EAA4E;KAC5F,CAAC;qCAK4B,qBAAQ;QACE,8BAAa;GALxC,qBAAqB,CAiCjC"}

package/lib/builds/changes-checker.interceptor.js

@@ -8,15 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChangesCheckerInterceptor = void 0;
 const common_1 = require("@nestjs/common");
@@ -32,39 +23,26 @@ let ChangesCheckerInterceptor = class ChangesCheckerInterceptor {
         this.contentScopeService = contentScopeService;
     }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    intercept(context, next) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (context.getType().toString() === "graphql") {
-                const gqlContext = graphql_1.GqlExecutionContext.create(context);
-                const { operation, parentType } = gqlContext.getInfo();
-                if (parentType.name === "Mutation") {
-                    const skipBuild = this.reflector.get(skip_build_decorator_1.SKIP_BUILD_METADATA_KEY, context.getHandler()) ||
-                        this.reflector.get(skip_build_decorator_1.SKIP_BUILD_METADATA_KEY, context.getClass());
-                    if (!skipBuild) {
-                        let scopes;
-                        try {
-                            scopes = yield this.contentScopeService.inferScopesFromExecutionContext(context);
-                        }
-                        catch (_a) {
-                            // We might land here when an @AffectedEntity does not have a @ScopedEntity decorator
-                            // (this was formerly ignored but now throws an error because it's essential for the scope check)
-                            scopes = null;
-                        }
-                        if (scopes) {
-                            for (const scope of scopes) {
-                                if (process.env.NODE_ENV === "development" && this.changeAffectsAllScopes(scope)) {
-                                    if (operation.name) {
-                                        console.warn(`Mutation "${operation.name.value}" affects all scopes. Are you sure this is correct?`);
-                                    }
-                                    else {
-                                        console.warn(`Unknown mutation affects all scopes. Are you sure this is correct?`);
-                                    }
-                                }
-                                yield this.buildsService.setChangesSinceLastBuild(scope);
-                            }
-                        }
-                        else {
-                            if (process.env.NODE_ENV === "development") {
+    async intercept(context, next) {
+        if (context.getType().toString() === "graphql") {
+            const gqlContext = graphql_1.GqlExecutionContext.create(context);
+            const { operation, parentType } = gqlContext.getInfo();
+            if (parentType.name === "Mutation") {
+                const skipBuild = this.reflector.get(skip_build_decorator_1.SKIP_BUILD_METADATA_KEY, context.getHandler()) ||
+                    this.reflector.get(skip_build_decorator_1.SKIP_BUILD_METADATA_KEY, context.getClass());
+                if (!skipBuild) {
+                    let scopes;
+                    try {
+                        scopes = await this.contentScopeService.inferScopesFromExecutionContext(context);
+                    }
+                    catch {
+                        // We might land here when an @AffectedEntity does not have a @ScopedEntity decorator
+                        // (this was formerly ignored but now throws an error because it's essential for the scope check)
+                        scopes = null;
+                    }
+                    if (scopes) {
+                        for (const scope of scopes) {
+                            if (process.env.NODE_ENV === "development" && this.changeAffectsAllScopes(scope)) {
                                 if (operation.name) {
                                     console.warn(`Mutation "${operation.name.value}" affects all scopes. Are you sure this is correct?`);
                                 }
@@ -72,13 +50,24 @@ let ChangesCheckerInterceptor = class ChangesCheckerInterceptor {
                                     console.warn(`Unknown mutation affects all scopes. Are you sure this is correct?`);
                                 }
                             }
-                            yield this.buildsService.setChangesSinceLastBuild("all");
+                            await this.buildsService.setChangesSinceLastBuild(scope);
+                        }
+                    }
+                    else {
+                        if (process.env.NODE_ENV === "development") {
+                            if (operation.name) {
+                                console.warn(`Mutation "${operation.name.value}" affects all scopes. Are you sure this is correct?`);
+                            }
+                            else {
+                                console.warn(`Unknown mutation affects all scopes. Are you sure this is correct?`);
+                            }
                         }
+                        await this.buildsService.setChangesSinceLastBuild("all");
                     }
                 }
             }
-            return next.handle();
-        });
+        }
+        return next.handle();
     }
     changeAffectsAllScopes(scope) {
         return !scope || Object.keys(scope).length === 0; // Caused by features with optional scoping, e.g. redirects

package/lib/builds/changes-checker.interceptor.js.map

@@ -1 +1 @@
-{"version":3,"file":"changes-checker.interceptor.js","sourceRoot":"","sources":["../../src/builds/changes-checker.interceptor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"changes-checker.interceptor.js","sourceRoot":"","sources":["../../src/builds/changes-checker.interceptor.ts"],"names":[],"mappings":"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"}