@catladder/cli 0.0.0-refactor-docker-45f6e733 → 0.0.0-refactor-cache-b38c122b

package/dist/pipeline/src/build/node/yarn.js

@@ -1,74 +1,59 @@
 "use strict";
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDockerAppCopyAndBuildScript = exports.getYarnInstall = exports.ensureNodeVersion = void 0;
-var BashExpression_1 = require("../../bash/BashExpression");
-var utils_1 = require("../../utils");
-var gitlab_1 = require("../../utils/gitlab");
-var YARN_INSTALL_CLASSIC = "yarn install --frozen-lockfile";
+const BashExpression_1 = require("../../bash/BashExpression");
+const utils_1 = require("../../utils");
+const gitlab_1 = require("../../utils/gitlab");
+const YARN_INSTALL_CLASSIC = `yarn install --frozen-lockfile`;
 // FIXME: check why and when rebuild is needed
-var YARN_BERRY_PROD_REBUILD = "yarn workspaces focus --production && yarn rebuild";
-var getYarnInstallCommand = function (context) {
-    var _a;
-    if ((_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.isClassic) {
+const YARN_BERRY_PROD_REBUILD = `yarn workspaces focus --production && yarn rebuild`;
+const getYarnInstallCommand = (context) => {
+    if (context.packageManagerInfo.isClassic) {
         return YARN_INSTALL_CLASSIC;
     }
-    return "yarn install --immutable";
-};
-var ensureNodeVersion = function (context) {
-    return (0, gitlab_1.collapseableSection)("nodeinstall", "Ensure node version")([
-        "if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi",
-        "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
-    ]);
+    return `yarn install --immutable`;
 };
+const ensureNodeVersion = (context) => (0, gitlab_1.collapseableSection)("nodeinstall", "Ensure node version")([
+    "if [ -f ~/.nvm/nvm.sh ];  then source ~/.nvm/nvm.sh; fi",
+    "if command -v nvm &> /dev/null && [ -f ./.nvmrc ]; then nvm install; fi",
+]);
 exports.ensureNodeVersion = ensureNodeVersion;
-var getYarnInstall = function (context, options) {
-    var _a;
-    var postInstall = "postInstall" in context.config ? context.config.postInstall : null;
-    return __spreadArray(__spreadArray(__spreadArray([], __read((0, exports.ensureNodeVersion)(context)), false), __read((0, gitlab_1.collapseableSection)("yarninstall", "Yarn install")([getYarnInstallCommand(context)])), false), __read((postInstall && !(options === null || options === void 0 ? void 0 : options.noCustomPostInstall)
-        ? (0, gitlab_1.collapseableSection)("postinstall", "Custom post install")((_a = (0, utils_1.ensureArray)(postInstall)) !== null && _a !== void 0 ? _a : [])
-        : [])), false);
+const getYarnInstall = (context, options) => {
+    const postInstall = context.type !== "workspace" && "postInstall" in context.build.config
+        ? context.build.config.postInstall
+        : null;
+    return [
+        ...(0, exports.ensureNodeVersion)(context),
+        ...(0, gitlab_1.collapseableSection)("yarninstall", "Yarn install")([getYarnInstallCommand(context)]),
+        ...(postInstall && !(options === null || options === void 0 ? void 0 : options.noCustomPostInstall)
+            ? (0, gitlab_1.collapseableSection)("postinstall", "Custom post install")((0, utils_1.ensureArray)(postInstall))
+            : []),
+    ];
 };
 exports.getYarnInstall = getYarnInstall;
-var DOCKER_COPY_FILES = "COPY --chown=node:node $APP_DIR .";
-var getDockerAppCopyAndBuildScript = function (context) {
-    var _a;
-    if ((_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.isClassic) {
-        return new BashExpression_1.BashExpression("\nRUN ".concat(YARN_INSTALL_CLASSIC, " --production --ignore-scripts\n").concat(DOCKER_COPY_FILES, "\nRUN ").concat(YARN_INSTALL_CLASSIC, " --production \n    ").trim());
+const DOCKER_COPY_FILES = `COPY --chown=node:node $APP_DIR .`;
+const getDockerAppCopyAndBuildScript = (context) => {
+    if (context.packageManagerInfo.isClassic) {
+        return new BashExpression_1.BashExpression(`
+RUN ${YARN_INSTALL_CLASSIC} --production --ignore-scripts
+${DOCKER_COPY_FILES}
+RUN ${YARN_INSTALL_CLASSIC} --production 
+    `.trim());
     }
     // yarn >= 4 ships with build in plugins, see https://github.com/yarnpkg/berry/pull/4253
     // trying to import those fail on this version
-    var doesNotShipWithBuiltInPlugins = ["2", "3"].some(function (v) { var _a; return (_a = context.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.version.startsWith(v); });
-    var maybeAddWorkspaceToolsCommand = doesNotShipWithBuiltInPlugins
+    const doesNotShipWithBuiltInPlugins = ["2", "3"].some((v) => context.packageManagerInfo.version.startsWith(v));
+    const maybeAddWorkspaceToolsCommand = doesNotShipWithBuiltInPlugins
         ? "RUN yarn plugin import workspace-tools"
         : "";
     // copy first everything and then install
     // rebuild first does not work as it will run postinstall and that might require files in the app
-    return new BashExpression_1.BashExpression("\n".concat(DOCKER_COPY_FILES, "\n").concat(maybeAddWorkspaceToolsCommand, "\nRUN ").concat(YARN_BERRY_PROD_REBUILD, "\n\n    ").trim());
+    return new BashExpression_1.BashExpression(`
+${DOCKER_COPY_FILES}
+${maybeAddWorkspaceToolsCommand}
+RUN ${YARN_BERRY_PROD_REBUILD}
+
+    `.trim());
 };
 exports.getDockerAppCopyAndBuildScript = getDockerAppCopyAndBuildScript;
 //# sourceMappingURL=yarn.js.map

package/dist/pipeline/src/build/node/yarn.js.map

@@ -1 +1 @@
-{"version":3,"file":"yarn.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/yarn.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAA2D;AAE3D,qCAA0C;AAC1C,6CAAyD;AAEzD,IAAM,oBAAoB,GAAG,gCAAgC,CAAC;AAE9D,8CAA8C;AAC9C,IAAM,uBAAuB,GAAG,oDAAoD,CAAC;AAErF,IAAM,qBAAqB,GAAG,UAAC,OAAqB;;IAClD,IAAI,MAAA,OAAO,CAAC,kBAAkB,0CAAE,SAAS,EAAE,CAAC;QAC1C,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IAED,OAAO,0BAA0B,CAAC;AACpC,CAAC,CAAC;AAEK,IAAM,iBAAiB,GAAG,UAAC,OAAqB;IACrD,OAAA,IAAA,4BAAmB,EACjB,aAAa,EACb,qBAAqB,CACtB,CAAC;QACA,yDAAyD;QACzD,yEAAyE;KAC1E,CAAC;AANF,CAME,CAAC;AAPQ,QAAA,iBAAiB,qBAOzB;AAEE,IAAM,cAAc,GAAG,UAC5B,OAAqB,EACrB,OAEC;;IAED,IAAM,WAAW,GACf,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC;IACtE,4DACK,IAAA,yBAAiB,EAAC,OAAO,CAAC,kBAC1B,IAAA,4BAAmB,EACpB,aAAa,EACb,cAAc,CACf,CAAC,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAC,kBAChC,CAAC,WAAW,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,mBAAmB,CAAA;QAC9C,CAAC,CAAC,IAAA,4BAAmB,EACjB,aAAa,EACb,qBAAqB,CACtB,CAAC,MAAA,IAAA,mBAAW,EAAC,WAAW,CAAC,mCAAI,EAAE,CAAC;QACnC,CAAC,CAAC,EAAE,CAAC,UACP;AACJ,CAAC,CAAC;AArBW,QAAA,cAAc,kBAqBzB;AAEF,IAAM,iBAAiB,GAAG,mCAAmC,CAAC;AAEvD,IAAM,8BAA8B,GAAG,UAAC,OAAqB;;IAClE,IAAI,MAAA,OAAO,CAAC,kBAAkB,0CAAE,SAAS,EAAE,CAAC;QAC1C,OAAO,IAAI,+BAAc,CACvB,gBACA,oBAAoB,6CACxB,iBAAiB,mBACb,oBAAoB,yBACrB,CAAC,IAAI,EAAE,CACP,CAAC;IACJ,CAAC;IAED,wFAAwF;IACxF,8CAA8C;IAC9C,IAAM,6BAA6B,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,UAAC,CAAC,YACtD,OAAA,MAAA,OAAO,CAAC,kBAAkB,0CAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA,EAAA,CAClD,CAAC;IACF,IAAM,6BAA6B,GAAG,6BAA6B;QACjE,CAAC,CAAC,wCAAwC;QAC1C,CAAC,CAAC,EAAE,CAAC;IAEP,yCAAyC;IACzC,iGAAiG;IACjG,OAAO,IAAI,+BAAc,CACvB,YACF,iBAAiB,eACjB,6BAA6B,mBACzB,uBAAuB,aAExB,CAAC,IAAI,EAAE,CACT,CAAC;AACJ,CAAC,CAAC;AA9BW,QAAA,8BAA8B,kCA8BzC"}
+{"version":3,"file":"yarn.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/node/yarn.ts"],"names":[],"mappings":";;;AAAA,8DAA2D;AAE3D,uCAA0C;AAC1C,+CAAyD;AAEzD,MAAM,oBAAoB,GAAG,gCAAgC,CAAC;AAE9D,8CAA8C;AAC9C,MAAM,uBAAuB,GAAG,oDAAoD,CAAC;AAErF,MAAM,qBAAqB,GAAG,CAAC,OAAgB,EAAE,EAAE;IACjD,IAAI,OAAO,CAAC,kBAAkB,CAAC,SAAS,EAAE,CAAC;QACzC,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IAED,OAAO,0BAA0B,CAAC;AACpC,CAAC,CAAC;AAEK,MAAM,iBAAiB,GAAG,CAAC,OAAgB,EAAE,EAAE,CACpD,IAAA,4BAAmB,EACjB,aAAa,EACb,qBAAqB,CACtB,CAAC;IACA,yDAAyD;IACzD,yEAAyE;CAC1E,CAAC,CAAC;AAPQ,QAAA,iBAAiB,qBAOzB;AAEE,MAAM,cAAc,GAAG,CAC5B,OAAgB,EAChB,OAEC,EACD,EAAE;IACF,MAAM,WAAW,GACf,OAAO,CAAC,IAAI,KAAK,WAAW,IAAI,aAAa,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM;QACnE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW;QAClC,CAAC,CAAC,IAAI,CAAC;IACX,OAAO;QACL,GAAG,IAAA,yBAAiB,EAAC,OAAO,CAAC;QAC7B,GAAG,IAAA,4BAAmB,EACpB,aAAa,EACb,cAAc,CACf,CAAC,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAC;QACnC,GAAG,CAAC,WAAW,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,mBAAmB,CAAA;YAC9C,CAAC,CAAC,IAAA,4BAAmB,EACjB,aAAa,EACb,qBAAqB,CACtB,CAAC,IAAA,mBAAW,EAAC,WAAW,CAAC,CAAC;YAC7B,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;AACJ,CAAC,CAAC;AAvBW,QAAA,cAAc,kBAuBzB;AAEF,MAAM,iBAAiB,GAAG,mCAAmC,CAAC;AAEvD,MAAM,8BAA8B,GAAG,CAAC,OAAgB,EAAE,EAAE;IACjE,IAAI,OAAO,CAAC,kBAAkB,CAAC,SAAS,EAAE,CAAC;QACzC,OAAO,IAAI,+BAAc,CACvB;MACA,oBAAoB;EACxB,iBAAiB;MACb,oBAAoB;KACrB,CAAC,IAAI,EAAE,CACP,CAAC;IACJ,CAAC;IAED,wFAAwF;IACxF,8CAA8C;IAC9C,MAAM,6BAA6B,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC1D,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CACjD,CAAC;IACF,MAAM,6BAA6B,GAAG,6BAA6B;QACjE,CAAC,CAAC,wCAAwC;QAC1C,CAAC,CAAC,EAAE,CAAC;IAEP,yCAAyC;IACzC,iGAAiG;IACjG,OAAO,IAAI,+BAAc,CACvB;EACF,iBAAiB;EACjB,6BAA6B;MACzB,uBAAuB;;KAExB,CAAC,IAAI,EAAE,CACT,CAAC;AACJ,CAAC,CAAC;AA9BW,QAAA,8BAA8B,kCA8BzC"}

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

@@ -1,3 +1,3 @@
-import type { ComponentContext } from "../..";
+import { type ComponentContext } from "../..";
 import type { CatladderJob } from "../../types/jobs";
 export declare const createRailsBuildJobs: (context: ComponentContext) => CatladderJob[];

package/dist/pipeline/src/build/rails/build.js

@@ -1,54 +1,23 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRailsBuildJobs = void 0;
-var base_1 = require("../base");
-var docker_1 = require("../docker");
-var types_1 = require("../types");
-var createRailsBuildJobs = function (context) {
+const __1 = require("../..");
+const base_1 = require("../base");
+const docker_1 = require("../docker");
+const types_1 = require("../types");
+const createRailsBuildJobs = (context) => {
     var _a, _b, _c;
-    var buildConfig = context.build.config;
+    const buildConfig = context.build.config;
     if (!(0, types_1.isOfBuildType)(buildConfig, "rails")) {
         // should not happen
         throw new Error("build type is not rails");
     }
+    // if its not a standalone build, we don't need to run tests
+    if (!(0, __1.componentContextIsStandaloneBuild)(context)) {
+        throw new Error("workspace builds are not supported for rails apps");
+    }
     if ((0, docker_1.hasDockerfile)(context)) {
-        return (0, base_1.createBuildJobs)(context, {
+        return (0, base_1.createComponentBuildJobs)(context, {
             appBuild: undefined,
             dockerBuild: {
                 script: (0, docker_1.getDockerBuildDefaultScript)(context),
@@ -56,27 +25,28 @@ var createRailsBuildJobs = function (context) {
             },
         });
     }
-    var cnbConf = buildConfig.cnbBuilder;
-    var packEnvArgs = Object.entries((_a = cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.buildVars) !== null && _a !== void 0 ? _a : {})
-        .map(function (_a) {
-        var _b = __read(_a, 2), k = _b[0], v = _b[1];
-        return "--env '".concat(k).concat(v ? "=".concat(v) : "", "'");
-    })
+    const cnbConf = buildConfig.cnbBuilder;
+    const packEnvArgs = Object.entries((_a = cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.buildVars) !== null && _a !== void 0 ? _a : {})
+        .map(([k, v]) => `--env '${k}${v ? `=${v}` : ""}'`)
         .join(" ");
-    return (0, base_1.createBuildJobs)(context, {
+    return (0, base_1.createComponentBuildJobs)(context, {
         appBuild: undefined,
         dockerBuild: {
-            variables: __assign(__assign({}, context.environment.jobOnlyVars.build.envVars), context.build.config.extraVars),
+            variables: {
+                ...context.environment.jobOnlyVars.build.envVars,
+                ...context.build.config.extraVars,
+            },
             // custom script
-            script: __spreadArray(__spreadArray([], __read((0, docker_1.gitlabDockerLogin)(context)), false), [
-                "cd ".concat(context.build.dir),
-                "docker pull $DOCKER_CACHE_IMAGE || true",
-                "wget --output-document=- https://github.com/buildpacks/pack/releases/download/v".concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "/pack-v").concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion, "-linux.tgz | tar -zx --directory /usr/local/bin pack"),
-                "chmod +x /usr/local/bin/pack",
+            script: [
+                ...(0, docker_1.gitlabDockerLogin)(context),
+                `cd ${context.build.dir}`,
+                `docker pull $DOCKER_CACHE_IMAGE || true`,
+                `wget --output-document=- https://github.com/buildpacks/pack/releases/download/v${cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion}/pack-v${cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packVersion}-linux.tgz | tar -zx --directory /usr/local/bin pack`,
+                `chmod +x /usr/local/bin/pack`,
                 //  replace private git ssh gem sources with https to make bundler with credentials via env var work
-                "sed --in-place 's|git@\\([^:]*\\):|https://\\1/|g' Gemfile Gemfile.lock",
-                "pack build \"$DOCKER_IMAGE:$DOCKER_IMAGE_TAG\" --builder '".concat(cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.image, "' --publish --cache-image \"$DOCKER_CACHE_IMAGE\" ").concat(packEnvArgs, " ").concat((_c = (_b = cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packExtraArgs) === null || _b === void 0 ? void 0 : _b.join(" ")) !== null && _c !== void 0 ? _c : ""),
-            ], false),
+                `sed --in-place 's|git@\\([^:]*\\):|https://\\1/|g' Gemfile Gemfile.lock`,
+                `pack build "$DOCKER_IMAGE:$DOCKER_IMAGE_TAG" --builder '${cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.image}' --publish --cache-image "$DOCKER_CACHE_IMAGE" ${packEnvArgs} ${(_c = (_b = cnbConf === null || cnbConf === void 0 ? void 0 : cnbConf.packExtraArgs) === null || _b === void 0 ? void 0 : _b.join(" ")) !== null && _c !== void 0 ? _c : ""}`,
+            ],
         },
     });
 };

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

@@ -1 +1 @@
-{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/rails/build.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,gCAA0C;AAC1C,oCAImB;AACnB,kCAAyC;AAElC,IAAM,oBAAoB,GAAG,UAClC,OAAyB;;IAEzB,IAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;IACzC,IAAI,CAAC,IAAA,qBAAa,EAAC,WAAW,EAAE,OAAO,CAAC,EAAE,CAAC;QACzC,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,IAAI,IAAA,sBAAa,EAAC,OAAO,CAAC,EAAE,CAAC;QAC3B,OAAO,IAAA,sBAAe,EAAC,OAAO,EAAE;YAC9B,QAAQ,EAAE,SAAS;YACnB,WAAW,EAAE;gBACX,MAAM,EAAE,IAAA,oCAA2B,EAAC,OAAO,CAAC;gBAC5C,SAAS,EAAE,EAAE;aACd;SACF,CAAC,CAAC;IACL,CAAC;IAED,IAAM,OAAO,GAAG,WAAW,CAAC,UAAU,CAAC;IAEvC,IAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS,mCAAI,EAAE,CAAC;SACzD,GAAG,CAAC,UAAC,EAAM;YAAN,KAAA,aAAM,EAAL,CAAC,QAAA,EAAE,CAAC,QAAA;QAAM,OAAA,iBAAU,CAAC,SAAG,CAAC,CAAC,CAAC,CAAC,WAAI,CAAC,CAAE,CAAC,CAAC,CAAC,EAAE,MAAG;IAAjC,CAAiC,CAAC;SAClD,IAAI,CAAC,GAAG,CAAC,CAAC;IACb,OAAO,IAAA,sBAAe,EAAC,OAAO,EAAE;QAC9B,QAAQ,EAAE,SAAS;QACnB,WAAW,EAAE;YACX,SAAS,wBACJ,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,GAC7C,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAClC;YACD,gBAAgB;YAChB,MAAM,yCACD,IAAA,0BAAiB,EAAC,OAAO,CAAC;gBAC7B,aAAM,OAAO,CAAC,KAAK,CAAC,GAAG,CAAE;gBACzB,yCAAyC;gBACzC,yFAAkF,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,oBAAU,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,yDAAsD;gBAC1L,8BAA8B;gBAC9B,oGAAoG;gBACpG,yEAAyE;gBACzE,oEACE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,+DACmC,WAAW,cAC5D,MAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,aAAa,0CAAE,IAAI,CAAC,GAAG,CAAC,mCAAI,EAAE,CACvC;qBACH;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AAhDW,QAAA,oBAAoB,wBAgD/B"}
+{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/rails/build.ts"],"names":[],"mappings":";;;AAAA,6BAKe;AAEf,kCAAmD;AACnD,sCAImB;AACnB,oCAAyC;AAElC,MAAM,oBAAoB,GAAG,CAClC,OAAyB,EACT,EAAE;;IAClB,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;IACzC,IAAI,CAAC,IAAA,qBAAa,EAAC,WAAW,EAAE,OAAO,CAAC,EAAE,CAAC;QACzC,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,4DAA4D;IAC5D,IAAI,CAAC,IAAA,qCAAiC,EAAC,OAAO,CAAC,EAAE,CAAC;QAChD,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;IACvE,CAAC;IAED,IAAI,IAAA,sBAAa,EAAC,OAAO,CAAC,EAAE,CAAC;QAC3B,OAAO,IAAA,+BAAwB,EAAC,OAAO,EAAE;YACvC,QAAQ,EAAE,SAAS;YACnB,WAAW,EAAE;gBACX,MAAM,EAAE,IAAA,oCAA2B,EAAC,OAAO,CAAC;gBAC5C,SAAS,EAAE,EAAE;aACd;SACF,CAAC,CAAC;IACL,CAAC;IAED,MAAM,OAAO,GAAG,WAAW,CAAC,UAAU,CAAC;IAEvC,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS,mCAAI,EAAE,CAAC;SACzD,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC;SAClD,IAAI,CAAC,GAAG,CAAC,CAAC;IACb,OAAO,IAAA,+BAAwB,EAAC,OAAO,EAAE;QACvC,QAAQ,EAAE,SAAS;QACnB,WAAW,EAAE;YACX,SAAS,EAAE;gBACT,GAAG,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO;gBAChD,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS;aAClC;YACD,gBAAgB;YAChB,MAAM,EAAE;gBACN,GAAG,IAAA,0BAAiB,EAAC,OAAO,CAAC;gBAC7B,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE;gBACzB,yCAAyC;gBACzC,kFAAkF,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,UAAU,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,sDAAsD;gBAC1L,8BAA8B;gBAC9B,oGAAoG;gBACpG,yEAAyE;gBACzE,2DACE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KACX,mDAAmD,WAAW,IAC5D,MAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,aAAa,0CAAE,IAAI,CAAC,GAAG,CAAC,mCAAI,EACvC,EAAE;aACH;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AArDW,QAAA,oBAAoB,wBAqD/B"}

package/dist/pipeline/src/build/rails/index.js

@@ -1,35 +1,10 @@
 "use strict";
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRailsJobs = void 0;
-var build_1 = require("./build");
-var test_1 = require("./test");
-var createRailsJobs = function (context) {
-    return __spreadArray(__spreadArray([], __read((0, test_1.createRailsTestJobs)(context)), false), __read((0, build_1.createRailsBuildJobs)(context)), false);
+const build_1 = require("./build");
+const test_1 = require("./test");
+const createRailsJobs = (context) => {
+    return [...(0, test_1.createRailsTestJobs)(context), ...(0, build_1.createRailsBuildJobs)(context)];
 };
 exports.createRailsJobs = createRailsJobs;
 //# sourceMappingURL=index.js.map

package/dist/pipeline/src/build/rails/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/rails/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,iCAA+C;AAC/C,+BAA6C;AAEtC,IAAM,eAAe,GAAG,UAAC,OAAyB;IACvD,8CAAW,IAAA,0BAAmB,EAAC,OAAO,CAAC,kBAAK,IAAA,4BAAoB,EAAC,OAAO,CAAC,UAAE;AAC7E,CAAC,CAAC;AAFW,QAAA,eAAe,mBAE1B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/rails/index.ts"],"names":[],"mappings":";;;AAEA,mCAA+C;AAC/C,iCAA6C;AAEtC,MAAM,eAAe,GAAG,CAAC,OAAyB,EAAkB,EAAE;IAC3E,OAAO,CAAC,GAAG,IAAA,0BAAmB,EAAC,OAAO,CAAC,EAAE,GAAG,IAAA,4BAAoB,EAAC,OAAO,CAAC,CAAC,CAAC;AAC7E,CAAC,CAAC;AAFW,QAAA,eAAe,mBAE1B"}

package/dist/pipeline/src/build/rails/test.d.ts

@@ -1,3 +1,3 @@
-import type { ComponentContext } from "../..";
+import { type ComponentContext } from "../..";
 import type { CatladderJob } from "../../types/jobs";
 export declare const createRailsTestJobs: (context: ComponentContext) => CatladderJob[];

package/dist/pipeline/src/build/rails/test.js

@@ -1,89 +1,88 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRailsTestJobs = void 0;
-var utils_1 = require("../../utils");
-var createRailsTestJobs = function (context) {
+const __1 = require("../..");
+const utils_1 = require("../../utils");
+const createRailsTestJobs = (context) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
     // don't run tests after release
     // TODO: this will be replaced by using rules
     if (context.trigger === "taggedRelease") {
         return [];
     }
-    var buildConfig = context.build.config;
-    var base = {
-        variables: __assign(__assign({}, context.environment.jobOnlyVars.build.envVars), ((_a = buildConfig.extraVars) !== null && _a !== void 0 ? _a : {})),
+    // if its not a standalone build, we don't need to run tests
+    if (!(0, __1.componentContextIsStandaloneBuild)(context)) {
+        return [];
+    }
+    const buildConfig = context.build.config;
+    const base = {
+        variables: {
+            ...context.environment.jobOnlyVars.build.envVars,
+            ...((_a = buildConfig.extraVars) !== null && _a !== void 0 ? _a : {}),
+        },
         stage: "test",
         needs: [],
         envMode: "none",
     };
-    var defaultImage = "docker.io/ruby";
-    var bundlerCacheDir = "tmp/cache";
-    var bundlerInstall = [
-        "bundle config set path '".concat(bundlerCacheDir, "'"),
+    const defaultImage = "docker.io/ruby";
+    const bundlerCacheDir = "tmp/cache";
+    const bundlerInstall = [
+        `bundle config set path '${bundlerCacheDir}'`,
         "bundle install -j $(nproc)",
     ];
-    var bundlerCache = {
+    const bundlerCache = {
         key: {
             files: ["Gemfile.lock"],
             prefix: "$CI_JOB_IMAGE", // a changed image might have different OS libraries which no longer work with the cached gems
         },
         paths: [bundlerCacheDir],
     };
-    var auditJob = buildConfig.audit !== false
-        ? __assign(__assign({ name: "🛡 audit" }, base), { cache: undefined, image: (_d = (_c = (_b = buildConfig.audit) === null || _b === void 0 ? void 0 : _b.jobImage) !== null && _c !== void 0 ? _c : buildConfig.jobImage) !== null && _d !== void 0 ? _d : defaultImage, script: __spreadArray([
-                "cd ".concat(context.build.dir)
-            ], __read(((_f = (0, utils_1.ensureArray)((_e = buildConfig.audit) === null || _e === void 0 ? void 0 : _e.command)) !== null && _f !== void 0 ? _f : [
-                "gem install bundler-audit",
-                "bundle audit check",
-            ])), false), allow_failure: true }) : null;
-    var lintJob = buildConfig.lint !== false
-        ? __assign(__assign({ name: "👮 lint" }, base), { cache: bundlerCache, image: (_j = (_h = (_g = buildConfig.lint) === null || _g === void 0 ? void 0 : _g.jobImage) !== null && _h !== void 0 ? _h : buildConfig.jobImage) !== null && _j !== void 0 ? _j : defaultImage, script: __spreadArray(__spreadArray([
-                "cd ".concat(context.build.dir)
-            ], __read(bundlerInstall), false), __read(((_l = (0, utils_1.ensureArray)((_k = buildConfig.lint) === null || _k === void 0 ? void 0 : _k.command)) !== null && _l !== void 0 ? _l : [
-                "bundle exec rubocop",
-            ])), false) }) : null;
-    var testJob = buildConfig.test !== false
-        ? __assign(__assign({ name: "🧪 test" }, base), { cache: bundlerCache, image: (_p = (_o = (_m = buildConfig.test) === null || _m === void 0 ? void 0 : _m.jobImage) !== null && _o !== void 0 ? _o : buildConfig.jobImage) !== null && _p !== void 0 ? _p : defaultImage, script: __spreadArray(__spreadArray([
-                "cd ".concat(context.build.dir)
-            ], __read(bundlerInstall), false), __read(((_r = (0, utils_1.ensureArray)((_q = buildConfig.test) === null || _q === void 0 ? void 0 : _q.command)) !== null && _r !== void 0 ? _r : [
-                "bundle exec rspec",
-            ])), false) }) : null;
+    const auditJob = buildConfig.audit !== false
+        ? {
+            name: "🛡 audit",
+            ...base,
+            cache: undefined, // audit does not need bundle install and no cache
+            image: (_d = (_c = (_b = buildConfig.audit) === null || _b === void 0 ? void 0 : _b.jobImage) !== null && _c !== void 0 ? _c : buildConfig.jobImage) !== null && _d !== void 0 ? _d : defaultImage,
+            script: [
+                `cd ${context.build.dir}`,
+                ...((_f = (0, utils_1.ensureArrayOrNull)((_e = buildConfig.audit) === null || _e === void 0 ? void 0 : _e.command)) !== null && _f !== void 0 ? _f : [
+                    "gem install bundler-audit",
+                    "bundle audit check",
+                ]),
+            ],
+            allow_failure: true,
+        }
+        : null;
+    const lintJob = buildConfig.lint !== false
+        ? {
+            name: "👮 lint",
+            ...base,
+            cache: bundlerCache,
+            image: (_j = (_h = (_g = buildConfig.lint) === null || _g === void 0 ? void 0 : _g.jobImage) !== null && _h !== void 0 ? _h : buildConfig.jobImage) !== null && _j !== void 0 ? _j : defaultImage,
+            script: [
+                `cd ${context.build.dir}`,
+                ...bundlerInstall,
+                ...((_l = (0, utils_1.ensureArrayOrNull)((_k = buildConfig.lint) === null || _k === void 0 ? void 0 : _k.command)) !== null && _l !== void 0 ? _l : [
+                    "bundle exec rubocop",
+                ]),
+            ],
+        }
+        : null;
+    const testJob = buildConfig.test !== false
+        ? {
+            name: "🧪 test",
+            ...base,
+            cache: bundlerCache,
+            image: (_p = (_o = (_m = buildConfig.test) === null || _m === void 0 ? void 0 : _m.jobImage) !== null && _o !== void 0 ? _o : buildConfig.jobImage) !== null && _p !== void 0 ? _p : defaultImage,
+            script: [
+                `cd ${context.build.dir}`,
+                ...bundlerInstall,
+                ...((_r = (0, utils_1.ensureArrayOrNull)((_q = buildConfig.test) === null || _q === void 0 ? void 0 : _q.command)) !== null && _r !== void 0 ? _r : [
+                    "bundle exec rspec",
+                ]),
+            ],
+        }
+        : null;
     return [auditJob, lintJob, testJob].filter(utils_1.notNil);
 };
 exports.createRailsTestJobs = createRailsTestJobs;

package/dist/pipeline/src/build/rails/test.js.map

@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/rails/test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/rails/test.ts"],"names":[],"mappings":"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"}

package/dist/pipeline/src/build/sbom.js

@@ -1,23 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSbomBuildJob = exports.SBOM_FILE = exports.SBOM_BUILD_JOB_NAME = void 0;
-var utils_1 = require("../utils");
+const _1 = require(".");
+const utils_1 = require("../utils");
 exports.SBOM_BUILD_JOB_NAME = "🧾 sbom";
 exports.SBOM_FILE = "__sbom.json";
-var createSbomBuildJob = function (context) {
-    var _a, _b, _c, _d, _e;
-    var buildConfig = context.build.config;
-    var defaultImage = "aquasec/trivy:0.38.3";
-    var defaultScript = [
-        "trivy fs --quiet --format cyclonedx --output \"".concat(exports.SBOM_FILE, "\" ").concat(((_a = context.build.packageManagerInfo) === null || _a === void 0 ? void 0 : _a.componentIsInWorkspace)
+const createSbomBuildJob = (context) => {
+    var _a, _b, _c, _d;
+    const buildConfig = context.build.config;
+    const defaultImage = "aquasec/trivy:0.38.3";
+    const defaultScript = [
+        `trivy fs --quiet --format cyclonedx --output "${exports.SBOM_FILE}" ${context.packageManagerInfo.componentIsInWorkspace
             ? "."
-            : context.build.dir),
+            : context.build.dir}`,
     ];
-    var image = buildConfig.type === "custom" && buildConfig.sbom !== false
-        ? (_c = (_b = buildConfig.sbom) === null || _b === void 0 ? void 0 : _b.jobImage) !== null && _c !== void 0 ? _c : defaultImage
+    const image = (0, _1.isStandaloneBuildConfig)(buildConfig) &&
+        buildConfig.type === "custom" &&
+        buildConfig.sbom !== false
+        ? (_b = (_a = buildConfig.sbom) === null || _a === void 0 ? void 0 : _a.jobImage) !== null && _b !== void 0 ? _b : defaultImage
         : defaultImage;
-    var script = buildConfig.type === "custom" && buildConfig.sbom !== false
-        ? (_e = (0, utils_1.ensureArray)((_d = buildConfig.sbom) === null || _d === void 0 ? void 0 : _d.command)) !== null && _e !== void 0 ? _e : defaultScript
+    const script = (0, _1.isStandaloneBuildConfig)(buildConfig) &&
+        buildConfig.type === "custom" &&
+        buildConfig.sbom !== false
+        ? (_d = (0, utils_1.ensureArrayOrNull)((_c = buildConfig.sbom) === null || _c === void 0 ? void 0 : _c.command)) !== null && _d !== void 0 ? _d : defaultScript
         : defaultScript;
     return {
         name: exports.SBOM_BUILD_JOB_NAME,
@@ -25,8 +30,8 @@ var createSbomBuildJob = function (context) {
         envMode: "jobPerEnv",
         variables: {},
         cache: undefined,
-        image: image,
-        script: script,
+        image,
+        script,
         allow_failure: true,
         artifacts: {
             paths: [exports.SBOM_FILE],

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

@@ -1 +1 @@
-{"version":3,"file":"sbom.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/sbom.ts"],"names":[],"mappings":";;;AAEA,kCAAuC;AAE1B,QAAA,mBAAmB,GAAG,SAAS,CAAC;AAChC,QAAA,SAAS,GAAG,aAAa,CAAC;AAEhC,IAAM,kBAAkB,GAAG,UAAC,OAAyB;;IAC1D,IAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;IAEzC,IAAM,YAAY,GAAG,sBAAsB,CAAC;IAC5C,IAAM,aAAa,GAAG;QACpB,yDAAiD,iBAAS,gBACxD,CAAA,MAAA,OAAO,CAAC,KAAK,CAAC,kBAAkB,0CAAE,sBAAsB;YACtD,CAAC,CAAC,GAAG;YACL,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CACrB;KACH,CAAC;IAEF,IAAM,KAAK,GACT,WAAW,CAAC,IAAI,KAAK,QAAQ,IAAI,WAAW,CAAC,IAAI,KAAK,KAAK;QACzD,CAAC,CAAC,MAAA,MAAA,WAAW,CAAC,IAAI,0CAAE,QAAQ,mCAAI,YAAY;QAC5C,CAAC,CAAC,YAAY,CAAC;IAEnB,IAAM,MAAM,GACV,WAAW,CAAC,IAAI,KAAK,QAAQ,IAAI,WAAW,CAAC,IAAI,KAAK,KAAK;QACzD,CAAC,CAAC,MAAA,IAAA,mBAAW,EAAC,MAAA,WAAW,CAAC,IAAI,0CAAE,OAAO,CAAC,mCAAI,aAAa;QACzD,CAAC,CAAC,aAAa,CAAC;IAEpB,OAAO;QACL,IAAI,EAAE,2BAAmB;QACzB,KAAK,EAAE,OAAO;QACd,OAAO,EAAE,WAAW;QACpB,SAAS,EAAE,EAAE;QACb,KAAK,EAAE,SAAS;QAChB,KAAK,OAAA;QACL,MAAM,QAAA;QACN,aAAa,EAAE,IAAI;QACnB,SAAS,EAAE;YACT,KAAK,EAAE,CAAC,iBAAS,CAAC;SACnB;KACF,CAAC;AACJ,CAAC,CAAC;AAnCW,QAAA,kBAAkB,sBAmC7B"}
+{"version":3,"file":"sbom.js","sourceRoot":"","sources":["../../../../../pipeline/src/build/sbom.ts"],"names":[],"mappings":";;;AAAA,wBAA4C;AAG5C,oCAA6C;AAEhC,QAAA,mBAAmB,GAAG,SAAS,CAAC;AAChC,QAAA,SAAS,GAAG,aAAa,CAAC;AAEhC,MAAM,kBAAkB,GAAG,CAAC,OAAyB,EAAgB,EAAE;;IAC5E,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;IAEzC,MAAM,YAAY,GAAG,sBAAsB,CAAC;IAC5C,MAAM,aAAa,GAAG;QACpB,iDAAiD,iBAAS,KACxD,OAAO,CAAC,kBAAkB,CAAC,sBAAsB;YAC/C,CAAC,CAAC,GAAG;YACL,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,GACpB,EAAE;KACH,CAAC;IAEF,MAAM,KAAK,GACT,IAAA,0BAAuB,EAAC,WAAW,CAAC;QACpC,WAAW,CAAC,IAAI,KAAK,QAAQ;QAC7B,WAAW,CAAC,IAAI,KAAK,KAAK;QACxB,CAAC,CAAC,MAAA,MAAA,WAAW,CAAC,IAAI,0CAAE,QAAQ,mCAAI,YAAY;QAC5C,CAAC,CAAC,YAAY,CAAC;IAEnB,MAAM,MAAM,GACV,IAAA,0BAAuB,EAAC,WAAW,CAAC;QACpC,WAAW,CAAC,IAAI,KAAK,QAAQ;QAC7B,WAAW,CAAC,IAAI,KAAK,KAAK;QACxB,CAAC,CAAC,MAAA,IAAA,yBAAiB,EAAC,MAAA,WAAW,CAAC,IAAI,0CAAE,OAAO,CAAC,mCAAI,aAAa;QAC/D,CAAC,CAAC,aAAa,CAAC;IAEpB,OAAO;QACL,IAAI,EAAE,2BAAmB;QACzB,KAAK,EAAE,OAAO;QACd,OAAO,EAAE,WAAW;QACpB,SAAS,EAAE,EAAE;QACb,KAAK,EAAE,SAAS;QAChB,KAAK;QACL,MAAM;QACN,aAAa,EAAE,IAAI;QACnB,SAAS,EAAE;YACT,KAAK,EAAE,CAAC,iBAAS,CAAC;SACnB;KACF,CAAC;AACJ,CAAC,CAAC;AAvCW,QAAA,kBAAkB,sBAuC7B"}