@catladder/cli 0.0.0-refactor-gitlab-jobs-9e285eaf → 0.0.0-refactor-gitlab-jobs-a7359bde

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 (3) hide show
  1. package/dist/bundles/catenv/index.js +20 -16
  2. package/dist/bundles/cli/index.js +20 -16
  3. package/package.json +2 -2
package/dist/bundles/catenv/index.js CHANGED
@@ -40106,7 +40106,7 @@ exports.readConfigSync = readConfigSync;
40106
40106
 
40107
40107
  exports.__esModule = true;
40108
40108
  exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
40109
- exports.PIPELINE_IMAGE_TAG = "refactor-gitlab-jobs-9e285eaf" || 0;
40109
+ exports.PIPELINE_IMAGE_TAG = "refactor-gitlab-jobs-a7359bde" || 0;
40110
40110
  exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
40111
40111
 
40112
40112
  /***/ }),
@@ -43808,27 +43808,31 @@ var makeGitlabJob = function (componentName, env, _a, allJobs) {
43808
43808
  needs = _a.needs,
43809
43809
  job = __rest(_a, ["envMode", "needsStages", "needsOtherComponent", "name", "needs"]);
43810
43810
  var stage = envMode === "stagePerEnv" ? "".concat(job.stage, " ").concat(env) : job.stage;
43811
- var cleanedNeeds = __spreadArray(__spreadArray([], __read(needs !== null && needs !== void 0 ? needs : []), false), __read(needsOtherComponent !== null && needsOtherComponent !== void 0 ? needsOtherComponent : []), false);
43812
- var gitlabNeedsFromNeeds = cleanedNeeds === null || cleanedNeeds === void 0 ? void 0 : cleanedNeeds.map(function (n) {
43813
- var _a;
43814
- return (0, lodash_1.isObject)(n) ? {
43815
- job: getFullReferencedJobName(n.job, (_a = n.componentName) !== null && _a !== void 0 ? _a : componentName, env, allJobs),
43816
- artifacts: n.artifacts
43817
- } : getFullReferencedJobName(n, componentName, env, allJobs);
43818
- });
43819
- var gitlabNeedsFromStages = needsStages === null || needsStages === void 0 ? void 0 : needsStages.flatMap(function (n) {
43820
- var _a, _b;
43821
- return (_b = (_a = allJobs[componentName]) === null || _a === void 0 ? void 0 : _a[env]) === null || _b === void 0 ? void 0 : _b.filter(function (j) {
43811
+ var needsFromStages = needsStages === null || needsStages === void 0 ? void 0 : needsStages.flatMap(function (n) {
43812
+ var _a, _b, _c, _d;
43813
+ var referencedComponentName = componentName;
43814
+ var allJobNamesFromThatStage = (_d = (_c = (_b = (_a = allJobs[referencedComponentName]) === null || _a === void 0 ? void 0 : _a[env]) === null || _b === void 0 ? void 0 : _b.filter(function (j) {
43822
43815
  return j.stage === n.stage;
43823
- }).map(function (j) {
43816
+ })) === null || _c === void 0 ? void 0 : _c.map(function (j) {
43817
+ return j.name;
43818
+ })) !== null && _d !== void 0 ? _d : [];
43819
+ return allJobNamesFromThatStage.map(function (job) {
43824
43820
  var _a;
43825
43821
  return {
43826
- job: getFullReferencedJobName(j.name, componentName, env, allJobs),
43827
- artifacts: (_a = n.artifacts) !== null && _a !== void 0 ? _a : false
43822
+ job: job,
43823
+ artifacts: (_a = n.artifacts) !== null && _a !== void 0 ? _a : false,
43824
+ componentName: referencedComponentName
43828
43825
  };
43829
43826
  });
43830
43827
  });
43831
- var gitlabNeeds = __spreadArray(__spreadArray([], __read(gitlabNeedsFromNeeds), false), __read(gitlabNeedsFromStages !== null && gitlabNeedsFromStages !== void 0 ? gitlabNeedsFromStages : []), false).sort(function (a, b) {
43828
+ var cleanedNeeds = __spreadArray(__spreadArray(__spreadArray([], __read(needs !== null && needs !== void 0 ? needs : []), false), __read(needsOtherComponent !== null && needsOtherComponent !== void 0 ? needsOtherComponent : []), false), __read(needsFromStages !== null && needsFromStages !== void 0 ? needsFromStages : []), false);
43829
+ var gitlabNeeds = cleanedNeeds === null || cleanedNeeds === void 0 ? void 0 : cleanedNeeds.map(function (n) {
43830
+ var _a;
43831
+ return (0, lodash_1.isObject)(n) ? {
43832
+ job: getFullReferencedJobName(n.job, (_a = n.componentName) !== null && _a !== void 0 ? _a : componentName, env, allJobs),
43833
+ artifacts: n.artifacts
43834
+ } : getFullReferencedJobName(n, componentName, env, allJobs);
43835
+ }).sort(function (a, b) {
43832
43836
  return getJobName(a).localeCompare(getJobName(b));
43833
43837
  });
43834
43838
  var fullJobName = getFullJobName(name, componentName, envMode !== "none" ? env : undefined);
package/dist/bundles/cli/index.js CHANGED
@@ -351438,7 +351438,7 @@ exports.readConfigSync = readConfigSync;
351438
351438
 
351439
351439
  exports.__esModule = true;
351440
351440
  exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
351441
- exports.PIPELINE_IMAGE_TAG = "refactor-gitlab-jobs-9e285eaf" || 0;
351441
+ exports.PIPELINE_IMAGE_TAG = "refactor-gitlab-jobs-a7359bde" || 0;
351442
351442
  exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
351443
351443
 
351444
351444
  /***/ }),
@@ -355140,27 +355140,31 @@ var makeGitlabJob = function (componentName, env, _a, allJobs) {
355140
355140
  needs = _a.needs,
355141
355141
  job = __rest(_a, ["envMode", "needsStages", "needsOtherComponent", "name", "needs"]);
355142
355142
  var stage = envMode === "stagePerEnv" ? "".concat(job.stage, " ").concat(env) : job.stage;
355143
- var cleanedNeeds = __spreadArray(__spreadArray([], __read(needs !== null && needs !== void 0 ? needs : []), false), __read(needsOtherComponent !== null && needsOtherComponent !== void 0 ? needsOtherComponent : []), false);
355144
- var gitlabNeedsFromNeeds = cleanedNeeds === null || cleanedNeeds === void 0 ? void 0 : cleanedNeeds.map(function (n) {
355145
- var _a;
355146
- return (0, lodash_1.isObject)(n) ? {
355147
- job: getFullReferencedJobName(n.job, (_a = n.componentName) !== null && _a !== void 0 ? _a : componentName, env, allJobs),
355148
- artifacts: n.artifacts
355149
- } : getFullReferencedJobName(n, componentName, env, allJobs);
355150
- });
355151
- var gitlabNeedsFromStages = needsStages === null || needsStages === void 0 ? void 0 : needsStages.flatMap(function (n) {
355152
- var _a, _b;
355153
- return (_b = (_a = allJobs[componentName]) === null || _a === void 0 ? void 0 : _a[env]) === null || _b === void 0 ? void 0 : _b.filter(function (j) {
355143
+ var needsFromStages = needsStages === null || needsStages === void 0 ? void 0 : needsStages.flatMap(function (n) {
355144
+ var _a, _b, _c, _d;
355145
+ var referencedComponentName = componentName;
355146
+ var allJobNamesFromThatStage = (_d = (_c = (_b = (_a = allJobs[referencedComponentName]) === null || _a === void 0 ? void 0 : _a[env]) === null || _b === void 0 ? void 0 : _b.filter(function (j) {
355154
355147
  return j.stage === n.stage;
355155
- }).map(function (j) {
355148
+ })) === null || _c === void 0 ? void 0 : _c.map(function (j) {
355149
+ return j.name;
355150
+ })) !== null && _d !== void 0 ? _d : [];
355151
+ return allJobNamesFromThatStage.map(function (job) {
355156
355152
  var _a;
355157
355153
  return {
355158
- job: getFullReferencedJobName(j.name, componentName, env, allJobs),
355159
- artifacts: (_a = n.artifacts) !== null && _a !== void 0 ? _a : false
355154
+ job: job,
355155
+ artifacts: (_a = n.artifacts) !== null && _a !== void 0 ? _a : false,
355156
+ componentName: referencedComponentName
355160
355157
  };
355161
355158
  });
355162
355159
  });
355163
- var gitlabNeeds = __spreadArray(__spreadArray([], __read(gitlabNeedsFromNeeds), false), __read(gitlabNeedsFromStages !== null && gitlabNeedsFromStages !== void 0 ? gitlabNeedsFromStages : []), false).sort(function (a, b) {
355160
+ var cleanedNeeds = __spreadArray(__spreadArray(__spreadArray([], __read(needs !== null && needs !== void 0 ? needs : []), false), __read(needsOtherComponent !== null && needsOtherComponent !== void 0 ? needsOtherComponent : []), false), __read(needsFromStages !== null && needsFromStages !== void 0 ? needsFromStages : []), false);
355161
+ var gitlabNeeds = cleanedNeeds === null || cleanedNeeds === void 0 ? void 0 : cleanedNeeds.map(function (n) {
355162
+ var _a;
355163
+ return (0, lodash_1.isObject)(n) ? {
355164
+ job: getFullReferencedJobName(n.job, (_a = n.componentName) !== null && _a !== void 0 ? _a : componentName, env, allJobs),
355165
+ artifacts: n.artifacts
355166
+ } : getFullReferencedJobName(n, componentName, env, allJobs);
355167
+ }).sort(function (a, b) {
355164
355168
  return getJobName(a).localeCompare(getJobName(b));
355165
355169
  });
355166
355170
  var fullJobName = getFullJobName(name, componentName, envMode !== "none" ? env : undefined);
package/package.json CHANGED
@@ -24,7 +24,7 @@
24
24
  "node": ">=12.0.0"
25
25
  },
26
26
  "devDependencies": {
27
- "@catladder/pipeline": "0.0.0-refactor-gitlab-jobs-9e285eaf",
27
+ "@catladder/pipeline": "0.0.0-refactor-gitlab-jobs-a7359bde",
28
28
  "@kubernetes/client-node": "^0.16.2",
29
29
  "@tsconfig/node14": "^1.0.1",
30
30
  "@types/common-tags": "^1.8.0",
@@ -57,6 +57,6 @@
57
57
  "typescript": "^4.5.4",
58
58
  "vorpal": "^1.12.0"
59
59
  },
60
- "version": "0.0.0-refactor-gitlab-jobs-9e285eaf",
60
+ "version": "0.0.0-refactor-gitlab-jobs-a7359bde",
61
61
  "stableVersion": "0.0.0"
62
62
  }