@catladder/pipeline 0.0.0-refactor-cache-1b2d6c36 → 0.0.0-refactor-resolve-references-862e93ac

package/dist/bash/BashExpression.d.ts

@@ -1,3 +1,4 @@
+import type { VariableValue } from "../variables/VariableValue";
 /**
  * this class represents a string that can be evaluated in bash scripts.
  *
@@ -8,6 +9,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
@@ -37,4 +39,4 @@ export declare const joinBashExpressions: (parts: Array<StringOrBashExpression>,
  * escapes a string or bash expression for bash
  * it mainly escapes double quotes
  */
-export declare const bashEscape: (value: StringOrBashExpression | any) => any;
+export declare const bashEscape: (value: VariableValue | any) => any;

package/dist/bash/BashExpression.js

@@ -35,6 +35,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.bashEscape = exports.joinBashExpressions = exports.getBashVariable = exports.BashExpression = void 0;
+var VariableValueContainingReferences_1 = require("../variables/VariableValueContainingReferences");
 /**
  * this class represents a string that can be evaluated in bash scripts.
  *
@@ -50,6 +51,9 @@ var BashExpression = /** @class */function () {
   BashExpression.prototype.toString = function () {
     return this.value.toString();
   };
+  BashExpression.prototype.replace = function (searchValue, replacer) {
+    return new BashExpression(this.value.toString().replace(searchValue, replacer));
+  };
   /**
    *
    * @returns a bash expression to lowercase the string
@@ -117,8 +121,13 @@ var bashEscape = function (value) {
   if (value instanceof BashExpression) {
     return value.toString(); // no need to escape bash expressions, as we want them to evaluate
   }
+
+  if (value instanceof VariableValueContainingReferences_1.VariableValueContainingReferences) {
+    return value.toString({
+      escapeQuotes: true
+    });
+  }
   // we wrap it in double quotes, so we need to escape them
-  if (typeof value === "string") return value.replace(/"/g, '\\"');
-  return value;
+  return value === null || value === void 0 ? void 0 : value.toString().replace(/"/g, '\\"');
 };
 exports.bashEscape = bashEscape;

package/dist/bash/bashYaml.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.writeBashYamlToFileScript = exports.yamlBashString = void 0;
 var yaml_1 = require("yaml");
 var BashExpression_1 = require("./BashExpression");
+var VariableValueContainingReferences_1 = require("../variables/VariableValueContainingReferences");
 var bashExpressionType = {
   tag: "",
   resolve: function (str) {
@@ -16,12 +17,32 @@ var bashExpressionType = {
     // we create a BLOCK_LITERAL
     // but because bash will interpret the value, it may resolve to a multiline string
     // so we need to indent every line using sed
-    return "|-\n" + node.value.transformWithCommand("sed 's/^/".concat(ctx.indent, "/'"));
+    return "|-\n" + ctx.indent + indentNewlinesInBashExpression(node.value, ctx.indent);
   },
   identify: function (v) {
     return v instanceof BashExpression_1.BashExpression;
   }
 };
+var indentNewlinesInBashExpression = function (expression, indent) {
+  return expression.transformWithCommand("sed '1!s/^/".concat(indent, "/'"));
+};
+var variableContainingReferences = {
+  tag: "",
+  resolve: function (str) {
+    // not really needed,but let's make typescript happy
+    return new VariableValueContainingReferences_1.VariableValueContainingReferences(str);
+  },
+  stringify: function (node, ctx) {
+    var value = node.value;
+    var stringified = value.parts.map(function (part) {
+      return part instanceof BashExpression_1.BashExpression ? indentNewlinesInBashExpression(part, ctx.indent) : part.toString().replace(/\n/g, "\n".concat(ctx.indent));
+    }).join("");
+    return "|-\n" + ctx.indent + stringified;
+  },
+  identify: function (v) {
+    return v instanceof VariableValueContainingReferences_1.VariableValueContainingReferences;
+  }
+};
 /***
  * creates a yaml string that can be used in bash scripts
  * it handles BashExpressions correctly so that they can be evaluated in bash
@@ -30,7 +51,7 @@ var yamlBashString = function (value) {
   return (0, yaml_1.stringify)(value, {
     defaultStringType: "BLOCK_LITERAL",
     defaultKeyType: "PLAIN",
-    customTags: [bashExpressionType],
+    customTags: [bashExpressionType, variableContainingReferences],
     aliasDuplicateObjects: false,
     lineWidth: 0
   });

package/dist/bash/replaceAsync.d.ts

@@ -1,2 +1,2 @@
 import { BashExpression } from "./BashExpression";
-export default function replaceAsync(string: string | BashExpression, searchValue: any, replacer: (substring: string, ...args: any[]) => Promise<string | BashExpression>): Promise<string | BashExpression>;
+export default function replaceAsync(string: string | BashExpression, searchValue: any, replacer: (substring: string, ...args: any[]) => Promise<string | BashExpression>): Promise<any>;

package/dist/bash/replaceAsync.js

@@ -132,7 +132,7 @@ function replaceAsync(string, searchValue, replacer) {
         case 1:
           _a.trys.push([1, 3,, 4]);
           values_1 = [];
-          String.prototype.replace.call(string.toString(), searchValue, function () {
+          String.prototype.replace.call(string instanceof BashExpression_1.BashExpression ? string : (0, BashExpression_1.bashEscape)(string), searchValue, function () {
             var args = [];
             for (var _i = 0; _i < arguments.length; _i++) {
               args[_i] = arguments[_i];
@@ -148,7 +148,7 @@ function replaceAsync(string, searchValue, replacer) {
           containsBashExpression = resolvedValues_1.some(function (value) {
             return value instanceof BashExpression_1.BashExpression;
           });
-          result = String.prototype.replace.call(string.toString(), searchValue, function () {
+          result = (string instanceof BashExpression_1.BashExpression ? string : (0, BashExpression_1.bashEscape)(string)).replace(searchValue, function () {
             var _a, _b;
             return (_b = (_a = resolvedValues_1.shift()) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : "";
           });

package/dist/build/cache/createJobCache.js

@@ -49,12 +49,18 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
+var __importDefault = this && this.__importDefault || function (mod) {
+  return mod && mod.__esModule ? mod : {
+    "default": mod
+  };
+};
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createJobCacheFromConfig = exports.createJobCacheFromCacheConfigs = void 0;
 var path_1 = require("path");
 var getAllCacheConfigsFromConfig_1 = require("./getAllCacheConfigsFromConfig");
+var slugify_1 = __importDefault(require("slugify"));
 var createJobCacheFromCacheConfigs = function (context, caches) {
   if (caches.length === 0) return undefined;
   var simpleCacheDefs = caches.filter(function (c) {
@@ -86,7 +92,7 @@ var createJobCacheFromCacheConfigs = function (context, caches) {
       rest = __rest(_a, ["key", "paths", "policy", "scope", "pathMode", "buildDir"]);
     var baseDir = pathMode === "absolute" ? "" : buildDir !== null && buildDir !== void 0 ? buildDir : context.build.dir;
     var transformedKey = scope === "global" ? key : typeof key === "string" ? (scope === "buildDir" // really edge case...
-    ? baseDir : context.name) + "-" + key : __assign(__assign({}, key), {
+    ? (0, slugify_1.default)(baseDir) : context.name) + "-" + key : __assign(__assign({}, key), {
       files: (_b = key.files) === null || _b === void 0 ? void 0 : _b.map(function (f) {
         return pathMode === "absolute" ? f : (0, path_1.join)(baseDir, f);
       })

package/dist/build/docker.js

@@ -135,7 +135,7 @@ var getDockerJobBaseProps = function () {
     services: [{
       name: "docker:24.0.6-dind",
       // see see https://gitlab.com/gitlab-org/gitlab-runner/-/issues/27300#note_466755332
-      command: ["--tls=false"]
+      command: ["--tls=false", "--registry-mirror=https://mirror.gcr.io"]
     }],
     variables: {},
     runnerVariables: getDockerBuildRunnerVariables()