@catladder/cli 1.162.0 → 1.163.1

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

@@ -98,6 +98,9 @@ export type BuildConfigNode = {
     docker?: Omit<BuildConfigDockerBuiltInNode, "type"> | BuildConfigDocker;
 } & BuildConfigNodeBase;
 export type BuildConfigNodeStatic = BuildConfigNodeBase & {
+    /**
+     * @deprecated use type: "node" and docker: { type: "nginx" } instead
+     */
     type: "node-static";
     startCommand?: never;
     docker?: Omit<BuildConfigDockerBuiltInNgninx, "type"> | BuildConfigDocker;
@@ -221,6 +224,9 @@ export type BuildConfigRails = BuildConfigBase & {
     };
 };
 export type BuildConfigStorybook = BuildConfigNodeBase & {
+    /**
+     * @deprecated use type: "node" and docker: { type: "nginx" } instead
+     */
     type: "storybook";
     startCommand?: never;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/types.ts"],"names":[],"mappings":";;;AAgTO,IAAM,uBAAuB,GAAG,UACrC,CAAsB;IAEtB,IAAI,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IACrB,OAAO,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC;AACxB,CAAC,CAAC;AALW,QAAA,uBAAuB,2BAKlC;AAEK,IAAM,aAAa,GAAG,UAC3B,CAAc;IACd,eAAW;SAAX,UAAW,EAAX,qBAAW,EAAX,IAAW;QAAX,8BAAW;;IAEX,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"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/types.ts"],"names":[],"mappings":";;;AAsTO,IAAM,uBAAuB,GAAG,UACrC,CAAsB;IAEtB,IAAI,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IACrB,OAAO,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC;AACxB,CAAC,CAAC;AALW,QAAA,uBAAuB,2BAKlC;AAEK,IAAM,aAAa,GAAG,UAC3B,CAAc;IACd,eAAW;SAAX,UAAW,EAAX,qBAAW,EAAX,IAAW;QAAX,8BAAW;;IAEX,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/pipeline/generatePipelineFiles.d.ts

@@ -1,2 +1,40 @@
 import type { Config, PipelineMode, PipelineType } from "../types";
+export declare function generateChildPipelineContent<T extends PipelineType>(config: Config, pipelineType: T): Promise<{
+    image: string;
+    stages: string[];
+    variables: import("../types/gitlab-ci-yml").JobVariables1;
+    workflow: {
+        rules: {
+            if?: string;
+            changes?: import("../types/gitlab-ci-yml").Changes;
+            exists?: import("../types/gitlab-ci-yml").Exists;
+            variables?: import("../types/gitlab-ci-yml").RulesVariables;
+            when?: import("../types/gitlab-ci-yml").When;
+            start_in?: string;
+            allow_failure?: import("../types/gitlab-ci-yml").AllowFailure;
+            needs?: import("../types/gitlab-ci-yml").RulesNeeds;
+        }[];
+    };
+} & Omit<import("../types").Pipeline<T>, "image" | "jobs" | "variables" | "workflow" | "stages"> & {
+    [k: string]: import("../types").GitlabJobDef;
+}>;
+export declare function generateLocalPipelineContent<T extends PipelineType>(config: Config, pipelineType: T): Promise<{
+    image: string;
+    stages: string[];
+    variables: import("../types/gitlab-ci-yml").JobVariables1;
+    workflow: {
+        rules: {
+            if?: string;
+            changes?: import("../types/gitlab-ci-yml").Changes;
+            exists?: import("../types/gitlab-ci-yml").Exists;
+            variables?: import("../types/gitlab-ci-yml").RulesVariables;
+            when?: import("../types/gitlab-ci-yml").When;
+            start_in?: string;
+            allow_failure?: import("../types/gitlab-ci-yml").AllowFailure;
+            needs?: import("../types/gitlab-ci-yml").RulesNeeds;
+        }[];
+    };
+} & Omit<import("../types").Pipeline<T>, "image" | "jobs" | "variables" | "workflow" | "stages"> & {
+    [k: string]: import("../types").GitlabJobDef;
+}>;
 export declare function generatePipelineFiles<T extends PipelineType>(config: Config, pipelineType: T, mode: PipelineMode<T>): Promise<void>;

package/dist/pipeline/src/pipeline/generatePipelineFiles.js

@@ -74,23 +74,22 @@ var __read = (this && this.__read) || function (o, n) {
     return ar;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generatePipelineFiles = void 0;
+exports.generatePipelineFiles = exports.generateLocalPipelineContent = exports.generateChildPipelineContent = void 0;
 var writeFiles_1 = require("../utils/writeFiles");
 var createChildPipeline_1 = require("./createChildPipeline");
 var createMainPipeline_1 = require("./createMainPipeline");
 var getPipelineTriggerForGitlabChildPipeline_1 = require("./gitlab/getPipelineTriggerForGitlabChildPipeline");
 var sortGitLabJobDefProps_1 = require("./gitlab/sortGitLabJobDefProps");
-function generatePipelineFiles(config, pipelineType, mode) {
+function generateChildPipelineContent(config, pipelineType) {
     return __awaiter(this, void 0, void 0, function () {
-        var trigger, _a, jobs, image, stages, variables, workflow, pipelineRest, jobsWithSortedProps, _b, jobs, image, stages, variables, workflow, pipelineRest, jobsWithSortedProps;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+        var trigger, _a, jobs, image, stages, variables, workflow, pipelineRest, jobsWithSortedProps;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
-                    if (!(mode === "childpipeline")) return [3 /*break*/, 3];
                     trigger = (0, getPipelineTriggerForGitlabChildPipeline_1.getPipelineTriggerForGitlabChildPipeline)();
                     return [4 /*yield*/, (0, createChildPipeline_1.createChildPipeline)(pipelineType, trigger, config)];
                 case 1:
-                    _a = _c.sent(), jobs = _a.jobs, image = _a.image, stages = _a.stages, variables = _a.variables, workflow = _a.workflow, pipelineRest = __rest(_a, ["jobs", "image", "stages", "variables", "workflow"]);
+                    _a = _b.sent(), jobs = _a.jobs, image = _a.image, stages = _a.stages, variables = _a.variables, workflow = _a.workflow, pipelineRest = __rest(_a, ["jobs", "image", "stages", "variables", "workflow"]);
                     jobsWithSortedProps = Object.fromEntries(Object.entries(jobs).map(function (_a) {
                         var _b = __read(_a, 2), jobName = _b[0], job = _b[1];
                         return [
@@ -98,13 +97,20 @@ function generatePipelineFiles(config, pipelineType, mode) {
                             (0, sortGitLabJobDefProps_1.sortGitLabJobDefProps)(job),
                         ];
                     }));
-                    return [4 /*yield*/, (0, writeFiles_1.writeYamlfile)("__pipeline.yml", __assign(__assign({ image: image, stages: stages, variables: variables, workflow: workflow }, pipelineRest), jobsWithSortedProps))];
-                case 2:
-                    _c.sent();
-                    return [3 /*break*/, 6];
-                case 3: return [4 /*yield*/, (0, createMainPipeline_1.createMainPipeline)(pipelineType, config)];
-                case 4:
-                    _b = _c.sent(), jobs = _b.jobs, image = _b.image, stages = _b.stages, variables = _b.variables, workflow = _b.workflow, pipelineRest = __rest(_b, ["jobs", "image", "stages", "variables", "workflow"]);
+                    return [2 /*return*/, __assign(__assign({ image: image, stages: stages, variables: variables, workflow: workflow }, pipelineRest), jobsWithSortedProps)];
+            }
+        });
+    });
+}
+exports.generateChildPipelineContent = generateChildPipelineContent;
+function generateLocalPipelineContent(config, pipelineType) {
+    return __awaiter(this, void 0, void 0, function () {
+        var _a, jobs, image, stages, variables, workflow, pipelineRest, jobsWithSortedProps;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0: return [4 /*yield*/, (0, createMainPipeline_1.createMainPipeline)(pipelineType, config)];
+                case 1:
+                    _a = _b.sent(), jobs = _a.jobs, image = _a.image, stages = _a.stages, variables = _a.variables, workflow = _a.workflow, pipelineRest = __rest(_a, ["jobs", "image", "stages", "variables", "workflow"]);
                     jobsWithSortedProps = Object.fromEntries(Object.entries(jobs).map(function (_a) {
                         var _b = __read(_a, 2), jobName = _b[0], job = _b[1];
                         return [
@@ -112,11 +118,27 @@ function generatePipelineFiles(config, pipelineType, mode) {
                             (0, sortGitLabJobDefProps_1.sortGitLabJobDefProps)(job),
                         ];
                     }));
-                    return [4 /*yield*/, (0, writeFiles_1.writeYamlfile)(".gitlab-ci.yml", __assign(__assign({ image: image, stages: stages, variables: variables, workflow: workflow }, pipelineRest), jobsWithSortedProps))];
-                case 5:
-                    _c.sent();
-                    _c.label = 6;
-                case 6: return [2 /*return*/];
+                    return [2 /*return*/, __assign(__assign({ image: image, stages: stages, variables: variables, workflow: workflow }, pipelineRest), jobsWithSortedProps)];
+            }
+        });
+    });
+}
+exports.generateLocalPipelineContent = generateLocalPipelineContent;
+function generatePipelineFiles(config, pipelineType, mode) {
+    return __awaiter(this, void 0, void 0, function () {
+        var pipelineContent_1, pipelineContent;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!(mode === "childpipeline")) return [3 /*break*/, 2];
+                    return [4 /*yield*/, generateChildPipelineContent(config, pipelineType)];
+                case 1:
+                    pipelineContent_1 = _a.sent();
+                    return [2 /*return*/, (0, writeFiles_1.writeYamlfile)("__pipeline.yml", pipelineContent_1)];
+                case 2: return [4 /*yield*/, generateLocalPipelineContent(config, pipelineType)];
+                case 3:
+                    pipelineContent = _a.sent();
+                    return [2 /*return*/, (0, writeFiles_1.writeYamlfile)(".gitlab-ci.yml", pipelineContent)];
             }
         });
     });

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

@@ -1 +1 @@
-{"version":3,"file":"generatePipelineFiles.js","sourceRoot":"","sources":["../../../../../pipeline/src/pipeline/generatePipelineFiles.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,kDAAoD;AACpD,6DAA4D;AAC5D,2DAA0D;AAC1D,8GAA6G;AAC7G,wEAAuE;AACvE,SAAsB,qBAAqB,CACzC,MAAc,EACd,YAAe,EACf,IAAqB;;;;;;yBAEjB,CAAA,IAAI,KAAK,eAAe,CAAA,EAAxB,wBAAwB;oBACpB,OAAO,GAAG,IAAA,mFAAwC,GAAE,CAAC;oBAGzD,qBAAM,IAAA,yCAAmB,EAAC,YAAY,EAAE,OAAO,EAAE,MAAM,CAAC,EAAA;;oBADpD,KACJ,SAAwD,EADlD,IAAI,UAAA,EAAE,KAAK,WAAA,EAAE,MAAM,YAAA,EAAE,SAAS,eAAA,EAAE,QAAQ,cAAA,EAAK,YAAY,cAA3D,oDAA6D,CAAF;oBAE3D,mBAAmB,GAAG,MAAM,CAAC,WAAW,CAC5C,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,UAAC,EAAc;4BAAd,KAAA,aAAc,EAAb,OAAO,QAAA,EAAE,GAAG,QAAA;wBAAM,OAAA;4BAC3C,OAAO;4BACP,IAAA,6CAAqB,EAAC,GAAG,CAAC;yBAC3B;oBAH4C,CAG5C,CAAC,CACH,CAAC;oBACF,qBAAM,IAAA,0BAAa,EAAC,gBAAgB,sBAClC,KAAK,OAAA,EACL,MAAM,QAAA,EACN,SAAS,WAAA,EACT,QAAQ,UAAA,IACL,YAAY,GAEZ,mBAAmB,EACtB,EAAA;;oBARF,SAQE,CAAC;;wBAGD,qBAAM,IAAA,uCAAkB,EAAC,YAAY,EAAE,MAAM,CAAC,EAAA;;oBAD1C,KACJ,SAA8C,EADxC,IAAI,UAAA,EAAE,KAAK,WAAA,EAAE,MAAM,YAAA,EAAE,SAAS,eAAA,EAAE,QAAQ,cAAA,EAAK,YAAY,cAA3D,oDAA6D,CAAF;oBAE3D,mBAAmB,GAAG,MAAM,CAAC,WAAW,CAC5C,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,UAAC,EAAc;4BAAd,KAAA,aAAc,EAAb,OAAO,QAAA,EAAE,GAAG,QAAA;wBAAM,OAAA;4BAC3C,OAAO;4BACP,IAAA,6CAAqB,EAAC,GAAG,CAAC;yBAC3B;oBAH4C,CAG5C,CAAC,CACH,CAAC;oBACF,qBAAM,IAAA,0BAAa,EAAC,gBAAgB,sBAClC,KAAK,OAAA,EACL,MAAM,QAAA,EACN,SAAS,WAAA,EACT,QAAQ,UAAA,IACL,YAAY,GAEZ,mBAAmB,EACtB,EAAA;;oBARF,SAQE,CAAC;;;;;;CAEN;AA5CD,sDA4CC"}
+{"version":3,"file":"generatePipelineFiles.js","sourceRoot":"","sources":["../../../../../pipeline/src/pipeline/generatePipelineFiles.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,kDAAoD;AACpD,6DAA4D;AAC5D,2DAA0D;AAC1D,8GAA6G;AAC7G,wEAAuE;AAEvE,SAAsB,4BAA4B,CAChD,MAAc,EACd,YAAe;;;;;;oBAET,OAAO,GAAG,IAAA,mFAAwC,GAAE,CAAC;oBAEzD,qBAAM,IAAA,yCAAmB,EAAC,YAAY,EAAE,OAAO,EAAE,MAAM,CAAC,EAAA;;oBADpD,KACJ,SAAwD,EADlD,IAAI,UAAA,EAAE,KAAK,WAAA,EAAE,MAAM,YAAA,EAAE,SAAS,eAAA,EAAE,QAAQ,cAAA,EAAK,YAAY,cAA3D,oDAA6D,CAAF;oBAG3D,mBAAmB,GAAG,MAAM,CAAC,WAAW,CAC5C,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,UAAC,EAAc;4BAAd,KAAA,aAAc,EAAb,OAAO,QAAA,EAAE,GAAG,QAAA;wBAAM,OAAA;4BAC3C,OAAO;4BACP,IAAA,6CAAqB,EAAC,GAAG,CAAC;yBAC3B;oBAH4C,CAG5C,CAAC,CACH,CAAC;oBAEF,0CACE,KAAK,OAAA,EACL,MAAM,QAAA,EACN,SAAS,WAAA,EACT,QAAQ,UAAA,IACL,YAAY,GAEZ,mBAAmB,GACtB;;;;CACH;AAxBD,oEAwBC;AAED,SAAsB,4BAA4B,CAChD,MAAc,EACd,YAAe;;;;;wBAGb,qBAAM,IAAA,uCAAkB,EAAC,YAAY,EAAE,MAAM,CAAC,EAAA;;oBAD1C,KACJ,SAA8C,EADxC,IAAI,UAAA,EAAE,KAAK,WAAA,EAAE,MAAM,YAAA,EAAE,SAAS,eAAA,EAAE,QAAQ,cAAA,EAAK,YAAY,cAA3D,oDAA6D,CAAF;oBAG3D,mBAAmB,GAAG,MAAM,CAAC,WAAW,CAC5C,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,UAAC,EAAc;4BAAd,KAAA,aAAc,EAAb,OAAO,QAAA,EAAE,GAAG,QAAA;wBAAM,OAAA;4BAC3C,OAAO;4BACP,IAAA,6CAAqB,EAAC,GAAG,CAAC;yBAC3B;oBAH4C,CAG5C,CAAC,CACH,CAAC;oBAEF,0CACE,KAAK,OAAA,EACL,MAAM,QAAA,EACN,SAAS,WAAA,EACT,QAAQ,UAAA,IACL,YAAY,GAEZ,mBAAmB,GACtB;;;;CACH;AAvBD,oEAuBC;AAED,SAAsB,qBAAqB,CACzC,MAAc,EACd,YAAe,EACf,IAAqB;;;;;;yBAEjB,CAAA,IAAI,KAAK,eAAe,CAAA,EAAxB,wBAAwB;oBACF,qBAAM,4BAA4B,CACxD,MAAM,EACN,YAAY,CACb,EAAA;;oBAHK,oBAAkB,SAGvB;oBACD,sBAAO,IAAA,0BAAa,EAAC,gBAAgB,EAAE,iBAAe,CAAC,EAAC;wBAElC,qBAAM,4BAA4B,CACxD,MAAM,EACN,YAAY,CACb,EAAA;;oBAHK,eAAe,GAAG,SAGvB;oBACD,sBAAO,IAAA,0BAAa,EAAC,gBAAgB,EAAE,eAAe,CAAC,EAAC;;;;CACzD;AAjBD,sDAiBC"}