@catladder/cli 2.0.5 → 2.2.0

package/package.json

@@ -53,7 +53,7 @@
     }
   ],
   "license": "MIT",
-  "version": "2.0.5",
+  "version": "2.2.0",
   "scripts": {
     "lint": "eslint \"src/**/*.ts\"",
     "lint:fix": "eslint \"src/**/*.ts\" --fix",
@@ -77,38 +77,38 @@
     "@gitbeaker/rest": "^39.28.0",
     "@kubernetes/client-node": "^0.16.2",
     "@tsconfig/node14": "^1.0.1",
-    "@types/common-tags": "^1.8.0",
+    "@types/common-tags": "^1.8.4",
     "@types/fs-extra": "^5.0.4",
-    "@types/lodash": "^4.14.185",
+    "@types/lodash": "^4.17.7",
     "@types/memoizee": "^0.4.2",
-    "@types/node-fetch": "^2.1.4",
-    "@types/request": "^2.48.1",
+    "@types/node-fetch": "^2.6.11",
+    "@types/request": "^2.48.12",
     "@types/tmp": "^0.2.3",
     "@types/update-notifier": "^2.5.0",
     "@types/vorpal": "^1.12.0",
     "@types/websocket": "^0.0.40",
-    "@types/yargs": "^13.0.0",
+    "@types/yargs": "^17.0.33",
     "child-process-promise": "^2.2.1",
     "clipboardy": "^2.0.0",
     "command-exists-promise": "^2.0.2",
-    "common-tags": "^1.8.0",
+    "common-tags": "^1.8.2",
     "connection-string-parser": "^1.0.4",
     "date-fns": "^3.6.0",
     "fs-extra": "^7.0.1",
     "gitlab": "^4.4.1",
     "lodash": "^4.17.21",
-    "memoizee": "^0.4.14",
+    "memoizee": "^0.4.17",
     "node-fetch": "^2.3.0",
     "open": "^8.4.0",
-    "prettier": "^3.3.2",
+    "prettier": "^3.3.3",
     "tmp-promise": "^2.0.2",
-    "ts-results-es": "^4.1.0-alpha.1",
+    "ts-results-es": "^4.2.0",
     "tsc-alias": "^1.8.10",
     "typescript": "^5.4.5",
     "vorpal": "^1.12.0",
-    "yaml": "^2.4.5"
+    "yaml": "^2.5.0"
   },
   "dependencies": {
-    "tsx": "^4.16.2"
+    "tsx": "^4.19.0"
   }
 }

package/src/apps/catenv/catenv.ts

@@ -12,7 +12,7 @@ export default async (choice?: Choice) => {
   }
 
   await Promise.all([
-    generatePipelineFiles(config, config.pipelineType ?? "gitlab", "local"),
+    generatePipelineFiles(config, config.pipelineType ?? "gitlab"),
     writeDotEnvFiles(config, choice),
 
     writeDTsFiles(config, choice),

package/src/packageInfos.ts

@@ -4,7 +4,6 @@
 // this will point to the root package.json
 
 const path = require.main?.path + "/../package.json";
-// eslint-disable-next-line @typescript-eslint/no-var-requires
 const ownPkg = require(path);
 
 export default ownPkg;

package/dist/pipeline/src/pipeline/createChildPipeline.d.ts

@@ -1,3 +0,0 @@
-import type { Pipeline } from "../types";
-import type { Config, PipelineTrigger } from "../types/config";
-export declare const createChildPipeline: <T extends "gitlab">(pipelineType: T, trigger: PipelineTrigger, config: Config) => Promise<Pipeline<T>>;

package/dist/pipeline/src/pipeline/createChildPipeline.js

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createChildPipeline = void 0;
-const rules_1 = require("../rules");
-const createAllJobs_1 = require("./createAllJobs");
-const getPipelineStages_1 = require("./getPipelineStages");
-const createGitlabJobs_1 = require("./gitlab/createGitlabJobs");
-const createGitlabPipeline_1 = require("./gitlab/createGitlabPipeline");
-const createChildPipeline = async (pipelineType, trigger, config) => {
-    const jobs = await (0, createAllJobs_1.createAllJobs)({
-        config,
-        trigger,
-        pipelineType,
-    });
-    const stages = (0, getPipelineStages_1.getPipelineStages)(config);
-    if (pipelineType === "gitlab") {
-        const gitlabJobs = await (0, createGitlabJobs_1.createGitlabJobs)(jobs);
-        return (0, createGitlabPipeline_1.createGitlabPipelineWithDefaults)({
-            workflow: {
-                rules: rules_1.RULES_ALWAYS,
-            },
-            stages,
-            jobs: Object.fromEntries(gitlabJobs.map(({ gitlabJob, name }) => [name, gitlabJob])),
-            variables: config.runnerVariables,
-        });
-    }
-    throw new Error(`${pipelineType} is not supported`);
-};
-exports.createChildPipeline = createChildPipeline;
-//# sourceMappingURL=createChildPipeline.js.map

package/dist/pipeline/src/pipeline/createChildPipeline.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"createChildPipeline.js","sourceRoot":"","sources":["../../../../../pipeline/src/pipeline/createChildPipeline.ts"],"names":[],"mappings":";;;AAAA,oCAAwC;AAIxC,mDAAgD;AAChD,2DAAwD;AACxD,gEAA6D;AAC7D,wEAAiF;AAE1E,MAAM,mBAAmB,GAAG,KAAK,EACtC,YAAe,EACf,OAAwB,EACxB,MAAc,EACQ,EAAE;IACxB,MAAM,IAAI,GAAG,MAAM,IAAA,6BAAa,EAAC;QAC/B,MAAM;QACN,OAAO;QACP,YAAY;KACb,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,IAAA,qCAAiB,EAAC,MAAM,CAAC,CAAC;IAEzC,IAAI,YAAY,KAAK,QAAQ,EAAE,CAAC;QAC9B,MAAM,UAAU,GAAG,MAAM,IAAA,mCAAgB,EAAC,IAAI,CAAC,CAAC;QAChD,OAAO,IAAA,uDAAgC,EAAC;YACtC,QAAQ,EAAE;gBACR,KAAK,EAAE,oBAAY;aACpB;YACD,MAAM;YACN,IAAI,EAAE,MAAM,CAAC,WAAW,CACtB,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAC3D;YACD,SAAS,EAAE,MAAM,CAAC,eAAe;SAClC,CAAgB,CAAC;IACpB,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,GAAG,YAAY,mBAAmB,CAAC,CAAC;AACtD,CAAC,CAAC;AA3BW,QAAA,mBAAmB,uBA2B9B"}

package/dist/pipeline/src/pipeline/gitlab/getPipelineTriggerForGitlabChildPipeline.d.ts

@@ -1 +0,0 @@
-export declare function getPipelineTriggerForGitlabChildPipeline(): "mainBranch" | "mr" | "taggedRelease";

package/dist/pipeline/src/pipeline/gitlab/getPipelineTriggerForGitlabChildPipeline.js

@@ -1,32 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPipelineTriggerForGitlabChildPipeline = void 0;
-const constants_1 = require("../../constants");
-function getPipelineTriggerForGitlabChildPipeline() {
-    const { CI_MERGE_REQUEST_ID, CI_COMMIT_TAG, CI_COMMIT_BRANCH, CI_DEFAULT_BRANCH, } = process.env;
-    const isDefaultBranch = Boolean(CI_DEFAULT_BRANCH) && CI_COMMIT_BRANCH === CI_DEFAULT_BRANCH;
-    const isHotfixBranch = CI_COMMIT_BRANCH
-        ? /^[0-9]+\.([0-9]+|x)\.x$/.test(CI_COMMIT_BRANCH)
-        : false;
-    const isMergeRequest = Boolean(CI_MERGE_REQUEST_ID);
-    const isTaggedRelease = Boolean(CI_COMMIT_TAG);
-    console.info(`catladder version ${constants_1.PIPELINE_IMAGE_TAG}`);
-    const trigger = isMergeRequest || isHotfixBranch
-        ? "mr"
-        : isDefaultBranch
-            ? "mainBranch"
-            : isTaggedRelease
-                ? "taggedRelease"
-                : null;
-    if (!trigger) {
-        throw new Error("no matching trigger: " +
-            JSON.stringify({
-                isMergeRequest,
-                isDefaultBranch,
-                isTaggedRelease,
-            }, null, 2));
-    }
-    return trigger;
-}
-exports.getPipelineTriggerForGitlabChildPipeline = getPipelineTriggerForGitlabChildPipeline;
-//# sourceMappingURL=getPipelineTriggerForGitlabChildPipeline.js.map

package/dist/pipeline/src/pipeline/gitlab/getPipelineTriggerForGitlabChildPipeline.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getPipelineTriggerForGitlabChildPipeline.js","sourceRoot":"","sources":["../../../../../../pipeline/src/pipeline/gitlab/getPipelineTriggerForGitlabChildPipeline.ts"],"names":[],"mappings":";;;AACA,+CAAqD;AAErD,SAAgB,wCAAwC;IACtD,MAAM,EACJ,mBAAmB,EACnB,aAAa,EACb,gBAAgB,EAChB,iBAAiB,GAClB,GAAG,OAAO,CAAC,GAAG,CAAC;IAEhB,MAAM,eAAe,GACnB,OAAO,CAAC,iBAAiB,CAAC,IAAI,gBAAgB,KAAK,iBAAiB,CAAC;IACvE,MAAM,cAAc,GAAG,gBAAgB;QACrC,CAAC,CAAC,yBAAyB,CAAC,IAAI,CAAC,gBAAgB,CAAC;QAClD,CAAC,CAAC,KAAK,CAAC;IACV,MAAM,cAAc,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACpD,MAAM,eAAe,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAE/C,OAAO,CAAC,IAAI,CAAC,qBAAqB,8BAAkB,EAAE,CAAC,CAAC;IAExD,MAAM,OAAO,GACX,cAAc,IAAI,cAAc;QAC9B,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,eAAe;YACf,CAAC,CAAC,YAAY;YACd,CAAC,CAAC,eAAe;gBACf,CAAC,CAAC,eAAe;gBACjB,CAAC,CAAC,IAAI,CAAC;IAEf,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CACb,uBAAuB;YACrB,IAAI,CAAC,SAAS,CACZ;gBACE,cAAc;gBACd,eAAe;gBACf,eAAe;aAChB,EACD,IAAI,EACJ,CAAC,CACF,CACJ,CAAC;IACJ,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AA1CD,4FA0CC"}