npm - @catladder/cli - Versions diffs - 0.0.0-main-2f2f483e → 0.0.0-main-b38c122b - Mend

@catladder/cli 0.0.0-main-2f2f483e → 0.0.0-main-b38c122b

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (38) hide show

package/dist/bundles/catenv/index.js CHANGED Viewed

@@ -1057,7 +1057,7 @@ const lodash_1 = __nccwpck_require__(3255);
 const __1 = __nccwpck_require__(603);
 const utils_1 = __nccwpck_require__(2497);
 const createBuildJobArtifact_1 = __nccwpck_require__(8774);
-const createJobCache_1 = __nccwpck_require__(4372);
+const createJobCache_1 = __nccwpck_require__(340);
 const yarn_1 = __nccwpck_require__(5043);
 const constants_1 = __nccwpck_require__(2786);
 const writeBuildInfo_1 = __nccwpck_require__(9578);
@@ -1296,7 +1296,7 @@ exports.componentContextNeedsBuildTimeDotEnv = componentContextNeedsBuildTimeDot
 /***/ }),
-/***/ 4372:
+/***/ 340:
 /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
 "use strict";
@@ -1352,8 +1352,8 @@ const createJobCacheFromCacheConfigs = (context, caches) => {
 };
 exports.createJobCacheFromCacheConfigs = createJobCacheFromCacheConfigs;
 /** shortcut, used in some build types */
-const createJobCacheFromConfig = (context, buildConfig) => {
-    return (0, exports.createJobCacheFromCacheConfigs)(context, (0, getAllCacheConfigsFromConfig_1.getAllCacheConfigsFromConfig)(context, buildConfig));
+const createJobCacheFromConfig = (context, configWithCache) => {
+    return (0, exports.createJobCacheFromCacheConfigs)(context, (0, getAllCacheConfigsFromConfig_1.getAllCacheConfigsFromConfig)(context, configWithCache));
 };
 exports.createJobCacheFromConfig = createJobCacheFromConfig;
 //# sourceMappingURL=createJobCache.js.map
@@ -1369,15 +1369,12 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.getAllCacheConfigsFromConfig = void 0;
 const index_1 = __nccwpck_require__(2497);
 const transformLegacyJobCache_1 = __nccwpck_require__(6673);
-const getAllCacheConfigsFromConfig = (context, buildConfig) => {
+const getAllCacheConfigsFromConfig = (context, configWithCache) => {
     return [
-        ...("jobCache" in buildConfig
-            ? (0, transformLegacyJobCache_1.transformLegacyJobCache)(buildConfig.jobCache)
+        ...("jobCache" in configWithCache
+            ? (0, transformLegacyJobCache_1.transformLegacyJobCache)(configWithCache.jobCache)
             : []),
-        ...(0, index_1.ensureArray)(buildConfig.cache).map((c) => ({
-            ...c,
-            context,
-        })),
+        ...(0, index_1.ensureArray)(configWithCache.cache),
         ...(context.type === "workspace"
             ? // also add cache configs of the components of that workspace
                 context.components.flatMap((componentContext) => {
@@ -1476,7 +1473,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.createCustomTestJobs = void 0;
 const utils_1 = __nccwpck_require__(2497);
 const createArtifactsConfig_1 = __nccwpck_require__(2820);
-const createJobCache_1 = __nccwpck_require__(4372);
+const createJobCache_1 = __nccwpck_require__(340);
 const types_1 = __nccwpck_require__(4466);
 const RUNNER_CUSTOM_TEST_VARIABLES = {
     KUBERNETES_CPU_REQUEST: "0.45",
@@ -1561,7 +1558,7 @@ const artifactsRegistry_1 = __nccwpck_require__(4963);
 const gcloudServiceAccountLoginCommands_1 = __nccwpck_require__(6320);
 const runner_1 = __nccwpck_require__(4058);
 const gitlab_1 = __nccwpck_require__(8490);
-const createJobCache_1 = __nccwpck_require__(4372);
+const createJobCache_1 = __nccwpck_require__(340);
 const DOCKER_BUILD_RUNNER_REQUESTS = {
     KUBERNETES_CPU_REQUEST: "0.45",
     KUBERNETES_MEMORY_REQUEST: "1Gi",
@@ -2070,7 +2067,7 @@ const createArtifactsConfig_1 = __nccwpck_require__(2820);
 const cache_1 = __nccwpck_require__(2026);
 const constants_1 = __nccwpck_require__(1765);
 const yarn_1 = __nccwpck_require__(5043);
-const createJobCache_1 = __nccwpck_require__(4372);
+const createJobCache_1 = __nccwpck_require__(340);
 const createNodeTestJobs = (context) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
     // don't run tests after release
@@ -3306,6 +3303,7 @@ exports.BASE_RETRY = {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.createDeployJob = exports.DEPLOY_JOB_NAME = void 0;
+const createJobCache_1 = __nccwpck_require__(340);
 const docker_1 = __nccwpck_require__(9641);
 const sbom_1 = __nccwpck_require__(7038);
 const context_1 = __nccwpck_require__(1724);
@@ -3337,7 +3335,9 @@ const createDeployJob = (context, jobDefinition) => {
         name: exports.DEPLOY_JOB_NAME,
         script: jobDefinition.script,
         image: jobDefinition.image,
-        cache: jobDefinition.cache,
+        cache: jobDefinition.cache
+            ? (0, createJobCache_1.createJobCacheFromCacheConfigs)(context, jobDefinition.cache)
+            : undefined,
         artifacts: jobDefinition.artifacts,
         services: jobDefinition.services,
         envMode: "stagePerEnv", // makes it easier to run manual tasks er env
@@ -4482,13 +4482,14 @@ exports.getFullDbName = getFullDbName;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.createCustomDeployJobs = void 0;
+const getAllCacheConfigsFromConfig_1 = __nccwpck_require__(673);
 const yarn_1 = __nccwpck_require__(5043);
 const runner_1 = __nccwpck_require__(4058);
 const base_1 = __nccwpck_require__(2024);
 const sbom_1 = __nccwpck_require__(4986);
 const types_1 = __nccwpck_require__(5781);
 const createCustomDeployJobs = (context) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     const deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
     if (!(0, types_1.isOfDeployType)(deployConfig, "custom")) {
         // should not happen
@@ -4498,10 +4499,10 @@ const createCustomDeployJobs = (context) => {
     const yarnInstall = (0, yarn_1.getYarnInstall)(context, {
         noCustomPostInstall: true,
     });
-    return (0, base_1.createDeployementJobs)(context, {
+    const result = (0, base_1.createDeployementJobs)(context, {
         deploy: {
             image: (_b = deployConfig.jobImage) !== null && _b !== void 0 ? _b : (0, runner_1.getRunnerImage)("jobs-default"),
-            cache: (_c = deployConfig.jobCache) !== null && _c !== void 0 ? _c : [],
+            cache: (0, getAllCacheConfigsFromConfig_1.getAllCacheConfigsFromConfig)(context, deployConfig),
             script: [
                 `cd ${context.build.dir}`,
                 ...(deployConfig.requiresYarnInstall ? yarnInstall : []),
@@ -4512,7 +4513,7 @@ const createCustomDeployJobs = (context) => {
         },
         stop: deployConfig.stopScript
             ? {
-                image: (_d = deployConfig.jobImage) !== null && _d !== void 0 ? _d : (0, runner_1.getRunnerImage)("jobs-default"),
+                image: (_c = deployConfig.jobImage) !== null && _c !== void 0 ? _c : (0, runner_1.getRunnerImage)("jobs-default"),
                 script: [
                     ...deployConfig.stopScript,
                     ...(0, sbom_1.getDependencyTrackDeleteScript)(context),
@@ -4521,6 +4522,7 @@ const createCustomDeployJobs = (context) => {
             }
             : undefined,
     });
+    return result;
 };
 exports.createCustomDeployJobs = createCustomDeployJobs;
 //# sourceMappingURL=deployJob.js.map
@@ -42747,7 +42749,7 @@ var Scalar = __nccwpck_require__(9387);
 var YAMLMap = __nccwpck_require__(1030);
 var YAMLSeq = __nccwpck_require__(1936);
 var cst = __nccwpck_require__(8164);
-var lexer = __nccwpck_require__(340);
+var lexer = __nccwpck_require__(2269);
 var lineCounter = __nccwpck_require__(4211);
 var parser = __nccwpck_require__(4639);
 var publicApi = __nccwpck_require__(3019);
@@ -44240,7 +44242,7 @@ exports.tokenType = tokenType;
 /***/ }),
-/***/ 340:
+/***/ 2269:
 /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
 "use strict";
@@ -45027,7 +45029,7 @@ exports.LineCounter = LineCounter;
 var cst = __nccwpck_require__(8164);
-var lexer = __nccwpck_require__(340);
+var lexer = __nccwpck_require__(2269);
 function includesToken(list, type) {
     for (let i = 0; i < list.length; ++i)

package/dist/bundles/cli/index.js CHANGED Viewed

@@ -4520,8 +4520,8 @@ const createJobCacheFromCacheConfigs = (context, caches) => {
 };
 exports.createJobCacheFromCacheConfigs = createJobCacheFromCacheConfigs;
 /** shortcut, used in some build types */
-const createJobCacheFromConfig = (context, buildConfig) => {
-    return (0, exports.createJobCacheFromCacheConfigs)(context, (0, getAllCacheConfigsFromConfig_1.getAllCacheConfigsFromConfig)(context, buildConfig));
+const createJobCacheFromConfig = (context, configWithCache) => {
+    return (0, exports.createJobCacheFromCacheConfigs)(context, (0, getAllCacheConfigsFromConfig_1.getAllCacheConfigsFromConfig)(context, configWithCache));
 };
 exports.createJobCacheFromConfig = createJobCacheFromConfig;
 //# sourceMappingURL=createJobCache.js.map
@@ -4537,15 +4537,12 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.getAllCacheConfigsFromConfig = void 0;
 const index_1 = __nccwpck_require__(32497);
 const transformLegacyJobCache_1 = __nccwpck_require__(96673);
-const getAllCacheConfigsFromConfig = (context, buildConfig) => {
+const getAllCacheConfigsFromConfig = (context, configWithCache) => {
     return [
-        ...("jobCache" in buildConfig
-            ? (0, transformLegacyJobCache_1.transformLegacyJobCache)(buildConfig.jobCache)
+        ...("jobCache" in configWithCache
+            ? (0, transformLegacyJobCache_1.transformLegacyJobCache)(configWithCache.jobCache)
             : []),
-        ...(0, index_1.ensureArray)(buildConfig.cache).map((c) => ({
-            ...c,
-            context,
-        })),
+        ...(0, index_1.ensureArray)(configWithCache.cache),
         ...(context.type === "workspace"
             ? // also add cache configs of the components of that workspace
                 context.components.flatMap((componentContext) => {
@@ -6474,6 +6471,7 @@ exports.BASE_RETRY = {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.createDeployJob = exports.DEPLOY_JOB_NAME = void 0;
+const createJobCache_1 = __nccwpck_require__(10340);
 const docker_1 = __nccwpck_require__(9641);
 const sbom_1 = __nccwpck_require__(37038);
 const context_1 = __nccwpck_require__(61724);
@@ -6505,7 +6503,9 @@ const createDeployJob = (context, jobDefinition) => {
         name: exports.DEPLOY_JOB_NAME,
         script: jobDefinition.script,
         image: jobDefinition.image,
-        cache: jobDefinition.cache,
+        cache: jobDefinition.cache
+            ? (0, createJobCache_1.createJobCacheFromCacheConfigs)(context, jobDefinition.cache)
+            : undefined,
         artifacts: jobDefinition.artifacts,
         services: jobDefinition.services,
         envMode: "stagePerEnv", // makes it easier to run manual tasks er env
@@ -7650,13 +7650,14 @@ exports.getFullDbName = getFullDbName;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.createCustomDeployJobs = void 0;
+const getAllCacheConfigsFromConfig_1 = __nccwpck_require__(30673);
 const yarn_1 = __nccwpck_require__(45043);
 const runner_1 = __nccwpck_require__(4058);
 const base_1 = __nccwpck_require__(84052);
 const sbom_1 = __nccwpck_require__(44986);
 const types_1 = __nccwpck_require__(75781);
 const createCustomDeployJobs = (context) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     const deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
     if (!(0, types_1.isOfDeployType)(deployConfig, "custom")) {
         // should not happen
@@ -7666,10 +7667,10 @@ const createCustomDeployJobs = (context) => {
     const yarnInstall = (0, yarn_1.getYarnInstall)(context, {
         noCustomPostInstall: true,
     });
-    return (0, base_1.createDeployementJobs)(context, {
+    const result = (0, base_1.createDeployementJobs)(context, {
         deploy: {
             image: (_b = deployConfig.jobImage) !== null && _b !== void 0 ? _b : (0, runner_1.getRunnerImage)("jobs-default"),
-            cache: (_c = deployConfig.jobCache) !== null && _c !== void 0 ? _c : [],
+            cache: (0, getAllCacheConfigsFromConfig_1.getAllCacheConfigsFromConfig)(context, deployConfig),
             script: [
                 `cd ${context.build.dir}`,
                 ...(deployConfig.requiresYarnInstall ? yarnInstall : []),
@@ -7680,7 +7681,7 @@ const createCustomDeployJobs = (context) => {
         },
         stop: deployConfig.stopScript
             ? {
-                image: (_d = deployConfig.jobImage) !== null && _d !== void 0 ? _d : (0, runner_1.getRunnerImage)("jobs-default"),
+                image: (_c = deployConfig.jobImage) !== null && _c !== void 0 ? _c : (0, runner_1.getRunnerImage)("jobs-default"),
                 script: [
                     ...deployConfig.stopScript,
                     ...(0, sbom_1.getDependencyTrackDeleteScript)(context),
@@ -7689,6 +7690,7 @@ const createCustomDeployJobs = (context) => {
             }
             : undefined,
     });
+    return result;
 };
 exports.createCustomDeployJobs = createCustomDeployJobs;
 //# sourceMappingURL=deployJob.js.map

package/dist/pipeline/src/build/base/createAppBuildJob.d.ts CHANGED Viewed

@@ -1,5 +1,4 @@
 import type { BuildContextStandalone, ComponentContext, WorkspaceContext } from "../..";
-import type { JobDefintion } from "../../types/jobDefinition";
+import type { AppBuildJobDefinition } from "../../types/jobDefinition";
 import type { CatladderJob } from "../../types/jobs";
-export type AppBuildJobDefinition = JobDefintion;
 export declare const createAppBuildJob: (context: ComponentContext<BuildContextStandalone> | WorkspaceContext, { script, variables, runnerVariables, cache, ...def }: AppBuildJobDefinition) => CatladderJob;

package/dist/pipeline/src/build/base/createAppBuildJob.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"createAppBuildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/base/createAppBuildJob.ts"],"names":[],"mappings":";;;AAAA,mCAA+B;AAM/B,6BAAuC;AAGvC,uCAA0C;AAC1C,gFAA8E;AAC9E,4DAAyE;AACzE,uCAAiD;AACjD,2CAGqB;AACrB,qDAAkD;AAClD,+CAGuB;~~AAGhB~~,MAAM,iBAAiB,GAAG,CAC/B,OAAoE,EACpE,EAAE,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,KAAK,EAAE,GAAG,GAAG,EAAyB,EAC9D,EAAE;;IAChB,OAAO,IAAA,cAAK,EACV;QACE,IAAI,EAAE,8BAAkB;QACxB,OAAO,EAAE,WAAW;QACpB,KAAK,EAAE,OAAO;QACd,KAAK,EAAE,IAAA,kBAAc,EAAC,cAAc,CAAC;QACrC,KAAK,EAAE,EAAE;QACT,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,IAAA,+CAA8B,EAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;QACzE,SAAS,EAAE;YACT,GAAG,CAAC,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE,CAAC;YACpB,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;gBAC9B,CAAC,CAAC;oBACE,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO;oBAC9B,GAAG,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO;oBAChD,GAAG,CAAC,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,mCAAI,EAAE,CAAC;iBAC1C;gBACH,CAAC,CAAC,EAAE,CAAC;SACR;QACD,eAAe,EAAE;YACf,GAAG,2CAA+B;YAClC,GAAG,CAAC,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,EAAE,CAAC;YAC1B,GAAG,CAAC,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,eAAe,mCAAI,EAAE,CAAC;SAChD;QAED,MAAM,EAAE;YACN,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;gBAC9B,CAAC,CAAC,IAAA,kDAAoC,EAAC,OAAO,CAAC;oBAC7C,CAAC,CAAC,IAAA,yBAAW,EAAC,OAAO,CAAC;oBACtB,CAAC,CAAC,EAAE;gBACN,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;oBAC5B,CAAC,CAAC,OAAO,CAAC,UAAU;yBACf,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,kDAAoC,EAAC,CAAC,CAAC,CAAC;yBACtD,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,yBAAW,EAAC,CAAC,CAAC,CAAC;oBACnC,CAAC,CAAC,EAAE,CAAC;YACT,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,IAAA,+BAAc,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAChE,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,EAAE,wEAAwE;YACvG,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE;YACzB,GAAG,IAAA,mBAAW,EAAC,MAAM,CAAC;SACvB;QACD,SAAS,EAAE,IAAA,gDAAuB,EAAC,OAAO,CAAC;KAC5C,EACD,GAAG,CACJ,CAAC;AACJ,CAAC,CAAC;AA/CW,QAAA,iBAAiB,qBA+C5B"}
1	+ {"version":3,"file":"createAppBuildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/base/createAppBuildJob.ts"],"names":[],"mappings":";;;AAAA,mCAA+B;AAM/B,6BAAuC;AAGvC,uCAA0C;AAC1C,gFAA8E;AAC9E,4DAAyE;AACzE,uCAAiD;AACjD,2CAGqB;AACrB,qDAAkD;AAClD,+CAGuB;AAEhB,MAAM,iBAAiB,GAAG,CAC/B,OAAoE,EACpE,EAAE,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,KAAK,EAAE,GAAG,GAAG,EAAyB,EAC9D,EAAE;;IAChB,OAAO,IAAA,cAAK,EACV;QACE,IAAI,EAAE,8BAAkB;QACxB,OAAO,EAAE,WAAW;QACpB,KAAK,EAAE,OAAO;QACd,KAAK,EAAE,IAAA,kBAAc,EAAC,cAAc,CAAC;QACrC,KAAK,EAAE,EAAE;QACT,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,IAAA,+CAA8B,EAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;QACzE,SAAS,EAAE;YACT,GAAG,CAAC,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE,CAAC;YACpB,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;gBAC9B,CAAC,CAAC;oBACE,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO;oBAC9B,GAAG,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO;oBAChD,GAAG,CAAC,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,mCAAI,EAAE,CAAC;iBAC1C;gBACH,CAAC,CAAC,EAAE,CAAC;SACR;QACD,eAAe,EAAE;YACf,GAAG,2CAA+B;YAClC,GAAG,CAAC,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,EAAE,CAAC;YAC1B,GAAG,CAAC,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,eAAe,mCAAI,EAAE,CAAC;SAChD;QAED,MAAM,EAAE;YACN,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;gBAC9B,CAAC,CAAC,IAAA,kDAAoC,EAAC,OAAO,CAAC;oBAC7C,CAAC,CAAC,IAAA,yBAAW,EAAC,OAAO,CAAC;oBACtB,CAAC,CAAC,EAAE;gBACN,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;oBAC5B,CAAC,CAAC,OAAO,CAAC,UAAU;yBACf,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,kDAAoC,EAAC,CAAC,CAAC,CAAC;yBACtD,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,yBAAW,EAAC,CAAC,CAAC,CAAC;oBACnC,CAAC,CAAC,EAAE,CAAC;YACT,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,IAAA,+BAAc,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAChE,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,EAAE,wEAAwE;YACvG,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE;YACzB,GAAG,IAAA,mBAAW,EAAC,MAAM,CAAC;SACvB;QACD,SAAS,EAAE,IAAA,gDAAuB,EAAC,OAAO,CAAC;KAC5C,EACD,GAAG,CACJ,CAAC;AACJ,CAAC,CAAC;AA/CW,QAAA,iBAAiB,qBA+C5B"}

package/dist/pipeline/src/build/base/createBuildJobDefinition.d.ts CHANGED Viewed

@@ -1,7 +1,6 @@
 import type { BuildConfigStandalone, WorkspaceBuildConfig } from "..";
-import type { Context } from "../../types";
-import type { JobDefintion } from "../../types/jobDefinition";
-export declare const createBuildJobDefinition: (context: Context, buildConfig: BuildConfigStandalone | WorkspaceBuildConfig, customize?: Pick<JobDefintion, "cache"> & {
+import type { AppBuildJobDefinition, Context } from "../../types";
+export declare const createBuildJobDefinition: (context: Context, buildConfig: BuildConfigStandalone | WorkspaceBuildConfig, customize?: Pick<AppBuildJobDefinition, "cache"> & {
     prescript?: string[];
     postscript?: string[];
-}) => JobDefintion | undefined;
+}) => AppBuildJobDefinition | undefined;

package/dist/pipeline/src/build/base/createBuildJobDefinition.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"createBuildJobDefinition.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/base/createBuildJobDefinition.ts"],"names":[],"mappings":";;;AACA,yCAA8C;~~AAG9C~~,uCAA0C;AAC1C,wFAAqF;AACrF,iDAAgE;AAEzD,MAAM,wBAAwB,GAAG,CACtC,OAAgB,EAChB,WAAyD,EACzD,YAGI,EAAE,~~EACoB~~,EAAE;;~~IAC5B~~,IAAI,WAAW,CAAC,YAAY,KAAK,IAAI;QAAE,OAAO,SAAS,CAAC;IAExD,MAAM,YAAY,GAAG,IAAA,uBAAc,EAAC,cAAc,CAAC,CAAC;IAEpD,OAAO;QACL,KAAK,EAAE,MAAA,WAAW,CAAC,QAAQ,mCAAI,YAAY;QAC3C,eAAe,EAAE,uCAA2B;QAC5C,KAAK,EAAE;YACL,GAAG,CAAC,MAAA,SAAS,CAAC,KAAK,mCAAI,EAAE,CAAC;YAC1B,GAAG,IAAA,2DAA4B,EAAC,OAAO,EAAE,WAAW,CAAC;SACtD;QACD,QAAQ,EACN,aAAa,IAAI,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS;QACpE,MAAM,EAAE;YACN,GAAG,CAAC,MAAA,SAAS,CAAC,SAAS,mCAAI,EAAE,CAAC;YAC9B,GAAG,IAAA,mBAAW,EAAC,WAAW,CAAC,YAAY,CAAC;YACxC,GAAG,CAAC,MAAA,SAAS,CAAC,UAAU,mCAAI,EAAE,CAAC;SAChC;QAED,OAAO,EAAE,WAAW,CAAC,OAAO;KAC7B,CAAC;AACJ,CAAC,CAAC;AA7BW,QAAA,wBAAwB,4BA6BnC"}
1	+ {"version":3,"file":"createBuildJobDefinition.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/base/createBuildJobDefinition.ts"],"names":[],"mappings":";;;AACA,yCAA8C;AAE9C,uCAA0C;AAC1C,wFAAqF;AACrF,iDAAgE;AAEzD,MAAM,wBAAwB,GAAG,CACtC,OAAgB,EAChB,WAAyD,EACzD,YAGI,EAAE,EAC6B,EAAE;;IACrC,IAAI,WAAW,CAAC,YAAY,KAAK,IAAI;QAAE,OAAO,SAAS,CAAC;IAExD,MAAM,YAAY,GAAG,IAAA,uBAAc,EAAC,cAAc,CAAC,CAAC;IAEpD,OAAO;QACL,KAAK,EAAE,MAAA,WAAW,CAAC,QAAQ,mCAAI,YAAY;QAC3C,eAAe,EAAE,uCAA2B;QAC5C,KAAK,EAAE;YACL,GAAG,CAAC,MAAA,SAAS,CAAC,KAAK,mCAAI,EAAE,CAAC;YAC1B,GAAG,IAAA,2DAA4B,EAAC,OAAO,EAAE,WAAW,CAAC;SACtD;QACD,QAAQ,EACN,aAAa,IAAI,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS;QACpE,MAAM,EAAE;YACN,GAAG,CAAC,MAAA,SAAS,CAAC,SAAS,mCAAI,EAAE,CAAC;YAC9B,GAAG,IAAA,mBAAW,EAAC,WAAW,CAAC,YAAY,CAAC;YACxC,GAAG,CAAC,MAAA,SAAS,CAAC,UAAU,mCAAI,EAAE,CAAC;SAChC;QAED,OAAO,EAAE,WAAW,CAAC,OAAO;KAC7B,CAAC;AACJ,CAAC,CAAC;AA7BW,QAAA,wBAAwB,4BA6BnC"}

package/dist/pipeline/src/build/base/index.d.ts CHANGED Viewed

@@ -1,8 +1,7 @@
 import type { WorkspaceContext } from "../../types/context";
 import { type ComponentContext } from "../../types/context";
+import type { AppBuildJobDefinition, DockerBuildJobDefinition } from "../../types/jobDefinition";
 import type { CatladderJob } from "../../types/jobs";
-import type { DockerBuildJobDefinition } from "../docker";
-import type { AppBuildJobDefinition } from "./createAppBuildJob";
 export declare const createComponentBuildJobs: (context: ComponentContext, definitions: {
     appBuild?: AppBuildJobDefinition;
     dockerBuild: DockerBuildJobDefinition;

package/dist/pipeline/src/build/base/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/base/index.ts"],"names":[],"mappings":";;;AAAA,4CAAoD;AAEpD,iDAI6B;~~AAG7B~~,sCAA0E;AAC1E,kCAA6C;AAC7C,2CAAiD;~~AAEjD~~,2DAAwD;AAEjD,MAAM,wBAAwB,GAAG,CACtC,OAAyB,EACzB,WAGC,EACe,EAAE;;IAClB,OAAO;QACL,GAAG,CAAC,WAAW,CAAC,QAAQ,IAAI,IAAA,2CAAiC,EAAC,OAAO,CAAC;YACpE,CAAC,CAAC,CAAC,IAAA,qCAAiB,EAAC,OAAO,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;YACpD,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,IAAA,4BAAmB,EAAC,OAAO,CAAC;YAC9B,CAAC,CAAC;gBACE,IAAA,iCAAwB,EAAC,OAAO,EAAE;oBAChC,GAAG,WAAW,CAAC,WAAW;oBAC1B,KAAK,EAAE;wBACL,GAAG,CAAC,MAAA,WAAW,CAAC,WAAW,CAAC,KAAK,mCAAI,EAAE,CAAC;wBACxC,GAAG,CAAC,WAAW,CAAC,QAAQ;4BACxB,IAAA,2CAAiC,EAAC,OAAO,CAAC;4BACxC,CAAC,CAAC,CAAC,8BAAkB,CAAC;4BACtB,CAAC,CAAC,IAAA,2CAAiC,EAAC,OAAO,CAAC;gCAC1C,CAAC,CAAC;oCACE;wCACE,GAAG,EAAE,8BAAkB;wCACvB,SAAS,EAAE,IAAI;wCACf,aAAa,EAAE,OAAO,CAAC,KAAK,CAAC,aAAa;qCAC3C;iCACF;gCACH,CAAC,CAAC,EAAE,CAAC;qBACV;iBACF,CAAC;aACH;YACH,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,IAAA,sBAAe,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAA,yBAAkB,EAAC,OAAO,CAAC,CAAC,CAAC;KACnE,CAAC;AACJ,CAAC,CAAC;AAnCW,QAAA,wBAAwB,4BAmCnC;AAEK,MAAM,wBAAwB,GAAG,CACtC,OAAyB,EACzB,WAEC,EACe,EAAE;IAClB,OAAO,WAAW,CAAC,QAAQ;QACzB,CAAC,CAAC,CAAC,IAAA,qCAAiB,EAAC,OAAO,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;QACpD,CAAC,CAAC,EAAE,CAAC;AACT,CAAC,CAAC;AATW,QAAA,wBAAwB,4BASnC"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/base/index.ts"],"names":[],"mappings":";;;AAAA,4CAAoD;AAEpD,iDAI6B;AAM7B,sCAA0E;AAC1E,kCAA6C;AAC7C,2CAAiD;AACjD,2DAAwD;AAEjD,MAAM,wBAAwB,GAAG,CACtC,OAAyB,EACzB,WAGC,EACe,EAAE;;IAClB,OAAO;QACL,GAAG,CAAC,WAAW,CAAC,QAAQ,IAAI,IAAA,2CAAiC,EAAC,OAAO,CAAC;YACpE,CAAC,CAAC,CAAC,IAAA,qCAAiB,EAAC,OAAO,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;YACpD,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,IAAA,4BAAmB,EAAC,OAAO,CAAC;YAC9B,CAAC,CAAC;gBACE,IAAA,iCAAwB,EAAC,OAAO,EAAE;oBAChC,GAAG,WAAW,CAAC,WAAW;oBAC1B,KAAK,EAAE;wBACL,GAAG,CAAC,MAAA,WAAW,CAAC,WAAW,CAAC,KAAK,mCAAI,EAAE,CAAC;wBACxC,GAAG,CAAC,WAAW,CAAC,QAAQ;4BACxB,IAAA,2CAAiC,EAAC,OAAO,CAAC;4BACxC,CAAC,CAAC,CAAC,8BAAkB,CAAC;4BACtB,CAAC,CAAC,IAAA,2CAAiC,EAAC,OAAO,CAAC;gCAC1C,CAAC,CAAC;oCACE;wCACE,GAAG,EAAE,8BAAkB;wCACvB,SAAS,EAAE,IAAI;wCACf,aAAa,EAAE,OAAO,CAAC,KAAK,CAAC,aAAa;qCAC3C;iCACF;gCACH,CAAC,CAAC,EAAE,CAAC;qBACV;iBACF,CAAC;aACH;YACH,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,IAAA,sBAAe,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAA,yBAAkB,EAAC,OAAO,CAAC,CAAC,CAAC;KACnE,CAAC;AACJ,CAAC,CAAC;AAnCW,QAAA,wBAAwB,4BAmCnC;AAEK,MAAM,wBAAwB,GAAG,CACtC,OAAyB,EACzB,WAEC,EACe,EAAE;IAClB,OAAO,WAAW,CAAC,QAAQ;QACzB,CAAC,CAAC,CAAC,IAAA,qCAAiB,EAAC,OAAO,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;QACpD,CAAC,CAAC,EAAE,CAAC;AACT,CAAC,CAAC;AATW,QAAA,wBAAwB,4BASnC"}

package/dist/pipeline/src/build/cache/createJobCache.d.ts CHANGED Viewed

@@ -1,6 +1,7 @@
-import type { BuildConfigStandalone, CacheConfig, WorkspaceBuildConfig } from "..";
+import type { CacheConfig } from "..";
 import type { Context } from "../../types";
 import type { CatladderJobCache } from "../../types/jobs";
+import type { WithCacheConfig } from "../types";
 export declare const createJobCacheFromCacheConfigs: (context: Context, caches: CacheConfig[]) => CatladderJobCache[] | undefined;
 /** shortcut, used in some build types */
-export declare const createJobCacheFromConfig: (context: Context, buildConfig: BuildConfigStandalone | WorkspaceBuildConfig) => import("../../types").GitlabJobCache[];
+export declare const createJobCacheFromConfig: (context: Context, configWithCache: WithCacheConfig) => import("../../types").GitlabJobCache[];

package/dist/pipeline/src/build/cache/createJobCache.js CHANGED Viewed

@@ -50,8 +50,8 @@ const createJobCacheFromCacheConfigs = (context, caches) => {
 };
 exports.createJobCacheFromCacheConfigs = createJobCacheFromCacheConfigs;
 /** shortcut, used in some build types */
-const createJobCacheFromConfig = (context, buildConfig) => {
-    return (0, exports.createJobCacheFromCacheConfigs)(context, (0, getAllCacheConfigsFromConfig_1.getAllCacheConfigsFromConfig)(context, buildConfig));
+const createJobCacheFromConfig = (context, configWithCache) => {
+    return (0, exports.createJobCacheFromCacheConfigs)(context, (0, getAllCacheConfigsFromConfig_1.getAllCacheConfigsFromConfig)(context, configWithCache));
 };
 exports.createJobCacheFromConfig = createJobCacheFromConfig;
 //# sourceMappingURL=createJobCache.js.map

package/dist/pipeline/src/build/cache/createJobCache.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"createJobCache.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/cache/createJobCache.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;~~AAU5B~~,iFAA8E;AAEvE,MAAM,8BAA8B,GAAG,CAC5C,OAAgB,EAChB,MAAqB,EACY,EAAE;IACnC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAE1C,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CACnC,CAAC,CAAC,EAA0B,EAAE,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAC7C,CAAC;IACF,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,CACrC,CAAC,CAAC,EAA4B,EAAE,CAAC,KAAK,IAAI,CAAC,CAC5C,CAAC;IACF,4JAA4J;IAC5J,MAAM,YAAY,GAChB,eAAe,CAAC,MAAM,GAAG,CAAC;QACxB,CAAC,CAAC;YACE;gBACE,GAAG,EAAE,OAAO,CAAC,IAAI,GAAG,UAAU;gBAC9B,MAAM,EAAE,WAAW;gBACnB,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACnC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;;oBAChB,MAAM,OAAO,GACX,CAAC,CAAC,QAAQ,KAAK,UAAU;wBACvB,CAAC,CAAC,EAAE;wBACJ,CAAC,CAAC,MAAA,CAAC,CAAC,OAAO,mCAAI,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC;oBACrC,OAAO,IAAA,WAAI,EAAC,OAAO,EAAE,CAAC,CAAC,CAAC;gBAC1B,CAAC,CAAC,CACH;aACF;SACF;QACH,CAAC,CAAC,EAAE,CAAC;IAET,MAAM,cAAc,GAAG,iBAAiB,CAAC,GAAG,CAC1C,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;;QAC7D,MAAM,OAAO,GACX,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC;QAC/D,MAAM,cAAc,GAClB,KAAK,KAAK,QAAQ;YAChB,CAAC,CAAC,GAAG;YACL,CAAC,CAAC,OAAO,GAAG,KAAK,QAAQ;gBACvB,CAAC,CAAC,CAAC,KAAK,KAAK,UAAU,CAAC,sBAAsB;oBAC1C,CAAC,CAAC,OAAO;oBACT,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;oBACjB,GAAG;oBACH,GAAG;gBACL,CAAC,CAAC;oBACE,GAAG,GAAG;oBACN,KAAK,EAAE,MAAA,GAAG,CAAC,KAAK,0CAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAC1B,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,WAAI,EAAC,OAAO,EAAE,CAAC,CAAC,CAC/C;iBACF,CAAC;~~QACV~~,OAAO;YACL,GAAG,EAAE,cAAc;YACnB,MAAM,EAAE,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,WAAW;YAC7B,KAAK,EACH,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,WAAI,EAAC,OAAO,EAAE,CAAC,CAAC,CAAC;YACvE,GAAG,IAAI;SACR,CAAC;IACJ,CAAC,CACF,CAAC;~~IACF~~,OAAO,CAAC,GAAG,cAAc,EAAE,GAAG,YAAY,CAAC,CAAC;AAC9C,CAAC,CAAC;~~AA7DW~~,QAAA,8BAA8B,~~kCA6DzC~~;AAEF,yCAAyC;AAClC,MAAM,wBAAwB,GAAG,CACtC,OAAgB,EAChB,~~WAAyD~~,~~EACzD~~,EAAE;IACF,OAAO,IAAA,sCAA8B,EACnC,OAAO,EACP,IAAA,2DAA4B,EAAC,OAAO,EAAE,~~WAAW~~,CAAC,~~CACnD~~,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,wBAAwB,4BAQnC"}
1	+ {"version":3,"file":"createJobCache.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/cache/createJobCache.ts"],"names":[],"mappings":"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"}

package/dist/pipeline/src/build/cache/getAllCacheConfigsFromConfig.d.ts CHANGED Viewed

@@ -1,3 +1,3 @@
 import type { Context } from "../../types";
-import type { BuildConfigStandalone, CacheConfig, WorkspaceBuildConfig } from "../types";
-export declare const getAllCacheConfigsFromConfig: (context: Context, buildConfig: BuildConfigStandalone | WorkspaceBuildConfig) => CacheConfig[];
+import type { CacheConfig, WithCacheConfig } from "../types";
+export declare const getAllCacheConfigsFromConfig: (context: Context, configWithCache: WithCacheConfig) => CacheConfig[];

package/dist/pipeline/src/build/cache/getAllCacheConfigsFromConfig.js CHANGED Viewed

@@ -3,15 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAllCacheConfigsFromConfig = void 0;
 const index_1 = require("../../utils/index");
 const transformLegacyJobCache_1 = require("./transformLegacyJobCache");
-const getAllCacheConfigsFromConfig = (context, buildConfig) => {
+const getAllCacheConfigsFromConfig = (context, configWithCache) => {
     return [
-        ...("jobCache" in buildConfig
-            ? (0, transformLegacyJobCache_1.transformLegacyJobCache)(buildConfig.jobCache)
+        ...("jobCache" in configWithCache
+            ? (0, transformLegacyJobCache_1.transformLegacyJobCache)(configWithCache.jobCache)
             : []),
-        ...(0, index_1.ensureArray)(buildConfig.cache).map((c) => ({
-            ...c,
-            context,
-        })),
+        ...(0, index_1.ensureArray)(configWithCache.cache),
         ...(context.type === "workspace"
             ? // also add cache configs of the components of that workspace
                 context.components.flatMap((componentContext) => {

package/dist/pipeline/src/build/cache/getAllCacheConfigsFromConfig.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getAllCacheConfigsFromConfig.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/cache/getAllCacheConfigsFromConfig.ts"],"names":[],"mappings":";;;AACA,6CAAgD;~~AAMhD~~,uEAAoE;AAE7D,MAAM,4BAA4B,GAAG,CAC1C,OAAgB,EAChB,~~WAAyD~~,~~EAC1C~~,EAAE;IACjB,OAAO;QACL,GAAG,CAAC,UAAU,IAAI,~~WAAW~~;~~YAC3B~~,CAAC,CAAC,IAAA,iDAAuB,EAAC,~~WAAW~~,CAAC,QAAQ,CAAC;~~YAC/C~~,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,IAAA,mBAAW,EAAC,~~WAAW~~,CAAC,KAAK,CAAC~~,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC~~;~~YAC5C~~,GAAG,CAAC~~;YACJ~~,OAAO~~;SACR~~,CAAC,~~CAAC;QACH,GAAG,CAAC,OAAO,CAAC,~~IAAI,KAAK,WAAW;YAC9B,CAAC,CAAC,6DAA6D;gBAC7D,OAAO,CAAC,UAAU,CAAC,OAAO,CACxB,CAAC,gBAAgB,EAAE,EAAE;;oBACnB,OAAA,MAAA,IAAA,mBAAW,EAAC,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;wBAC3D,GAAG,CAAC;wBACJ,OAAO,EAAE,gBAAgB,CAAC,KAAK,CAAC,GAAG;qBACpC,CAAC,CAAC,mCAAI,EAAE,CAAA;iBAAA,CACZ;YACH,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;AACJ,CAAC,CAAC;~~AAvBW~~,QAAA,4BAA4B,~~gCAuBvC~~"}
1	+ {"version":3,"file":"getAllCacheConfigsFromConfig.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/cache/getAllCacheConfigsFromConfig.ts"],"names":[],"mappings":";;;AACA,6CAAgD;AAEhD,uEAAoE;AAE7D,MAAM,4BAA4B,GAAG,CAC1C,OAAgB,EAChB,eAAgC,EACjB,EAAE;IACjB,OAAO;QACL,GAAG,CAAC,UAAU,IAAI,eAAe;YAC/B,CAAC,CAAC,IAAA,iDAAuB,EAAC,eAAe,CAAC,QAAQ,CAAC;YACnD,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,IAAA,mBAAW,EAAC,eAAe,CAAC,KAAK,CAAC;QACrC,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;YAC9B,CAAC,CAAC,6DAA6D;gBAC7D,OAAO,CAAC,UAAU,CAAC,OAAO,CACxB,CAAC,gBAAgB,EAAE,EAAE;;oBACnB,OAAA,MAAA,IAAA,mBAAW,EAAC,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;wBAC3D,GAAG,CAAC;wBACJ,OAAO,EAAE,gBAAgB,CAAC,KAAK,CAAC,GAAG;qBACpC,CAAC,CAAC,mCAAI,EAAE,CAAA;iBAAA,CACZ;YACH,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;AACJ,CAAC,CAAC;AApBW,QAAA,4BAA4B,gCAoBvC"}

package/dist/pipeline/src/build/docker.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import type { BuildConfigDocker } from ".";
-import type { ComponentContext, JobDefintion } from "../types";
+import type { ComponentContext, DockerBuildJobDefinition } from "../types";
 import type { CatladderJob } from "../types/jobs";
 export declare const getDockerImageVariables: (context: ComponentContext) => {
     DOCKER_IMAGE_TAG: string;
@@ -58,8 +58,7 @@ export declare const getDockerBuildVariables: (context: ComponentContext) => {
 };
 export declare const DOCKER_BUILD_JOB_NAME = "\uD83D\uDD28 docker";
 export declare const getDockerJobBaseProps: () => Pick<CatladderJob, "image" | "services" | "variables" | "runnerVariables">;
-export type DockerBuildJobDefinition = JobDefintion;
-export declare const createDockerBuildJobBase: (context: ComponentContext, { script, cache, ...def }: JobDefintion) => CatladderJob;
+export declare const createDockerBuildJobBase: (context: ComponentContext, { script, cache, ...def }: DockerBuildJobDefinition) => CatladderJob;
 export declare const gitlabDockerLogin: (context: ComponentContext) => string[];
 export declare const getDockerBuildScriptWithBuiltInDockerFile: (context: ComponentContext, defaultType?: BuildConfigDocker["type"]) => string[];
 export declare const getDockerBuildDefaultScript: (context: ComponentContext, ensureDockerFileScript?: string | null) => string[];

package/dist/pipeline/src/build/docker.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/docker.ts"],"names":[],"mappings":"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~~AAGK~~,MAAM,wBAAwB,GAAG,CACtC,OAAyB,EACzB,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,~~EAAgB~~,~~EACzB~~,EAAE;IAChB,OAAO,IAAA,cAAK,EACV;QACE,IAAI,EAAE,6BAAqB;QAC3B,OAAO,EAAE,WAAW;QACpB,KAAK,EAAE,OAAO;QACd,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,IAAA,+CAA8B,EAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;QACzE,GAAG,IAAA,6BAAqB,GAAE;QAC1B,MAAM,EAAE,MAAM,IAAI,EAAE;KACrB,EACD;QACE,SAAS,EAAE,IAAA,+BAAuB,EAAC,OAAO,CAAC;QAC3C,eAAe,EAAE;YACf,GAAG,4BAA4B;YAC/B,GAAG,6BAA6B,EAAE;SACnC;KACF,EACD,GAAG,CACJ,CAAC;AACJ,CAAC,CAAC;AAtBW,QAAA,wBAAwB,4BAsBnC;AAEK,MAAM,iBAAiB,GAAG,CAAC,OAAyB,EAAE,EAAE,CAC7D,OAAO,CAAC,MAAM,IAAI,IAAA,uBAAc,EAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC;IACxE,CAAC,CAAC;QACE,GAAG,IAAA,qEAAiC,EAAC,OAAO,CAAC;QAC7C,gCAAgC,IAAA,4CAAwB,EAAC,OAAO,CAAC,EAAE;KACpE;IACH,CAAC,CAAC;QACE,+EAA+E;KAChF,CAAC;AARK,QAAA,iBAAiB,qBAQtB;AAER,MAAM,kCAAkC,GAAG;IACzC,MAAM,EAAE,wBAAwB;IAChC,IAAI,EAAE,sBAAsB;IAC5B,KAAK,EAAE,uBAAuB;IAC9B,MAAM,EAAE,IAAI;CAGb,CAAC;AAEK,MAAM,yCAAyC,GAAG,CACvD,OAAyB,EACzB,WAAuC,EACvC,EAAE;;IACF,MAAM,IAAI,GACR,QAAQ,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM;QAChC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM;QAC3B,MAAM,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM;QACnC,CAAC,CAAC,MAAA,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,0CAAE,IAAI;QACnC,CAAC,CAAC,WAAW,CAAC;IAClB,OAAO,IAAA,mCAA2B,EAChC,OAAO,EACP,IAAI,CAAC,CAAC,CAAC,kCAAkC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CACvD,CAAC;AACJ,CAAC,CAAC;AAdW,QAAA,yCAAyC,6CAcpD;AACK,MAAM,2BAA2B,GAAG,CACzC,OAAyB,EACzB,sBAAsC,EACtC,EAAE,CACF;IACE,sBAAsB,aAAtB,sBAAsB,cAAtB,sBAAsB,GAAI,SAAS;IACnC,GAAG,IAAA,4BAAmB,EACpB,cAAc,EACd,cAAc,CACf,CAAC,IAAA,yBAAiB,EAAC,OAAO,CAAC,CAAC;IAC7B,GAAG,IAAA,4BAAmB,EACpB,cAAc,EACd,cAAc,CACf,CAAC;QACA,qLAAqL,EAAE,4FAA4F;KACpR,CAAC;IACF,GAAG,IAAA,4BAAmB,EACpB,aAAa,EACb,qBAAqB,CACtB,CAAC;QACA,6CAA6C;QAC7C,gEAAgE;QAChE,iCAAiC;KAClC,CAAC;CACH,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AAxBP,QAAA,2BAA2B,+BAwBpB;AAEb,MAAM,aAAa,GAAG,CAAC,OAAyB,EAAE,EAAE,CACzD,IAAA,eAAU,EAAC,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC,CAAC;AAD5C,QAAA,aAAa,iBAC+B"}
1	+ {"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/docker.ts"],"names":[],"mappings":"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"}

package/dist/pipeline/src/build/node/buildJob.d.ts CHANGED Viewed

@@ -1,8 +1,7 @@
 import type { BuildContextStandalone, WorkspaceContext } from "../../types/context";
 import { type ComponentContext } from "../../types/context";
+import type { AppBuildJobDefinition, DockerBuildJobDefinition } from "../../types/jobDefinition";
 import type { CatladderJob } from "../../types/jobs";
-import type { AppBuildJobDefinition } from "../base/createAppBuildJob";
-import type { DockerBuildJobDefinition } from "../docker";
 export declare const createNodeBuildJobs: (context: ComponentContext | WorkspaceContext) => CatladderJob[];
 export declare const createNodeBuildJobDefinition: (context: ComponentContext<BuildContextStandalone> | WorkspaceContext) => AppBuildJobDefinition | undefined;
 export declare const createNodeDockerJobDefinition: (context: ComponentContext) => DockerBuildJobDefinition;

package/dist/pipeline/src/build/node/buildJob.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"buildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/buildJob.ts"],"names":[],"mappings":";;;AAIA,iDAG6B;~~AAE7B~~,kCAA6E;~~AAE7E~~,+EAA4E;~~AAE5E~~,sCAAsE;AAEtE,mCAAmE;AACnE,iCAAwE;AAEjE,MAAM,mBAAmB,GAAG,CACjC,OAA4C,EAC5B,EAAE;IAClB,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QACjC,OAAO,IAAA,+BAAwB,EAAC,OAAO,EAAE;YACvC,QAAQ,EAAE,IAAA,oCAA4B,EAAC,OAAO,CAAC;SAChD,CAAC,CAAC;IACL,CAAC;IACD,OAAO,IAAA,+BAAwB,EAAC,OAAO,EAAE;QACvC,QAAQ,EAAE,IAAA,2CAAiC,EAAC,OAAO,CAAC;YAClD,CAAC,CAAC,IAAA,oCAA4B,EAAC,OAAO,CAAC;YACvC,CAAC,CAAC,SAAS;QAEb,WAAW,EAAE,IAAA,qCAA6B,EAAC,OAAO,CAAC;KACpD,CAAC,CAAC;AACL,CAAC,CAAC;AAfW,QAAA,mBAAmB,uBAe9B;AAEK,MAAM,4BAA4B,GAAG,CAC1C,OAAoE,EACjC,EAAE;IACrC,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;IAEzC,MAAM,WAAW,GAAG,IAAA,qBAAc,EAAC,OAAO,CAAC,CAAC;IAC5C,OAAO,IAAA,mDAAwB,EAAC,OAAO,EAAE,WAAW,EAAE;QACpD,SAAS,EAAE,WAAW;QACtB,KAAK,EAAE,CAAC,GAAG,IAAA,oBAAY,EAAC,OAAO,CAAC,EAAE,GAAG,IAAA,oBAAY,EAAC,OAAO,CAAC,CAAC;KAC5D,CAAC,CAAC;AACL,CAAC,CAAC;AAVW,QAAA,4BAA4B,gCAUvC;AAEK,MAAM,6BAA6B,GAAG,CAC3C,OAAyB,EACC,EAAE;;IAC5B,+DAA+D;IAC/D,MAAM,oBAAoB,GACxB,OAAO,CAAC,KAAK,CAAC,SAAS,KAAK,aAAa;QACzC,OAAO,CAAC,KAAK,CAAC,SAAS,KAAK,WAAW;QACrC,CAAC,CAAC,OAAO;QACT,CAAC,CAAC,MAAM,CAAC;IAEb,OAAO;QACL,MAAM,EAAE,IAAA,kDAAyC,EAC/C,OAAO,EACP,oBAAoB,CACrB;QACD,KAAK,EAAE,CAAC,GAAG,IAAA,oBAAY,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACzC,SAAS,EAAE;YACT,+BAA+B;YAC/B,2BAA2B,EAAE,IAAA,qCAA8B,EAAC,OAAO,CAAC;YACpE,2BAA2B,EACzB,MAAA,MAAA,OAAO,CAAC,kBAAkB,0CAAE,mBAAmB,CAC5C,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,0BAA0B,GAAG,SAAS,GAAG,EAAE,CAAC,0CACxD,IAAI,CAAC,IAAI,CAAC;SACjB;KACF,CAAC;AACJ,CAAC,CAAC;AAzBW,QAAA,6BAA6B,iCAyBxC"}
1	+ {"version":3,"file":"buildJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/buildJob.ts"],"names":[],"mappings":";;;AAIA,iDAG6B;AAM7B,kCAA6E;AAC7E,+EAA4E;AAC5E,sCAAsE;AAEtE,mCAAmE;AACnE,iCAAwE;AAEjE,MAAM,mBAAmB,GAAG,CACjC,OAA4C,EAC5B,EAAE;IAClB,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QACjC,OAAO,IAAA,+BAAwB,EAAC,OAAO,EAAE;YACvC,QAAQ,EAAE,IAAA,oCAA4B,EAAC,OAAO,CAAC;SAChD,CAAC,CAAC;IACL,CAAC;IACD,OAAO,IAAA,+BAAwB,EAAC,OAAO,EAAE;QACvC,QAAQ,EAAE,IAAA,2CAAiC,EAAC,OAAO,CAAC;YAClD,CAAC,CAAC,IAAA,oCAA4B,EAAC,OAAO,CAAC;YACvC,CAAC,CAAC,SAAS;QAEb,WAAW,EAAE,IAAA,qCAA6B,EAAC,OAAO,CAAC;KACpD,CAAC,CAAC;AACL,CAAC,CAAC;AAfW,QAAA,mBAAmB,uBAe9B;AAEK,MAAM,4BAA4B,GAAG,CAC1C,OAAoE,EACjC,EAAE;IACrC,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;IAEzC,MAAM,WAAW,GAAG,IAAA,qBAAc,EAAC,OAAO,CAAC,CAAC;IAC5C,OAAO,IAAA,mDAAwB,EAAC,OAAO,EAAE,WAAW,EAAE;QACpD,SAAS,EAAE,WAAW;QACtB,KAAK,EAAE,CAAC,GAAG,IAAA,oBAAY,EAAC,OAAO,CAAC,EAAE,GAAG,IAAA,oBAAY,EAAC,OAAO,CAAC,CAAC;KAC5D,CAAC,CAAC;AACL,CAAC,CAAC;AAVW,QAAA,4BAA4B,gCAUvC;AAEK,MAAM,6BAA6B,GAAG,CAC3C,OAAyB,EACC,EAAE;;IAC5B,+DAA+D;IAC/D,MAAM,oBAAoB,GACxB,OAAO,CAAC,KAAK,CAAC,SAAS,KAAK,aAAa;QACzC,OAAO,CAAC,KAAK,CAAC,SAAS,KAAK,WAAW;QACrC,CAAC,CAAC,OAAO;QACT,CAAC,CAAC,MAAM,CAAC;IAEb,OAAO;QACL,MAAM,EAAE,IAAA,kDAAyC,EAC/C,OAAO,EACP,oBAAoB,CACrB;QACD,KAAK,EAAE,CAAC,GAAG,IAAA,oBAAY,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACzC,SAAS,EAAE;YACT,+BAA+B;YAC/B,2BAA2B,EAAE,IAAA,qCAA8B,EAAC,OAAO,CAAC;YACpE,2BAA2B,EACzB,MAAA,MAAA,OAAO,CAAC,kBAAkB,0CAAE,mBAAmB,CAC5C,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,0BAA0B,GAAG,SAAS,GAAG,EAAE,CAAC,0CACxD,IAAI,CAAC,IAAI,CAAC;SACjB;KACF,CAAC;AACJ,CAAC,CAAC;AAzBW,QAAA,6BAA6B,iCAyBxC"}

package/dist/pipeline/src/build/types.d.ts CHANGED Viewed

@@ -41,6 +41,12 @@ export type BuildConfigArtifactsReports = {
 };
 export type WithCacheConfig = {
     cache?: CacheConfig | CacheConfig[];
+    /**
+     * customize cache for the job
+     *
+     * @deprecated use cache
+     */
+    jobCache?: CatladderJob["cache"];
 };
 export type TestJobCustom = {
     command?: string | string[];

package/dist/pipeline/src/build/types.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/types.ts"],"names":[],"mappings":";;;~~AAkWO~~,MAAM,uBAAuB,GAAG,CACrC,CAAsB,EACM,EAAE;IAC9B,IAAI,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IACrB,OAAO,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC;AACxB,CAAC,CAAC;AALW,QAAA,uBAAuB,2BAKlC;AAEK,MAAM,aAAa,GAAG,CAC3B,CAAc,EACd,GAAG,KAAQ,EACqC,EAAE;IAClD,IAAI,CAAC,IAAA,+BAAuB,EAAC,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IAC9C,OAAO,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AAChC,CAAC,CAAC;AANW,QAAA,aAAa,iBAMxB"}
1	+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/types.ts"],"names":[],"mappings":";;;AAyWO,MAAM,uBAAuB,GAAG,CACrC,CAAsB,EACM,EAAE;IAC9B,IAAI,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IACrB,OAAO,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC;AACxB,CAAC,CAAC;AALW,QAAA,uBAAuB,2BAKlC;AAEK,MAAM,aAAa,GAAG,CAC3B,CAAc,EACd,GAAG,KAAQ,EACqC,EAAE;IAClD,IAAI,CAAC,IAAA,+BAAuB,EAAC,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IAC9C,OAAO,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AAChC,CAAC,CAAC;AANW,QAAA,aAAa,iBAMxB"}

package/dist/pipeline/src/context/getEnvironmentVariables.d.ts CHANGED Viewed

@@ -9,7 +9,7 @@ export type SecretEnvVar = {
 declare const getBasePredefinedVariables: (ctx: EnvironmentContext) => {
     ENV_SHORT: string;
     APP_DIR: string;
-    ENV_TYPE: "stage" | "dev" | "review" | "prod" | "local";
+    ENV_TYPE: "stage" | "local" | "dev" | "review" | "prod";
 };
 type BasePredefinedVariables = ReturnType<typeof getBasePredefinedVariables>;
 export type PredefinedVariables = BasePredefinedVariables & {

package/dist/pipeline/src/deploy/base/deploy.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
+import type { DeployJobDefinition } from "../../types";
 import { type ComponentContext } from "../../types/context";
 import type { CatladderJob } from "../../types/jobs";
 export declare const DEPLOY_JOB_NAME = "\uD83D\uDE80 Deploy";
-export type DeployJobDefinition = Pick<CatladderJob, "script" | "variables" | "image" | "cache" | "artifacts" | "services" | "runnerVariables">;
 export declare const createDeployJob: (context: ComponentContext, jobDefinition: DeployJobDefinition) => CatladderJob;

package/dist/pipeline/src/deploy/base/deploy.js CHANGED Viewed

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDeployJob = exports.DEPLOY_JOB_NAME = void 0;
+const createJobCache_1 = require("../../build/cache/createJobCache");
 const docker_1 = require("../../build/docker");
 const sbom_1 = require("../../build/sbom");
 const context_1 = require("../../types/context");
@@ -32,7 +33,9 @@ const createDeployJob = (context, jobDefinition) => {
         name: exports.DEPLOY_JOB_NAME,
         script: jobDefinition.script,
         image: jobDefinition.image,
-        cache: jobDefinition.cache,
+        cache: jobDefinition.cache
+            ? (0, createJobCache_1.createJobCacheFromCacheConfigs)(context, jobDefinition.cache)
+            : undefined,
         artifacts: jobDefinition.artifacts,
         services: jobDefinition.services,
         envMode: "stagePerEnv", // makes it easier to run manual tasks er env

package/dist/pipeline/src/deploy/base/deploy.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/base/deploy.ts"],"names":[],"mappings":";;;AAAA,+CAG4B;AAC5B,2CAAuD;~~AACvD~~,iDAG6B;AAE7B,kCAA0C;AAC1C,oCAA8C;AAC9C,iCAAuC;AAEvC,2CAAsD;AAEzC,QAAA,eAAe,GAAG,WAAW,CAAC;~~AAYpC~~,MAAM,eAAe,GAAG,CAC7B,OAAyB,EACzB,aAAkC,EACpB,EAAE;;IAChB,MAAM,SAAS,GAAG,IAAA,4BAAmB,EAAC,OAAO,CAAC,CAAC;IAC/C,MAAM,WAAW,GAAG,IAAA,0BAAkB,EAAC,OAAO,CAAC,CAAC;IAEhD,MAAM,QAAQ,GACZ,OAAO,CAAC,WAAW,CAAC,OAAO,KAAK,QAAQ;QACtC,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,KAAK,KAAK;YACrC,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,SAAS,CAAC;IAElB,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAE5C,uDAAuD;IACvD,MAAM,iBAAiB,GACrB,YAAY,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IACpE,mGAAmG;IACnG,MAAM,iBAAiB,GACrB,OAAO,CAAC,WAAW,CAAC,OAAO,KAAK,MAAM;QACpC,CAAC,CAAC,MAAM,CAAC,4BAA4B;QACrC,CAAC,CAAC,CAAA,MAAA,OAAO,CAAC,eAAe,CAAC,GAAG,0CAAE,KAAK,MAAK,KAAK;YAC5C,CAAC,CAAC,MAAM,CAAC,uCAAuC;YAChD,CAAC,CAAC,QAAQ,CAAC,CAAC,kBAAkB;IACpC,MAAM,UAAU,GAAG,iBAAiB,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,iBAAiB,CAAC;IAE7E,OAAO;QACL,IAAI,EAAE,uBAAe;QACrB,MAAM,EAAE,aAAa,CAAC,MAAM;QAC5B,KAAK,EAAE,aAAa,CAAC,KAAK;QAC1B,KAAK,EAAE,aAAa,CAAC,KAAK;~~QAC1B~~,SAAS,EAAE,aAAa,CAAC,SAAS;QAClC,QAAQ,EAAE,aAAa,CAAC,QAAQ;QAChC,OAAO,EAAE,aAAa,EAAE,6CAA6C;QAErE,KAAK,EAAE;YACL,GAAG,CAAC,IAAA,sBAAe,EAAC,OAAO,CAAC;gBAC1B,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,0BAAmB,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACpD,GAAG,CAAC,YAAY;gBACd,CAAC,CAAC,MAAA,MAAA,YAAY,CAAC,OAAO,0CAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBAChC,aAAa,EAAE,CAAC;oBAChB,GAAG,EAAE,uBAAe;oBACpB,SAAS,EAAE,KAAK;iBACjB,CAAC,CAAC,mCAAI,EAAE;gBACX,CAAC,CAAC,EAAE,CAAC;SACR;QACD,sDAAsD;QACtD,WAAW,EAAE;YACX,GAAG,CAAC,IAAA,2CAAiC,EAAC,OAAO,CAAC;gBAC5C,CAAC,CAAC,SAAS,CAAC,iCAAiC;oBAC3C,CAAC,CAAC;wBACE,oEAAoE;wBACpE;4BACE,KAAK,EAAE,OAAoB;4BAC3B,SAAS,EAAE,KAAK;yBACjB;qBACF;oBACH,CAAC,CAAC;wBACE;4BACE,4CAA4C;4BAC5C,KAAK,EAAE,OAAoB;4BAC3B,SAAS,EAAE,IAAI;4BACf,aAAa,EAAE,OAAO,CAAC,KAAK,CAAC,aAAa;yBAC3C;qBACF;gBACL,CAAC,CAAC;oBACE;wBACE,KAAK,EAAE,OAAoB;wBAC3B,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,4DAA4D;qBAClG;iBACF,CAAC;YACN;gBACE,KAAK,EAAE,MAAM;gBACb,SAAS,EAAE,KAAK;gBAChB,gCAAgC;gBAChC,aAAa,EAAE,IAAA,2CAAiC,EAAC,OAAO,CAAC;oBACvD,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,aAAa;oBAC7B,CAAC,CAAC,SAAS;aACd;SACF;QACD,IAAI,EAAE,UAAU,KAAK,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ;QAErD,aAAa,EAAE,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;QACrD,KAAK,EAAE,QAAQ;QACf,SAAS,EAAE;YACT,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO;YAC9B,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,gCAAuB,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACtD,GAAG,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO;YACjD,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,MAAA,YAAY,CAAC,SAAS,mCAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACrD,GAAG,aAAa,CAAC,SAAS;SAC3B;QACD,eAAe,EAAE;YACf,GAAG,mCAAuB;YAC1B,GAAG,CAAC,MAAA,aAAa,CAAC,eAAe,mCAAI,EAAE,CAAC;YACxC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,MAAA,YAAY,CAAC,eAAe,mCAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC5D;QACD,WAAW,EAAE,WAAW;YACtB,CAAC,CAAC;gBACE,OAAO,EAAE,oBAAa;gBACtB,YAAY,EAAE,QAAQ;aACvB;YACH,CAAC,CAAC,SAAS;QACb,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;KACzD,CAAC;AACJ,CAAC,CAAC;~~AA3GW~~,QAAA,eAAe,~~mBA2G1B~~"}
1	+ {"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/base/deploy.ts"],"names":[],"mappings":"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"}

package/dist/pipeline/src/deploy/base/index.d.ts CHANGED Viewed

@@ -1,8 +1,6 @@
 import type { ComponentContext } from "../../types/context";
+import type { DeployJobDefinition, RollbackJobDefinition, StopJobDefinition } from "../../types/jobDefinition";
 import type { CatladderJob } from "../../types/jobs";
-import { type DeployJobDefinition } from "./deploy";
-import { type RollbackJobDefinition } from "./rollback";
-import { type StopJobDefinition } from "./stop";
 export declare const createDeployementJobs: (context: ComponentContext, definitions: {
     deploy: DeployJobDefinition;
     stop?: StopJobDefinition;

package/dist/pipeline/src/deploy/base/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/base/index.ts"],"names":[],"mappings":";;;~~AAEA~~,~~qCAAqE~~;~~AACrE~~,~~yCAA2E~~;~~AAC3E~~,~~iCAA+D~~;~~AAExD~~,MAAM,qBAAqB,GAAG,CACnC,OAAyB,EACzB,WAIC,EACe,EAAE;IAClB,OAAO;QACL,IAAA,wBAAe,EAAC,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC;QAC5C,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAA,oBAAa,EAAC,OAAO,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACvE,GAAG,CAAC,WAAW,CAAC,QAAQ;YACtB,CAAC,CAAC,CAAC,IAAA,4BAAiB,EAAC,OAAO,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;YACpD,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;AACJ,CAAC,CAAC;AAfW,QAAA,qBAAqB,yBAehC"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/base/index.ts"],"names":[],"mappings":";;;AAOA,qCAA2C;AAC3C,yCAA+C;AAC/C,iCAAuC;AAEhC,MAAM,qBAAqB,GAAG,CACnC,OAAyB,EACzB,WAIC,EACe,EAAE;IAClB,OAAO;QACL,IAAA,wBAAe,EAAC,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC;QAC5C,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAA,oBAAa,EAAC,OAAO,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACvE,GAAG,CAAC,WAAW,CAAC,QAAQ;YACtB,CAAC,CAAC,CAAC,IAAA,4BAAiB,EAAC,OAAO,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;YACpD,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;AACJ,CAAC,CAAC;AAfW,QAAA,qBAAqB,yBAehC"}

package/dist/pipeline/src/deploy/base/rollback.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import type { ComponentContext } from "../../types/context";
+import type { RollbackJobDefinition } from "../../types/jobDefinition";
 import type { CatladderJob } from "../../types/jobs";
 export declare const ROLLBACK_JOB_NAME = "\u21A9\uFE0F Rollback \u26A0\uFE0F";
-export type RollbackJobDefinition = Pick<CatladderJob, "script" | "variables" | "runnerVariables" | "image">;
 export declare const createRollbackJob: (context: ComponentContext, jobDefinition: RollbackJobDefinition) => CatladderJob;

package/dist/pipeline/src/deploy/base/rollback.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"rollback.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/base/rollback.ts"],"names":[],"mappings":";;;~~AAEA~~,2CAAsD;AAEzC,QAAA,iBAAiB,GAAG,gBAAgB,CAAC;~~AAM3C~~,MAAM,iBAAiB,GAAG,CAC/B,OAAyB,EACzB,aAAoC,EACtB,EAAE;;IAChB,OAAO;QACL,IAAI,EAAE,yBAAiB;QACvB,KAAK,EAAE,aAAa,CAAC,KAAK;QAC1B,OAAO,EAAE,aAAa,EAAE,6CAA6C;QACrE,KAAK,EAAE,EAAE,EAAE,gDAAgD;QAC3D,aAAa,EAAE,IAAI;QACnB,IAAI,EAAE,QAAQ;QACd,SAAS,EAAE;YACT,GAAG,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO;YACjD,GAAG,aAAa,CAAC,SAAS;SAC3B;QACD,eAAe,EAAE;YACf,GAAG,mCAAuB;YAC1B,YAAY,EAAE,MAAM;YACpB,GAAG,CAAC,MAAA,aAAa,CAAC,eAAe,mCAAI,EAAE,CAAC;SACzC;QACD,KAAK,EAAE,UAAU;QACjB,WAAW,EAAE;YACX,MAAM,EAAE,QAAQ;SACjB;QAED,MAAM,EAAE,aAAa,CAAC,MAAM;KAC7B,CAAC;AACJ,CAAC,CAAC;AA3BW,QAAA,iBAAiB,qBA2B5B"}
1	+ {"version":3,"file":"rollback.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/base/rollback.ts"],"names":[],"mappings":";;;AAGA,2CAAsD;AAEzC,QAAA,iBAAiB,GAAG,gBAAgB,CAAC;AAE3C,MAAM,iBAAiB,GAAG,CAC/B,OAAyB,EACzB,aAAoC,EACtB,EAAE;;IAChB,OAAO;QACL,IAAI,EAAE,yBAAiB;QACvB,KAAK,EAAE,aAAa,CAAC,KAAK;QAC1B,OAAO,EAAE,aAAa,EAAE,6CAA6C;QACrE,KAAK,EAAE,EAAE,EAAE,gDAAgD;QAC3D,aAAa,EAAE,IAAI;QACnB,IAAI,EAAE,QAAQ;QACd,SAAS,EAAE;YACT,GAAG,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO;YACjD,GAAG,aAAa,CAAC,SAAS;SAC3B;QACD,eAAe,EAAE;YACf,GAAG,mCAAuB;YAC1B,YAAY,EAAE,MAAM;YACpB,GAAG,CAAC,MAAA,aAAa,CAAC,eAAe,mCAAI,EAAE,CAAC;SACzC;QACD,KAAK,EAAE,UAAU;QACjB,WAAW,EAAE;YACX,MAAM,EAAE,QAAQ;SACjB;QAED,MAAM,EAAE,aAAa,CAAC,MAAM;KAC7B,CAAC;AACJ,CAAC,CAAC;AA3BW,QAAA,iBAAiB,qBA2B5B"}

package/dist/pipeline/src/deploy/base/stop.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import type { ComponentContext } from "../../types/context";
+import type { StopJobDefinition } from "../../types/jobDefinition";
 import type { CatladderJob } from "../../types/jobs";
 export declare const STOP_JOB_NAME = "\uD83D\uDED1 Stop \u26A0\uFE0F";
-export type StopJobDefinition = Pick<CatladderJob, "script" | "variables" | "image" | "runnerVariables">;
 export declare const createStopJob: (context: ComponentContext, jobDefinition: StopJobDefinition) => CatladderJob;

package/dist/pipeline/src/deploy/base/stop.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"stop.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/base/stop.ts"],"names":[],"mappings":";;;~~AAGA~~,2CAAsD;AACzC,QAAA,aAAa,GAAG,YAAY,CAAC;~~AAMnC~~,MAAM,aAAa,GAAG,CAC3B,OAAyB,EACzB,aAAgC,EAClB,EAAE;IAChB,OAAO;QACL,IAAI,EAAE,qBAAa;QACnB,KAAK,EAAE,aAAa,CAAC,KAAK;QAC1B,OAAO,EAAE,aAAa,EAAE,6CAA6C;QACrE,KAAK,EAAE,EAAE,EAAE,gDAAgD;QAC3D,aAAa,EAAE,IAAI;QACnB,IAAI,EAAE,QAAQ,EAAE,wBAAwB;QACxC,KAAK,EAAE;YACL;gBACE,EAAE,EAAE,kDAAkD,EAAE,+BAA+B;gBACvF,IAAI,EAAE,YAAY;aACnB;SACF;QACD,SAAS,EAAE;YACT,GAAG,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO;YACjD,GAAG,aAAa,CAAC,SAAS;SAC3B;QACD,eAAe,EAAE;YACf,GAAG,mCAAuB;YAC1B,YAAY,EAAE,MAAM;YACpB,GAAG,aAAa,CAAC,eAAe;SACjC;QACD,KAAK,EAAE,MAAM;QACb,WAAW,EAAE;YACX,MAAM,EAAE,MAAM;SACf;QACD,MAAM,EAAE,aAAa,CAAC,MAAM;KAC7B,CAAC;AACJ,CAAC,CAAC;AAhCW,QAAA,aAAa,iBAgCxB"}
1	+ {"version":3,"file":"stop.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/base/stop.ts"],"names":[],"mappings":";;;AAIA,2CAAsD;AACzC,QAAA,aAAa,GAAG,YAAY,CAAC;AAEnC,MAAM,aAAa,GAAG,CAC3B,OAAyB,EACzB,aAAgC,EAClB,EAAE;IAChB,OAAO;QACL,IAAI,EAAE,qBAAa;QACnB,KAAK,EAAE,aAAa,CAAC,KAAK;QAC1B,OAAO,EAAE,aAAa,EAAE,6CAA6C;QACrE,KAAK,EAAE,EAAE,EAAE,gDAAgD;QAC3D,aAAa,EAAE,IAAI;QACnB,IAAI,EAAE,QAAQ,EAAE,wBAAwB;QACxC,KAAK,EAAE;YACL;gBACE,EAAE,EAAE,kDAAkD,EAAE,+BAA+B;gBACvF,IAAI,EAAE,YAAY;aACnB;SACF;QACD,SAAS,EAAE;YACT,GAAG,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO;YACjD,GAAG,aAAa,CAAC,SAAS;SAC3B;QACD,eAAe,EAAE;YACf,GAAG,mCAAuB;YAC1B,YAAY,EAAE,MAAM;YACpB,GAAG,aAAa,CAAC,eAAe;SACjC;QACD,KAAK,EAAE,MAAM;QACb,WAAW,EAAE;YACX,MAAM,EAAE,MAAM;SACf;QACD,MAAM,EAAE,aAAa,CAAC,MAAM;KAC7B,CAAC;AACJ,CAAC,CAAC;AAhCW,QAAA,aAAa,iBAgCxB"}