@catladder/cli 0.0.0-next-616e80f1 → 0.0.0-next-186d7128

package/dist/bundles/catenv/index.js

@@ -774,6 +774,9 @@ class BashExpression {
     toString() {
         return this.value.toString();
     }
+    replace(searchValue, replacer) {
+        return new BashExpression(this.value.toString().replace(searchValue, replacer));
+    }
     /**
      *
      * @returns a bash expression to lowercase the string
@@ -941,15 +944,12 @@ const BashExpression_1 = __nccwpck_require__(2376);
 // and adjusted a bit
 async function replaceAsync(string, searchValue, replacer) {
     const wasBashExpression = string instanceof BashExpression_1.BashExpression;
-    const stringRepresentation = wasBashExpression
-        ? string.toString()
-        : (0, BashExpression_1.bashEscape)(string);
     try {
         // 1. Run fake pass of `replace`, collect values from `replacer` calls
         // 2. Resolve them with `Promise.all`
         // 3. Run `replace` with resolved values
         const values = [];
-        String.prototype.replace.call(stringRepresentation, searchValue, function (...args) {
+        String.prototype.replace.call(string instanceof BashExpression_1.BashExpression ? string : (0, BashExpression_1.bashEscape)(string), searchValue, function (...args) {
             // eslint-disable-next-line prefer-spread
             const result = replacer.apply(undefined, args);
             values.push(result);
@@ -957,7 +957,7 @@ async function replaceAsync(string, searchValue, replacer) {
         });
         const resolvedValues = await Promise.all(values);
         const containsBashExpression = resolvedValues.some((value) => value instanceof BashExpression_1.BashExpression);
-        const result = String.prototype.replace.call(stringRepresentation, searchValue, function () {
+        const result = (string instanceof BashExpression_1.BashExpression ? string : (0, BashExpression_1.bashEscape)(string)).replace(searchValue, function () {
             var _a, _b;
             return (_b = (_a = resolvedValues.shift()) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : "";
         });

package/dist/bundles/cli/index.js

@@ -3940,6 +3940,9 @@ class BashExpression {
     toString() {
         return this.value.toString();
     }
+    replace(searchValue, replacer) {
+        return new BashExpression(this.value.toString().replace(searchValue, replacer));
+    }
     /**
      *
      * @returns a bash expression to lowercase the string
@@ -4107,15 +4110,12 @@ const BashExpression_1 = __nccwpck_require__(42376);
 // and adjusted a bit
 async function replaceAsync(string, searchValue, replacer) {
     const wasBashExpression = string instanceof BashExpression_1.BashExpression;
-    const stringRepresentation = wasBashExpression
-        ? string.toString()
-        : (0, BashExpression_1.bashEscape)(string);
     try {
         // 1. Run fake pass of `replace`, collect values from `replacer` calls
         // 2. Resolve them with `Promise.all`
         // 3. Run `replace` with resolved values
         const values = [];
-        String.prototype.replace.call(stringRepresentation, searchValue, function (...args) {
+        String.prototype.replace.call(string instanceof BashExpression_1.BashExpression ? string : (0, BashExpression_1.bashEscape)(string), searchValue, function (...args) {
             // eslint-disable-next-line prefer-spread
             const result = replacer.apply(undefined, args);
             values.push(result);
@@ -4123,7 +4123,7 @@ async function replaceAsync(string, searchValue, replacer) {
         });
         const resolvedValues = await Promise.all(values);
         const containsBashExpression = resolvedValues.some((value) => value instanceof BashExpression_1.BashExpression);
-        const result = String.prototype.replace.call(stringRepresentation, searchValue, function () {
+        const result = (string instanceof BashExpression_1.BashExpression ? string : (0, BashExpression_1.bashEscape)(string)).replace(searchValue, function () {
             var _a, _b;
             return (_b = (_a = resolvedValues.shift()) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : "";
         });

package/dist/pipeline/src/bash/BashExpression.d.ts

@@ -8,6 +8,7 @@ export declare class BashExpression {
     constructor(value: string | BashExpression);
     toJSON(): string;
     toString(): string;
+    replace(searchValue: any, replacer: (substring: string, ...args: any[]) => string): BashExpression;
     /**
      *
      * @returns a bash expression to lowercase the string

package/dist/pipeline/src/bash/BashExpression.js

@@ -16,6 +16,9 @@ class BashExpression {
     toString() {
         return this.value.toString();
     }
+    replace(searchValue, replacer) {
+        return new BashExpression(this.value.toString().replace(searchValue, replacer));
+    }
     /**
      *
      * @returns a bash expression to lowercase the string

package/dist/pipeline/src/bash/BashExpression.js.map

@@ -1 +1 @@
-{"version":3,"file":"BashExpression.js","sourceRoot":"","sources":["../../../../../pipeline/src/bash/BashExpression.ts"],"names":[],"mappings":";;;AAAA;;;;GAIG;AACH,MAAa,cAAc;IACzB,YAAoB,KAA8B;QAA9B,UAAK,GAAL,KAAK,CAAyB;IAAG,CAAC;IAC/C,MAAM;QACX,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IACzB,CAAC;IACM,QAAQ;QACb,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;IAC/B,CAAC;IAED;;;OAGG;IACI,WAAW;QAChB,OAAO,IAAI,CAAC,oBAAoB,CAAC,2BAA2B,CAAC,CAAC;IAChE,CAAC;IACD;;;;OAIG;IACI,MAAM,CAAC,GAAG,MAAsC;QACrD,OAAO,IAAI,cAAc,CACvB,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAC3D,CAAC;IACJ,CAAC;IAEM,oBAAoB,CAAC,OAAe;QACzC,OAAO,IAAI,cAAc;QACvB,0CAA0C;QAC1C,gBAAgB,IAAI,CAAC,QAAQ,EAAE,OAAO,OAAO,GAAG,CACjD,CAAC;IACJ,CAAC;CACF;AAjCD,wCAiCC;AAIM,MAAM,eAAe,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,cAAc,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;AAAnE,QAAA,eAAe,mBAAoD;AAEhF;;;;;;;;GAQG;AACI,MAAM,mBAAmB,GAAG,CACjC,KAAoC,EACpC,MAAM,GAAG,EAAE,EACa,EAAE;IAC1B,MAAM,mBAAmB,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,YAAY,cAAc,CAAC,CAAC;IAC3E,IAAI,mBAAmB,EAAE,CAAC;QACxB,OAAO,IAAI,cAAc,CACvB,KAAK;aACF,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aAC5D,IAAI,CAAC,MAAM,CAAC,CAChB,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC;AACH,CAAC,CAAC;AAdW,QAAA,mBAAmB,uBAc9B;AAEF;;;GAGG;AACI,MAAM,UAAU,GAAG,CAAC,KAAmC,EAAE,EAAE;IAChE,IAAI,KAAK,YAAY,cAAc,EAAE,CAAC;QACpC,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,kEAAkE;IAC7F,CAAC;IACD,yDAAyD;IACzD,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACjE,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAPW,QAAA,UAAU,cAOrB"}
+{"version":3,"file":"BashExpression.js","sourceRoot":"","sources":["../../../../../pipeline/src/bash/BashExpression.ts"],"names":[],"mappings":";;;AAAA;;;;GAIG;AACH,MAAa,cAAc;IACzB,YAAoB,KAA8B;QAA9B,UAAK,GAAL,KAAK,CAAyB;IAAG,CAAC;IAC/C,MAAM;QACX,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IACzB,CAAC;IACM,QAAQ;QACb,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;IAC/B,CAAC;IAEM,OAAO,CACZ,WAAgB,EAEhB,QAAuD;QAEvD,OAAO,IAAI,cAAc,CACvB,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,CAAC,CACrD,CAAC;IACJ,CAAC;IAED;;;OAGG;IACI,WAAW;QAChB,OAAO,IAAI,CAAC,oBAAoB,CAAC,2BAA2B,CAAC,CAAC;IAChE,CAAC;IACD;;;;OAIG;IACI,MAAM,CAAC,GAAG,MAAsC;QACrD,OAAO,IAAI,cAAc,CACvB,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAC3D,CAAC;IACJ,CAAC;IAEM,oBAAoB,CAAC,OAAe;QACzC,OAAO,IAAI,cAAc;QACvB,0CAA0C;QAC1C,gBAAgB,IAAI,CAAC,QAAQ,EAAE,OAAO,OAAO,GAAG,CACjD,CAAC;IACJ,CAAC;CACF;AA3CD,wCA2CC;AAIM,MAAM,eAAe,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,cAAc,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;AAAnE,QAAA,eAAe,mBAAoD;AAEhF;;;;;;;;GAQG;AACI,MAAM,mBAAmB,GAAG,CACjC,KAAoC,EACpC,MAAM,GAAG,EAAE,EACa,EAAE;IAC1B,MAAM,mBAAmB,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,YAAY,cAAc,CAAC,CAAC;IAC3E,IAAI,mBAAmB,EAAE,CAAC;QACxB,OAAO,IAAI,cAAc,CACvB,KAAK;aACF,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aAC5D,IAAI,CAAC,MAAM,CAAC,CAChB,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC;AACH,CAAC,CAAC;AAdW,QAAA,mBAAmB,uBAc9B;AAEF;;;GAGG;AACI,MAAM,UAAU,GAAG,CAAC,KAAmC,EAAE,EAAE;IAChE,IAAI,KAAK,YAAY,cAAc,EAAE,CAAC;QACpC,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,kEAAkE;IAC7F,CAAC;IACD,yDAAyD;IACzD,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACjE,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAPW,QAAA,UAAU,cAOrB"}

package/dist/pipeline/src/bash/replaceAsync.js

@@ -5,15 +5,12 @@ const BashExpression_1 = require("./BashExpression");
 // and adjusted a bit
 async function replaceAsync(string, searchValue, replacer) {
     const wasBashExpression = string instanceof BashExpression_1.BashExpression;
-    const stringRepresentation = wasBashExpression
-        ? string.toString()
-        : (0, BashExpression_1.bashEscape)(string);
     try {
         // 1. Run fake pass of `replace`, collect values from `replacer` calls
         // 2. Resolve them with `Promise.all`
         // 3. Run `replace` with resolved values
         const values = [];
-        String.prototype.replace.call(stringRepresentation, searchValue, function (...args) {
+        String.prototype.replace.call(string instanceof BashExpression_1.BashExpression ? string : (0, BashExpression_1.bashEscape)(string), searchValue, function (...args) {
             // eslint-disable-next-line prefer-spread
             const result = replacer.apply(undefined, args);
             values.push(result);
@@ -21,7 +18,7 @@ async function replaceAsync(string, searchValue, replacer) {
         });
         const resolvedValues = await Promise.all(values);
         const containsBashExpression = resolvedValues.some((value) => value instanceof BashExpression_1.BashExpression);
-        const result = String.prototype.replace.call(stringRepresentation, searchValue, function () {
+        const result = (string instanceof BashExpression_1.BashExpression ? string : (0, BashExpression_1.bashEscape)(string)).replace(searchValue, function () {
             var _a, _b;
             return (_b = (_a = resolvedValues.shift()) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : "";
         });

package/dist/pipeline/src/bash/replaceAsync.js.map

@@ -1 +1 @@
-{"version":3,"file":"replaceAsync.js","sourceRoot":"","sources":["../../../../../pipeline/src/bash/replaceAsync.ts"],"names":[],"mappings":";;AAAA,qDAA8D;AAE9D,wEAAwE;AACxE,qBAAqB;AACN,KAAK,UAAU,YAAY,CACxC,MAA+B,EAC/B,WAAgB,EAChB,QAGqC;IAErC,MAAM,iBAAiB,GAAG,MAAM,YAAY,+BAAc,CAAC;IAE3D,MAAM,oBAAoB,GAAG,iBAAiB;QAC5C,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE;QACnB,CAAC,CAAC,IAAA,2BAAU,EAAC,MAAM,CAAC,CAAC;IACvB,IAAI,CAAC;QACH,sEAAsE;QACtE,qCAAqC;QACrC,wCAAwC;QACxC,MAAM,MAAM,GAA4C,EAAE,CAAC;QAC3D,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAC3B,oBAAoB,EACpB,WAAW,EACX,UAAU,GAAG,IAAI;YACf,yCAAyC;YACzC,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;YAC/C,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACpB,OAAO,EAAE,CAAC;QACZ,CAAC,CACF,CAAC;QACF,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAEjD,MAAM,sBAAsB,GAAG,cAAc,CAAC,IAAI,CAChD,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,YAAY,+BAAc,CAC3C,CAAC;QAEF,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAC1C,oBAAoB,EACpB,WAAW,EACX;;YACE,OAAO,MAAA,MAAA,cAAc,CAAC,KAAK,EAAE,0CAAE,QAAQ,EAAE,mCAAI,EAAE,CAAC;QAClD,CAAC,CACF,CAAC;QACF,IAAI,iBAAiB,IAAI,sBAAsB,EAAE,CAAC;YAChD,OAAO,IAAI,+BAAc,CAAC,MAAM,CAAC,CAAC;QACpC,CAAC;aAAM,CAAC;YACN,OAAO,MAAM,CAAC;QAChB,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;AACH,CAAC;AAjDD,+BAiDC"}
+{"version":3,"file":"replaceAsync.js","sourceRoot":"","sources":["../../../../../pipeline/src/bash/replaceAsync.ts"],"names":[],"mappings":";;AAAA,qDAA8D;AAE9D,wEAAwE;AACxE,qBAAqB;AACN,KAAK,UAAU,YAAY,CACxC,MAA+B,EAC/B,WAAgB,EAChB,QAGqC;IAErC,MAAM,iBAAiB,GAAG,MAAM,YAAY,+BAAc,CAAC;IAE3D,IAAI,CAAC;QACH,sEAAsE;QACtE,qCAAqC;QACrC,wCAAwC;QACxC,MAAM,MAAM,GAA4C,EAAE,CAAC;QAC3D,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAC3B,MAAM,YAAY,+BAAc,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAA,2BAAU,EAAC,MAAM,CAAC,EAC9D,WAAW,EACX,UAAU,GAAG,IAAI;YACf,yCAAyC;YACzC,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;YAC/C,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACpB,OAAO,EAAE,CAAC;QACZ,CAAC,CACF,CAAC;QACF,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAEjD,MAAM,sBAAsB,GAAG,cAAc,CAAC,IAAI,CAChD,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,YAAY,+BAAc,CAC3C,CAAC;QACF,MAAM,MAAM,GAAG,CACb,MAAM,YAAY,+BAAc,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAA,2BAAU,EAAC,MAAM,CAAC,CAC/D,CAAC,OAAO,CAAC,WAAW,EAAE;;YACrB,OAAO,MAAA,MAAA,cAAc,CAAC,KAAK,EAAE,0CAAE,QAAQ,EAAE,mCAAI,EAAE,CAAC;QAClD,CAAC,CAAC,CAAC;QAEH,IAAI,iBAAiB,IAAI,sBAAsB,EAAE,CAAC;YAChD,OAAO,IAAI,+BAAc,CAAC,MAAM,CAAC,CAAC;QACpC,CAAC;aAAM,CAAC;YACN,OAAO,MAAM,CAAC;QAChB,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;AACH,CAAC;AA5CD,+BA4CC"}