@catladder/cli 0.0.0-main-ed835115 → 0.0.0-main-8a770211

package/dist/bundles/catci/index.js

@@ -8286,6 +8286,120 @@ exports.UserStarredMetricsDashboard = UserStarredMetricsDashboard;
 exports.Users = Users;
 
 
+/***/ }),
+
+/***/ 6575:
+/***/ ((module) => {
+
+"use strict";
+
+var ESC = '\u001b[';
+var x = module.exports;
+
+x.cursorTo = function (x, y) {
+	if (arguments.length === 0) {
+		return ESC + 'H';
+	}
+
+	if (arguments.length === 1) {
+		return ESC + (x + 1) + 'G';
+	}
+
+	return ESC + (y + 1) + ';' + (x + 1) + 'H';
+};
+
+x.cursorMove = function (x, y) {
+	var ret = '';
+
+	if (x < 0) {
+		ret += ESC + (-x) + 'D';
+	} else if (x > 0) {
+		ret += ESC + x + 'C';
+	}
+
+	if (y < 0) {
+		ret += ESC + (-y) + 'A';
+	} else if (y > 0) {
+		ret += ESC + y + 'B';
+	}
+
+	return ret;
+};
+
+x.cursorUp = function (count) {
+	return ESC + (typeof count === 'number' ? count : 1) + 'A';
+};
+
+x.cursorDown = function (count) {
+	return ESC + (typeof count === 'number' ? count : 1) + 'B';
+};
+
+x.cursorForward = function (count) {
+	return ESC + (typeof count === 'number' ? count : 1) + 'C';
+};
+
+x.cursorBackward = function (count) {
+	return ESC + (typeof count === 'number' ? count : 1) + 'D';
+};
+
+x.cursorLeft = ESC + '1000D';
+x.cursorSavePosition = ESC + 's';
+x.cursorRestorePosition = ESC + 'u';
+x.cursorGetPosition = ESC + '6n';
+x.cursorNextLine = ESC + 'E';
+x.cursorPrevLine = ESC + 'F';
+x.cursorHide = ESC + '?25l';
+x.cursorShow = ESC + '?25h';
+
+x.eraseLines = function (count) {
+	var clear = '';
+
+	for (var i = 0; i < count; i++) {
+		clear += x.cursorLeft + x.eraseEndLine + (i < count - 1 ? x.cursorUp() : '');
+	}
+
+	return clear;
+};
+
+x.eraseEndLine = ESC + 'K';
+x.eraseStartLine = ESC + '1K';
+x.eraseLine = ESC + '2K';
+x.eraseDown = ESC + 'J';
+x.eraseUp = ESC + '1J';
+x.eraseScreen = ESC + '2J';
+x.scrollUp = ESC + 'S';
+x.scrollDown = ESC + 'T';
+
+x.clearScreen = '\u001bc';
+x.beep = '\u0007';
+
+x.image = function (buf, opts) {
+	opts = opts || {};
+
+	var ret = '\u001b]1337;File=inline=1';
+
+	if (opts.width) {
+		ret += ';width=' + opts.width;
+	}
+
+	if (opts.height) {
+		ret += ';height=' + opts.height;
+	}
+
+	if (opts.preserveAspectRatio === false) {
+		ret += ';preserveAspectRatio=0';
+	}
+
+	return ret + ':' + buf.toString('base64') + '\u0007';
+};
+
+x.iTerm = {};
+
+x.iTerm.setCwd = function (cwd) {
+	return '\u001b]50;CurrentDir=' + (cwd || process.cwd()) + '\u0007';
+};
+
+
 /***/ }),
 
 /***/ 5067:
@@ -22747,7 +22861,7 @@ Paginator.prototype.paginate = function (output, active) {
 
 "use strict";
 
-var ansiEscapes = __nccwpck_require__(4497);
+var ansiEscapes = __nccwpck_require__(6575);
 
 /**
  * Move cursor left by `x`
@@ -22975,120 +23089,6 @@ exports.fetchAsyncQuestionProperty = function (question, prop, answers) {
 };
 
 
-/***/ }),
-
-/***/ 4497:
-/***/ ((module) => {
-
-"use strict";
-
-var ESC = '\u001b[';
-var x = module.exports;
-
-x.cursorTo = function (x, y) {
-	if (arguments.length === 0) {
-		return ESC + 'H';
-	}
-
-	if (arguments.length === 1) {
-		return ESC + (x + 1) + 'G';
-	}
-
-	return ESC + (y + 1) + ';' + (x + 1) + 'H';
-};
-
-x.cursorMove = function (x, y) {
-	var ret = '';
-
-	if (x < 0) {
-		ret += ESC + (-x) + 'D';
-	} else if (x > 0) {
-		ret += ESC + x + 'C';
-	}
-
-	if (y < 0) {
-		ret += ESC + (-y) + 'A';
-	} else if (y > 0) {
-		ret += ESC + y + 'B';
-	}
-
-	return ret;
-};
-
-x.cursorUp = function (count) {
-	return ESC + (typeof count === 'number' ? count : 1) + 'A';
-};
-
-x.cursorDown = function (count) {
-	return ESC + (typeof count === 'number' ? count : 1) + 'B';
-};
-
-x.cursorForward = function (count) {
-	return ESC + (typeof count === 'number' ? count : 1) + 'C';
-};
-
-x.cursorBackward = function (count) {
-	return ESC + (typeof count === 'number' ? count : 1) + 'D';
-};
-
-x.cursorLeft = ESC + '1000D';
-x.cursorSavePosition = ESC + 's';
-x.cursorRestorePosition = ESC + 'u';
-x.cursorGetPosition = ESC + '6n';
-x.cursorNextLine = ESC + 'E';
-x.cursorPrevLine = ESC + 'F';
-x.cursorHide = ESC + '?25l';
-x.cursorShow = ESC + '?25h';
-
-x.eraseLines = function (count) {
-	var clear = '';
-
-	for (var i = 0; i < count; i++) {
-		clear += x.cursorLeft + x.eraseEndLine + (i < count - 1 ? x.cursorUp() : '');
-	}
-
-	return clear;
-};
-
-x.eraseEndLine = ESC + 'K';
-x.eraseStartLine = ESC + '1K';
-x.eraseLine = ESC + '2K';
-x.eraseDown = ESC + 'J';
-x.eraseUp = ESC + '1J';
-x.eraseScreen = ESC + '2J';
-x.scrollUp = ESC + 'S';
-x.scrollDown = ESC + 'T';
-
-x.clearScreen = '\u001bc';
-x.beep = '\u0007';
-
-x.image = function (buf, opts) {
-	opts = opts || {};
-
-	var ret = '\u001b]1337;File=inline=1';
-
-	if (opts.width) {
-		ret += ';width=' + opts.width;
-	}
-
-	if (opts.height) {
-		ret += ';height=' + opts.height;
-	}
-
-	if (opts.preserveAspectRatio === false) {
-		ret += ';preserveAspectRatio=0';
-	}
-
-	return ret + ':' + buf.toString('base64') + '\u0007';
-};
-
-x.iTerm = {};
-
-x.iTerm.setCwd = function (cwd) {
-	return '\u001b]50;CurrentDir=' + (cwd || process.cwd()) + '\u0007';
-};
-
-
 /***/ }),
 
 /***/ 6695:
@@ -69626,120 +69626,6 @@ Object.defineProperty(vorpal, 'activeCommand', {
   }
 });
 
-/***/ }),
-
-/***/ 7374:
-/***/ ((module) => {
-
-"use strict";
-
-var ESC = '\u001b[';
-var x = module.exports;
-
-x.cursorTo = function (x, y) {
-	if (arguments.length === 0) {
-		return ESC + 'H';
-	}
-
-	if (arguments.length === 1) {
-		return ESC + (x + 1) + 'G';
-	}
-
-	return ESC + (y + 1) + ';' + (x + 1) + 'H';
-};
-
-x.cursorMove = function (x, y) {
-	var ret = '';
-
-	if (x < 0) {
-		ret += ESC + (-x) + 'D';
-	} else if (x > 0) {
-		ret += ESC + x + 'C';
-	}
-
-	if (y < 0) {
-		ret += ESC + (-y) + 'A';
-	} else if (y > 0) {
-		ret += ESC + y + 'B';
-	}
-
-	return ret;
-};
-
-x.cursorUp = function (count) {
-	return ESC + (typeof count === 'number' ? count : 1) + 'A';
-};
-
-x.cursorDown = function (count) {
-	return ESC + (typeof count === 'number' ? count : 1) + 'B';
-};
-
-x.cursorForward = function (count) {
-	return ESC + (typeof count === 'number' ? count : 1) + 'C';
-};
-
-x.cursorBackward = function (count) {
-	return ESC + (typeof count === 'number' ? count : 1) + 'D';
-};
-
-x.cursorLeft = ESC + '1000D';
-x.cursorSavePosition = ESC + 's';
-x.cursorRestorePosition = ESC + 'u';
-x.cursorGetPosition = ESC + '6n';
-x.cursorNextLine = ESC + 'E';
-x.cursorPrevLine = ESC + 'F';
-x.cursorHide = ESC + '?25l';
-x.cursorShow = ESC + '?25h';
-
-x.eraseLines = function (count) {
-	var clear = '';
-
-	for (var i = 0; i < count; i++) {
-		clear += x.cursorLeft + x.eraseEndLine + (i < count - 1 ? x.cursorUp() : '');
-	}
-
-	return clear;
-};
-
-x.eraseEndLine = ESC + 'K';
-x.eraseStartLine = ESC + '1K';
-x.eraseLine = ESC + '2K';
-x.eraseDown = ESC + 'J';
-x.eraseUp = ESC + '1J';
-x.eraseScreen = ESC + '2J';
-x.scrollUp = ESC + 'S';
-x.scrollDown = ESC + 'T';
-
-x.clearScreen = '\u001bc';
-x.beep = '\u0007';
-
-x.image = function (buf, opts) {
-	opts = opts || {};
-
-	var ret = '\u001b]1337;File=inline=1';
-
-	if (opts.width) {
-		ret += ';width=' + opts.width;
-	}
-
-	if (opts.height) {
-		ret += ';height=' + opts.height;
-	}
-
-	if (opts.preserveAspectRatio === false) {
-		ret += ';preserveAspectRatio=0';
-	}
-
-	return ret + ':' + buf.toString('base64') + '\u0007';
-};
-
-x.iTerm = {};
-
-x.iTerm.setCwd = function (cwd) {
-	return '\u001b]50;CurrentDir=' + (cwd || process.cwd()) + '\u0007';
-};
-
-
 /***/ }),
 
 /***/ 1982:
@@ -70018,7 +69904,7 @@ module.exports = function (x) {
 
 "use strict";
 
-var ansiEscapes = __nccwpck_require__(7374);
+var ansiEscapes = __nccwpck_require__(6575);
 var cliCursor = __nccwpck_require__(2701);
 
 function main(stream) {

package/dist/bundles/catenv/index.js

@@ -2520,16 +2520,16 @@ exports.createRailsBuildJobs = createRailsBuildJobs;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.createRailsJobs = void 0;
 const build_1 = __nccwpck_require__(7261);
-const test_1 = __nccwpck_require__(7910);
+const testJob_1 = __nccwpck_require__(5771);
 const createRailsJobs = (context) => {
-    return [...(0, test_1.createRailsTestJobs)(context), ...(0, build_1.createRailsBuildJobs)(context)];
+    return [...(0, testJob_1.createRailsTestJobs)(context), ...(0, build_1.createRailsBuildJobs)(context)];
 };
 exports.createRailsJobs = createRailsJobs;
 //# sourceMappingURL=index.js.map
 
 /***/ }),
 
-/***/ 7910:
+/***/ 5771:
 /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
 
 "use strict";
@@ -2636,7 +2636,7 @@ const createRailsTestJobs = (context) => {
     return [auditJob, lintJob, testJob].filter(utils_1.notNil);
 };
 exports.createRailsTestJobs = createRailsTestJobs;
-//# sourceMappingURL=test.js.map
+//# sourceMappingURL=testJob.js.map
 
 /***/ }),
 
@@ -4214,6 +4214,7 @@ exports.ENV_VARS_FILENAME = "____envvars.yaml";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.getOnDeployExecuteScript = void 0;
+const utils_1 = __nccwpck_require__(2497);
 const createArgsString_1 = __nccwpck_require__(9598);
 const getJobOrServiceArgs_1 = __nccwpck_require__(1741);
 const jobName_1 = __nccwpck_require__(9626);
@@ -4223,7 +4224,7 @@ const getOnDeployExecuteScript = (context, when) => {
     const executes = getExecutes(context);
     return executes
         .filter(({ config }) => config.when === when)
-        .map((execute) => {
+        .flatMap((execute) => {
         return getJobRunScriptForExecute(context, execute);
     });
 };
@@ -4234,7 +4235,8 @@ const getExecutes = (context) => {
     return [
         ...getLegacyExecutes(context),
         ...Object.entries((_a = deployConfig.execute) !== null && _a !== void 0 ? _a : {}).flatMap(([key, value]) => {
-            if (!value || (value.when !== "schedule" && value.type !== "job")) {
+            // remove all schedule executes
+            if (!value) {
                 return [];
             }
             return [
@@ -4272,21 +4274,30 @@ const getLegacyExecutes = (context) => {
 };
 const getJobRunScriptForExecute = (context, { jobName, config }) => {
     var _a;
-    const commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
-    // always wait for completion for preStop and postStop jobs
-    // since stop will delete the jobs afterwards, so they will fail
-    const waitForCompletion = ["preStop", "postStop"].includes(config.when)
-        ? true // always
-        : "waitForCompletion" in config
-            ? ((_a = config.waitForCompletion) !== null && _a !== void 0 ? _a : false) // depends on config
-            : false;
-    const argString = (0, createArgsString_1.createArgsString)({
-        ...commonArgs,
-        wait: waitForCompletion === true ? true : undefined,
-        args: (0, getJobOrServiceArgs_1.getCloudRunServiceOrJobArgsArg)(config.args),
-    });
-    const fullJobName = (0, jobName_1.getFullJobName)(context, jobName);
-    return `${(0, common_1.gcloudRunCmd)()} jobs execute ${fullJobName.toString()} ${argString}`;
+    const type = config.type;
+    if (type === "script") {
+        return (0, utils_1.ensureArray)(config.script);
+    }
+    else if (type === "job") {
+        const commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
+        // always wait for completion for preStop and postStop jobs
+        // since stop will delete the jobs afterwards, so they will fail
+        const waitForCompletion = ["preStop", "postStop"].includes(config.when)
+            ? true // always
+            : "waitForCompletion" in config
+                ? ((_a = config.waitForCompletion) !== null && _a !== void 0 ? _a : false) // depends on config
+                : false;
+        const argString = (0, createArgsString_1.createArgsString)({
+            ...commonArgs,
+            wait: waitForCompletion === true ? true : undefined,
+            args: (0, getJobOrServiceArgs_1.getCloudRunServiceOrJobArgsArg)(config.args),
+        });
+        const fullJobName = (0, jobName_1.getFullJobName)(context, jobName);
+        return [
+            `${(0, common_1.gcloudRunCmd)()} jobs execute ${fullJobName.toString()} ${argString}`,
+        ];
+    }
+    throw new Error(`unsupported execute type: ${type}`);
 };
 //# sourceMappingURL=onDeploy.js.map