@catladder/cli 0.0.0-next-5f70052e → 0.0.0-next-32b3a548

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (82) hide show
  1. package/dist/bundles/catenv/index.js +424 -181
  2. package/dist/bundles/cli/index.js +437 -187
  3. package/dist/cli/src/apps/catenv/printVariables.js.map +1 -1
  4. package/dist/cli/src/apps/catenv/types.d.ts +0 -1
  5. package/dist/cli/src/apps/catenv/utils.d.ts +2 -5
  6. package/dist/cli/src/apps/catenv/utils.js +4 -9
  7. package/dist/cli/src/apps/catenv/utils.js.map +1 -1
  8. package/dist/cli/src/apps/catenv/writeDotEnvFiles.js +1 -3
  9. package/dist/cli/src/apps/catenv/writeDotEnvFiles.js.map +1 -1
  10. package/dist/cli/src/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.js +12 -12
  11. package/dist/cli/src/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.js.map +1 -1
  12. package/dist/cli/src/apps/cli/commands/project/commandCloudSqlProxy.js +6 -6
  13. package/dist/cli/src/apps/cli/commands/project/commandCloudSqlProxy.js.map +1 -1
  14. package/dist/cli/src/config/getProjectConfig.js.map +1 -1
  15. package/dist/pipeline/src/bash/BashExpression.d.ts +0 -5
  16. package/dist/pipeline/src/bash/BashExpression.js +1 -15
  17. package/dist/pipeline/src/bash/BashExpression.js.map +1 -1
  18. package/dist/pipeline/src/bash/bashEscape.d.ts +30 -0
  19. package/dist/pipeline/src/bash/bashEscape.js +129 -0
  20. package/dist/pipeline/src/bash/bashEscape.js.map +1 -0
  21. package/dist/pipeline/src/bash/bashYaml.js +26 -2
  22. package/dist/pipeline/src/bash/bashYaml.js.map +1 -1
  23. package/dist/pipeline/src/bash/getInjectVarsScript.js +6 -2
  24. package/dist/pipeline/src/bash/getInjectVarsScript.js.map +1 -1
  25. package/dist/pipeline/src/bash/index.d.ts +2 -0
  26. package/dist/pipeline/src/bash/index.js +19 -0
  27. package/dist/pipeline/src/bash/index.js.map +1 -0
  28. package/dist/pipeline/src/build/base/writeDotEnv.js +4 -3
  29. package/dist/pipeline/src/build/base/writeDotEnv.js.map +1 -1
  30. package/dist/pipeline/src/build/docker.d.ts +3 -3
  31. package/dist/pipeline/src/context/getEnvironmentVariables.d.ts +3 -1
  32. package/dist/pipeline/src/context/getEnvironmentVariables.js +23 -12
  33. package/dist/pipeline/src/context/getEnvironmentVariables.js.map +1 -1
  34. package/dist/pipeline/src/deploy/cloudRun/createJobs/getCloudRunDeployScripts.js +2 -2
  35. package/dist/pipeline/src/deploy/cloudRun/createJobs/getCloudRunDeployScripts.js.map +1 -1
  36. package/dist/pipeline/src/deploy/cloudRun/utils/getServiceName.d.ts +1 -1
  37. package/dist/pipeline/src/deploy/kubernetes/cloudSql/index.d.ts +2 -2
  38. package/dist/pipeline/src/deploy/kubernetes/cloudSql/index.js.map +1 -1
  39. package/dist/pipeline/src/deploy/kubernetes/kubeEnv.d.ts +3 -3
  40. package/dist/pipeline/src/deploy/kubernetes/kubeValues.d.ts +2 -2
  41. package/dist/pipeline/src/globalScriptFunctions/index.d.ts +6 -2
  42. package/dist/pipeline/src/globalScriptFunctions/index.js +17 -10
  43. package/dist/pipeline/src/globalScriptFunctions/index.js.map +1 -1
  44. package/dist/pipeline/src/index.d.ts +2 -0
  45. package/dist/pipeline/src/index.js +2 -0
  46. package/dist/pipeline/src/index.js.map +1 -1
  47. package/dist/pipeline/src/pipeline/gitlab/createGitlabPipeline.js +2 -25
  48. package/dist/pipeline/src/pipeline/gitlab/createGitlabPipeline.js.map +1 -1
  49. package/dist/pipeline/src/types/context.d.ts +2 -1
  50. package/dist/pipeline/src/types/context.js.map +1 -1
  51. package/dist/pipeline/src/utils/gitlab.js +9 -2
  52. package/dist/pipeline/src/utils/gitlab.js.map +1 -1
  53. package/dist/pipeline/src/variables/VariableValue.d.ts +3 -0
  54. package/dist/pipeline/src/variables/VariableValue.js +3 -0
  55. package/dist/pipeline/src/variables/VariableValue.js.map +1 -0
  56. package/dist/pipeline/src/variables/VariableValueContainingReferences.d.ts +24 -0
  57. package/dist/pipeline/src/variables/VariableValueContainingReferences.js +69 -0
  58. package/dist/pipeline/src/variables/VariableValueContainingReferences.js.map +1 -0
  59. package/dist/pipeline/src/variables/resolveAllReferences.d.ts +3 -0
  60. package/dist/pipeline/src/variables/resolveAllReferences.js +25 -0
  61. package/dist/pipeline/src/variables/resolveAllReferences.js.map +1 -0
  62. package/dist/pipeline/src/variables/resolveAllReferencesOnce.d.ts +5 -0
  63. package/dist/pipeline/src/variables/resolveAllReferencesOnce.js +23 -0
  64. package/dist/pipeline/src/variables/resolveAllReferencesOnce.js.map +1 -0
  65. package/dist/pipeline/src/variables/resolveReferencesOnce.d.ts +8 -0
  66. package/dist/pipeline/src/variables/resolveReferencesOnce.js +21 -0
  67. package/dist/pipeline/src/variables/resolveReferencesOnce.js.map +1 -0
  68. package/dist/tsconfig.tsbuildinfo +1 -1
  69. package/package.json +1 -1
  70. package/src/apps/catenv/printVariables.ts +2 -2
  71. package/src/apps/catenv/types.ts +2 -2
  72. package/src/apps/catenv/utils.ts +8 -12
  73. package/src/apps/catenv/writeDotEnvFiles.ts +2 -5
  74. package/src/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.ts +16 -10
  75. package/src/apps/cli/commands/project/commandCloudSqlProxy.ts +5 -3
  76. package/src/config/getProjectConfig.ts +5 -1
  77. package/dist/pipeline/src/bash/replaceAsync.d.ts +0 -2
  78. package/dist/pipeline/src/bash/replaceAsync.js +0 -37
  79. package/dist/pipeline/src/bash/replaceAsync.js.map +0 -1
  80. package/dist/pipeline/src/context/resolveReferences.d.ts +0 -3
  81. package/dist/pipeline/src/context/resolveReferences.js +0 -56
  82. package/dist/pipeline/src/context/resolveReferences.js.map +0 -1
package/dist/cli/src/apps/catenv/printVariables.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"printVariables.js","sourceRoot":"","sources":["../../../../../src/apps/catenv/printVariables.ts"],"names":[],"mappings":";;;AACA,oEAAmE;AAEnE,mCAIiB;AAEjB,MAAM,sBAAsB,GAAG,KAAK,EAAE,MAAc,EAAE,MAAe,EAAE,EAAE;;IACvE,MAAM,EAAE,GAAG,EAAE,gBAAgB,EAAE,GAAG,MAAM,IAAA,2CAAmC,EACzE,MAAM,EACN,MAAM,CACP,CAAC;IAEF,IAAI,gBAAgB,EAAE,CAAC;QACrB,wCAAwC;QACxC,IAAI,MAAA,MAAM,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,MAAM,mCAAI,IAAI,EAAE,CAAC;YACvD,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,OAAO,MAAM,IAAA,qCAAkB,EAAC,IAAI,EAAE,GAAG,EAAE,gBAAgB,CAAC,CAAC;IAC/D,CAAC;SAAM,CAAC;QACN,6DAA6D;QAC7D,0EAA0E;QAC1E,mCAAmC;QACnC,OAAO,MAAM,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,CAChD,KAAK,EAAE,GAAG,EAAE,aAAa,EAAE,EAAE;;YAC3B,wCAAwC;YACxC,IAAI,MAAA,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,MAAM,mCAAI,IAAI,EAAE,CAAC;gBACpD,OAAO,MAAM,GAAG,CAAC;YACnB,CAAC;YACD,MAAM,UAAU,GAAG,MAAM,IAAA,qCAAkB,EAAC,IAAI,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC;YACtE,OAAO,UAAU,CAAC,mBAAmB,CAAC,CAAC;YACvC,OAAO;gBACL,GAAG,CAAC,MAAM,GAAG,CAAC;gBACd,GAAG,UAAU;gBACb,qCAAqC;gBACrC,GAAG,MAAM,CAAC,WAAW,CACnB,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;oBAC/C,GAAG,IAAA,0BAAkB,EAAC,aAAa,CAAC,WAAW,EAAE,CAAC,IAAI,GAAG,EAAE;oBAC3D,KAAK;iBACN,CAAC,CACH;aACF,CAAC;QACJ,CAAC,EACD,OAAO,CAAC,OAAO,CAAC,EAA4B,CAAC,CAC9C,CAAC;IACJ,CAAC;AACH,CAAC,CAAC;AAEK,MAAM,cAAc,GAAG,KAAK,EAAE,MAAc,EAAE,MAAe,EAAE,EAAE;IACtE,MAAM,SAAS,GAAG,MAAM,sBAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAE/D,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC,CAAC;AACnD,CAAC,CAAC;AAJW,QAAA,cAAc,kBAIzB;AAEF,MAAM,wBAAwB,GAAG,CAAC,SAAoB,EAAE,EAAE,CACxD,IAAA,0BAAkB,EAAC,SAAS,EAAE,SAAS,CAAC,CAAC"}
1
+ {"version":3,"file":"printVariables.js","sourceRoot":"","sources":["../../../../../src/apps/catenv/printVariables.ts"],"names":[],"mappings":";;;AACA,oEAAmE;AAEnE,mCAIiB;AAEjB,MAAM,sBAAsB,GAAG,KAAK,EAAE,MAAc,EAAE,MAAe,EAAE,EAAE;;IACvE,MAAM,EAAE,GAAG,EAAE,gBAAgB,EAAE,GAAG,MAAM,IAAA,2CAAmC,EACzE,MAAM,EACN,MAAM,CACP,CAAC;IAEF,IAAI,gBAAgB,EAAE,CAAC;QACrB,wCAAwC;QACxC,IAAI,MAAA,MAAM,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,MAAM,mCAAI,IAAI,EAAE,CAAC;YACvD,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,OAAO,MAAM,IAAA,qCAAkB,EAAC,IAAI,EAAE,GAAG,EAAE,gBAAgB,CAAC,CAAC;IAC/D,CAAC;SAAM,CAAC;QACN,6DAA6D;QAC7D,0EAA0E;QAC1E,mCAAmC;QACnC,OAAO,MAAM,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,CAChD,KAAK,EAAE,GAAG,EAAE,aAAa,EAAE,EAAE;;YAC3B,wCAAwC;YACxC,IAAI,MAAA,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,MAAM,mCAAI,IAAI,EAAE,CAAC;gBACpD,OAAO,MAAM,GAAG,CAAC;YACnB,CAAC;YACD,MAAM,UAAU,GAAG,MAAM,IAAA,qCAAkB,EAAC,IAAI,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC;YACtE,OAAO,UAAU,CAAC,mBAAmB,CAAC,CAAC;YACvC,OAAO;gBACL,GAAG,CAAC,MAAM,GAAG,CAAC;gBACd,GAAG,UAAU;gBACb,qCAAqC;gBACrC,GAAG,MAAM,CAAC,WAAW,CACnB,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;oBAC/C,GAAG,IAAA,0BAAkB,EAAC,aAAa,CAAC,WAAW,EAAE,CAAC,IAAI,GAAG,EAAE;oBAC3D,KAAK;iBACN,CAAC,CACH;aACF,CAAC;QACJ,CAAC,EACD,OAAO,CAAC,OAAO,CAAC,EAA4B,CAAC,CAC9C,CAAC;IACJ,CAAC;AACH,CAAC,CAAC;AAEK,MAAM,cAAc,GAAG,KAAK,EAAE,MAAc,EAAE,MAAe,EAAE,EAAE;IACtE,MAAM,SAAS,GAAG,MAAM,sBAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAE/D,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC,CAAC;AACnD,CAAC,CAAC;AAJW,QAAA,cAAc,kBAIzB;AAEF,MAAM,wBAAwB,GAAG,CAAC,SAAiC,EAAE,EAAE,CACrE,IAAA,0BAAkB,EAAC,SAAS,EAAE,SAAS,CAAC,CAAC"}
package/dist/cli/src/apps/catenv/types.d.ts CHANGED
@@ -2,4 +2,3 @@ export type Choice = {
2
2
  env?: string;
3
3
  componentName?: string;
4
4
  };
5
- export type Variables = Record<string, string>;
package/dist/cli/src/apps/catenv/utils.d.ts CHANGED
@@ -1,12 +1,9 @@
1
1
  import type { Config } from "../../../../pipeline/src/index.js";
2
- import type { Choice, Variables } from "./types";
2
+ import type { Choice } from "./types";
3
3
  export declare const getComponentFullPath: (gitRoot: string, config: Config, componentName: string) => string;
4
4
  export declare const getCurrentComponentAndEnvFromChoice: (config: Config, choice?: Choice) => Promise<{
5
5
  currentComponent: string;
6
6
  env: string;
7
7
  }>;
8
- export declare const makeKeyValueString: (variables: Variables, keyPrefix?: string) => string;
9
- export declare const sanitizeMultiLine: (variables: Variables) => {
10
- [k: string]: string;
11
- };
8
+ export declare const makeKeyValueString: (variables: Record<string, string>, keyPrefix?: string) => string;
12
9
  export declare const sanitizeEnvVarName: (name: string) => string;
package/dist/cli/src/apps/catenv/utils.js CHANGED
@@ -1,8 +1,9 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.sanitizeEnvVarName = exports.sanitizeMultiLine = exports.makeKeyValueString = exports.getCurrentComponentAndEnvFromChoice = exports.getComponentFullPath = void 0;
3
+ exports.sanitizeEnvVarName = exports.makeKeyValueString = exports.getCurrentComponentAndEnvFromChoice = exports.getComponentFullPath = void 0;
4
4
  const path_1 = require("path");
5
5
  const projects_1 = require("../../utils/projects");
6
+ const pipeline_1 = require("../../../../pipeline/src/index.js");
6
7
  const getComponentFullPath = (gitRoot, config, componentName) => {
7
8
  return (0, path_1.join)(gitRoot, config.components[componentName].dir);
8
9
  };
@@ -23,16 +24,10 @@ const getCurrentComponentAndEnvFromChoice = async (config, choice) => {
23
24
  };
24
25
  exports.getCurrentComponentAndEnvFromChoice = getCurrentComponentAndEnvFromChoice;
25
26
  const makeKeyValueString = (variables, keyPrefix = "") => Object.entries(variables)
26
- .map(([key, value]) => `${keyPrefix}${key}='${value}'`)
27
+ // quotes are important, otherwise line breaks don't work properly
28
+ .map(([key, value]) => `${keyPrefix}${key}=${(0, pipeline_1.escapeForDotEnv)(value)}`)
27
29
  .join("\n");
28
30
  exports.makeKeyValueString = makeKeyValueString;
29
- const sanitizeMultiLine = (variables) => {
30
- return Object.fromEntries(Object.entries(variables).map(([key, value]) => [
31
- key,
32
- value.replaceAll("\n", "\\n"),
33
- ]));
34
- };
35
- exports.sanitizeMultiLine = sanitizeMultiLine;
36
31
  const sanitizeEnvVarName = (name) => name.replace(/[\s\-.]+/g, "_");
37
32
  exports.sanitizeEnvVarName = sanitizeEnvVarName;
38
33
  //# sourceMappingURL=utils.js.map
package/dist/cli/src/apps/catenv/utils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/apps/catenv/utils.ts"],"names":[],"mappings":";;;AACA,+BAA4B;AAC5B,mDAAkD;AAE3C,MAAM,oBAAoB,GAAG,CAClC,OAAe,EACf,MAAc,EACd,aAAqB,EACrB,EAAE;IACF,OAAO,IAAA,WAAI,EAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,CAAC;AAC7D,CAAC,CAAC;AANW,QAAA,oBAAoB,wBAM/B;AACF,MAAM,uBAAuB,GAAG,KAAK,EAAE,MAAc,EAAE,EAAE;IACvD,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAU,GAAE,CAAC;IACnC,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IACjC,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC/C,UAAU,CAAC,UAAU,CAAC,IAAA,4BAAoB,EAAC,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,CAChE,CAAC;AACJ,CAAC,CAAC;AAEK,MAAM,mCAAmC,GAAG,KAAK,EACtD,MAAc,EACd,MAAe,EACf,EAAE;;IACF,MAAM,GAAG,GAAG,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,GAAG,mCAAI,OAAO,CAAC;IACnC,MAAM,gBAAgB,GACpB,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,mCAAI,CAAC,MAAM,uBAAuB,CAAC,MAAM,CAAC,CAAC,CAAC;IAEnE,OAAO;QACL,gBAAgB;QAChB,GAAG;KACJ,CAAC;AACJ,CAAC,CAAC;AAZW,QAAA,mCAAmC,uCAY9C;AAEK,MAAM,kBAAkB,GAAG,CAAC,SAAoB,EAAE,SAAS,GAAG,EAAE,EAAE,EAAE,CACzE,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC;KACtB,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,SAAS,GAAG,GAAG,KAAK,KAAK,GAAG,CAAC;KACtD,IAAI,CAAC,IAAI,CAAC,CAAC;AAHH,QAAA,kBAAkB,sBAGf;AAET,MAAM,iBAAiB,GAAG,CAAC,SAAoB,EAAE,EAAE;IACxD,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;QAC9C,GAAG;QACH,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC;KAC9B,CAAC,CACH,CAAC;AACJ,CAAC,CAAC;AAPW,QAAA,iBAAiB,qBAO5B;AAEK,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAE,EAAE,CACjD,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;AADpB,QAAA,kBAAkB,sBACE"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/apps/catenv/utils.ts"],"names":[],"mappings":";;;AACA,+BAA4B;AAC5B,mDAAkD;AAElD,kDAAsD;AAC/C,MAAM,oBAAoB,GAAG,CAClC,OAAe,EACf,MAAc,EACd,aAAqB,EACrB,EAAE;IACF,OAAO,IAAA,WAAI,EAAC,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,CAAC;AAC7D,CAAC,CAAC;AANW,QAAA,oBAAoB,wBAM/B;AACF,MAAM,uBAAuB,GAAG,KAAK,EAAE,MAAc,EAAE,EAAE;IACvD,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAU,GAAE,CAAC;IACnC,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IACjC,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC/C,UAAU,CAAC,UAAU,CAAC,IAAA,4BAAoB,EAAC,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,CAChE,CAAC;AACJ,CAAC,CAAC;AAEK,MAAM,mCAAmC,GAAG,KAAK,EACtD,MAAc,EACd,MAAe,EACf,EAAE;;IACF,MAAM,GAAG,GAAG,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,GAAG,mCAAI,OAAO,CAAC;IACnC,MAAM,gBAAgB,GACpB,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,mCAAI,CAAC,MAAM,uBAAuB,CAAC,MAAM,CAAC,CAAC,CAAC;IAEnE,OAAO;QACL,gBAAgB;QAChB,GAAG;KACJ,CAAC;AACJ,CAAC,CAAC;AAZW,QAAA,mCAAmC,uCAY9C;AAEK,MAAM,kBAAkB,GAAG,CAChC,SAAiC,EACjC,SAAS,GAAG,EAAE,EACd,EAAE,CACF,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC;IACvB,kEAAkE;KACjE,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,SAAS,GAAG,GAAG,IAAI,IAAA,0BAAe,EAAC,KAAK,CAAC,EAAE,CAAC;KACrE,IAAI,CAAC,IAAI,CAAC,CAAC;AAPH,QAAA,kBAAkB,sBAOf;AAET,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAE,EAAE,CACjD,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;AADpB,QAAA,kBAAkB,sBACE"}
package/dist/cli/src/apps/catenv/writeDotEnvFiles.js CHANGED
@@ -22,9 +22,7 @@ const writeDotEnvFiles = async (config, choice) => {
22
22
  delete variables["_ALL_ENV_VAR_KEYS"];
23
23
  const componentDir = (0, utils_1.getComponentFullPath)(gitRoot, config, componentName);
24
24
  const filePath = (0, path_1.join)(componentDir, ".env");
25
- // many .dotenv don't like multiline values, so we sanitize them here
26
- const variablesSanitized = (0, utils_1.sanitizeMultiLine)(variables);
27
- await (0, pipeline_1.writeGeneratedFile)(filePath, (0, utils_1.makeKeyValueString)(variablesSanitized), {
25
+ await (0, pipeline_1.writeGeneratedFile)(filePath, (0, utils_1.makeKeyValueString)(variables), {
28
26
  commentChar: "#",
29
27
  });
30
28
  }
package/dist/cli/src/apps/catenv/writeDotEnvFiles.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"writeDotEnvFiles.js","sourceRoot":"","sources":["../../../../../src/apps/catenv/writeDotEnvFiles.ts"],"names":[],"mappings":";;;AAAA,kDAAsE;AAEtE,+BAA4B;AAC5B,oEAAmE;AACnE,mDAAkD;AAElD,mCAKiB;AAEV,MAAM,gBAAgB,GAAG,KAAK,EAAE,MAAc,EAAE,MAAe,EAAE,EAAE;IACxE,MAAM,EAAE,GAAG,EAAE,gBAAgB,EAAE,GAAG,MAAM,IAAA,2CAAmC,EACzE,MAAM,EACN,MAAM,CACP,CAAC;IAEF,MAAM,gCAAgC,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC;SACvE,MAAM,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,EAAE,EAAE,WAAC,OAAA,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,mCAAI,IAAI,CAAA,EAAA,CAAC,CAAC,8BAA8B;SACnF,GAAG,CAAC,CAAC,CAAC,aAAa,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC;IAE3C,MAAM,kCAAkC,GAAG,gBAAgB;QACzD,CAAC,CAAC,gCAAgC,CAAC,QAAQ,CAAC,gBAAgB,CAAC;YAC3D,CAAC,CAAC,CAAC,gBAAgB,CAAC;YACpB,CAAC,CAAC,EAAE;QACN,CAAC,CAAC,gCAAgC,CAAC;IACrC,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAU,GAAE,CAAC;IAEnC,KAAK,MAAM,aAAa,IAAI,kCAAkC,EAAE,CAAC;QAC/D,MAAM,SAAS,GAAG,MAAM,IAAA,qCAAkB,EAAC,IAAI,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC;QACrE,OAAO,SAAS,CAAC,mBAAmB,CAAC,CAAC;QACtC,MAAM,YAAY,GAAG,IAAA,4BAAoB,EAAC,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;QAC1E,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QAC5C,qEAAqE;QACrE,MAAM,kBAAkB,GAAG,IAAA,yBAAiB,EAAC,SAAS,CAAC,CAAC;QACxD,MAAM,IAAA,6BAAkB,EAAC,QAAQ,EAAE,IAAA,0BAAkB,EAAC,kBAAkB,CAAC,EAAE;YACzE,WAAW,EAAE,GAAG;SACjB,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC;AA5BW,QAAA,gBAAgB,oBA4B3B"}
1
+ {"version":3,"file":"writeDotEnvFiles.js","sourceRoot":"","sources":["../../../../../src/apps/catenv/writeDotEnvFiles.ts"],"names":[],"mappings":";;;AAAA,kDAAsE;AACtE,+BAA4B;AAC5B,oEAAmE;AACnE,mDAAkD;AAElD,mCAIiB;AAEV,MAAM,gBAAgB,GAAG,KAAK,EAAE,MAAc,EAAE,MAAe,EAAE,EAAE;IACxE,MAAM,EAAE,GAAG,EAAE,gBAAgB,EAAE,GAAG,MAAM,IAAA,2CAAmC,EACzE,MAAM,EACN,MAAM,CACP,CAAC;IAEF,MAAM,gCAAgC,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC;SACvE,MAAM,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,EAAE,EAAE,WAAC,OAAA,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,mCAAI,IAAI,CAAA,EAAA,CAAC,CAAC,8BAA8B;SACnF,GAAG,CAAC,CAAC,CAAC,aAAa,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC;IAE3C,MAAM,kCAAkC,GAAG,gBAAgB;QACzD,CAAC,CAAC,gCAAgC,CAAC,QAAQ,CAAC,gBAAgB,CAAC;YAC3D,CAAC,CAAC,CAAC,gBAAgB,CAAC;YACpB,CAAC,CAAC,EAAE;QACN,CAAC,CAAC,gCAAgC,CAAC;IACrC,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAU,GAAE,CAAC;IAEnC,KAAK,MAAM,aAAa,IAAI,kCAAkC,EAAE,CAAC;QAC/D,MAAM,SAAS,GAAG,MAAM,IAAA,qCAAkB,EAAC,IAAI,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC;QACrE,OAAO,SAAS,CAAC,mBAAmB,CAAC,CAAC;QACtC,MAAM,YAAY,GAAG,IAAA,4BAAoB,EAAC,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;QAC1E,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QAE5C,MAAM,IAAA,6BAAkB,EAAC,QAAQ,EAAE,IAAA,0BAAkB,EAAC,SAAS,CAAC,EAAE;YAChE,WAAW,EAAE,GAAG;SACjB,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC;AA3BW,QAAA,gBAAgB,oBA2B3B"}
package/dist/cli/src/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.js CHANGED
@@ -8,7 +8,7 @@ const copyDb_1 = require("../../../../../gcloud/cloudSql/copyDb");
8
8
  exports.default = async (vorpal) => vorpal
9
9
  .command("project-cloud-sql-restore-db", "restores a project db from one source to another target")
10
10
  .action(async function restoreDb() {
11
- var _a, _b, _c, _d;
11
+ var _a, _b, _c, _d, _e;
12
12
  const envs = await (0, autocompletions_1.envAndComponents)();
13
13
  const { sourceEnvAndComponent } = await this.prompt({
14
14
  type: "list",
@@ -38,7 +38,7 @@ exports.default = async (vorpal) => vorpal
38
38
  scheme: "postgres",
39
39
  hosts: [],
40
40
  });
41
- const parsersResult = parser.parse(sourceEnvVars.DATABASE_URL);
41
+ const parsersResult = parser.parse(sourceEnvVars.DATABASE_URL.toString());
42
42
  sourcePort = (_b = (_a = parsersResult.hosts) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.port;
43
43
  sourceUsername = parsersResult.username;
44
44
  sourcePassword = parsersResult.password;
@@ -47,12 +47,12 @@ exports.default = async (vorpal) => vorpal
47
47
  else {
48
48
  sourcePort = 54399;
49
49
  sourceProxy = await (0, startProxy_1.startCloudSqlProxyInBackground)({
50
- instanceName: sourceEnvVars.CLOUD_SQL_INSTANCE_CONNECTION_NAME,
50
+ instanceName: sourceEnvVars.CLOUD_SQL_INSTANCE_CONNECTION_NAME.toString(),
51
51
  localPort: sourcePort,
52
52
  });
53
- sourceUsername = sourceEnvVars.DB_USER;
54
- sourcePassword = sourceEnvVars.DB_PASSWORD;
55
- sourceDbName = sourceEnvVars.DB_NAME;
53
+ sourceUsername = sourceEnvVars.DB_USER.toString();
54
+ sourcePassword = sourceEnvVars.DB_PASSWORD.toString();
55
+ sourceDbName = (_c = sourceEnvVars.DB_NAME) === null || _c === void 0 ? void 0 : _c.toString();
56
56
  }
57
57
  const { targetEnvAndComponent } = await this.prompt({
58
58
  type: "list",
@@ -68,8 +68,8 @@ exports.default = async (vorpal) => vorpal
68
68
  scheme: "postgres",
69
69
  hosts: [],
70
70
  });
71
- const parsersResult = parser.parse(targetEnvVars.DATABASE_URL);
72
- targetPort = (_d = (_c = parsersResult.hosts) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.port;
71
+ const parsersResult = parser.parse(targetEnvVars.DATABASE_URL.toString());
72
+ targetPort = (_e = (_d = parsersResult.hosts) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.port;
73
73
  targetUsername = parsersResult.username;
74
74
  targetPassword = parsersResult.password;
75
75
  targetDbName = parsersResult.endpoint;
@@ -77,12 +77,12 @@ exports.default = async (vorpal) => vorpal
77
77
  else {
78
78
  targetPort = 54499;
79
79
  targetProxy = await (0, startProxy_1.startCloudSqlProxyInBackground)({
80
- instanceName: targetEnvVars.CLOUD_SQL_INSTANCE_CONNECTION_NAME,
80
+ instanceName: targetEnvVars.CLOUD_SQL_INSTANCE_CONNECTION_NAME.toString(),
81
81
  localPort: targetPort,
82
82
  });
83
- targetUsername = targetEnvVars.DB_USER;
84
- targetPassword = targetEnvVars.DB_PASSWORD;
85
- targetDbName = targetEnvVars.DB_NAME;
83
+ targetUsername = targetEnvVars.DB_USER.toString();
84
+ targetPassword = targetEnvVars.DB_PASSWORD.toString();
85
+ targetDbName = targetEnvVars.DB_NAME.toString();
86
86
  }
87
87
  const { shouldContinue } = await this.prompt({
88
88
  type: "confirm",
package/dist/cli/src/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"commandProjectRestoreDb.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"commandProjectRestoreDb.js","sourceRoot":"","sources":["../../../../../../../../src/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.ts"],"names":[],"mappings":"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"}
package/dist/cli/src/apps/cli/commands/project/commandCloudSqlProxy.js CHANGED
@@ -51,14 +51,14 @@ exports.default = async (vorpal) => vorpal
51
51
  });
52
52
  });
53
53
  const getProxyInfoForKubernetes = async (vorpal, context) => {
54
- var _a;
54
+ var _a, _b;
55
55
  if (!(0, pipeline_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "kubernetes")) {
56
56
  throw new Error("unsupported");
57
57
  }
58
58
  const envVars = await (0, getProjectConfig_1.getEnvVarsResolved)(vorpal, context.env, context.name);
59
59
  // bit hacky, would be nicer if we would also declare this through env vars
60
60
  const cloudSqlValues = (0, pipeline_1.createKubernetesCloudsqlBaseValues)(context);
61
- const DB_PASSWORD = (envVars === null || envVars === void 0 ? void 0 : envVars.DB_PASSWORD) || (envVars === null || envVars === void 0 ? void 0 : envVars.POSTGRESQL_PASSWORD);
61
+ const DB_PASSWORD = (_b = ((envVars === null || envVars === void 0 ? void 0 : envVars.DB_PASSWORD) || (envVars === null || envVars === void 0 ? void 0 : envVars.POSTGRESQL_PASSWORD))) === null || _b === void 0 ? void 0 : _b.toString();
62
62
  const DB_NAME = cloudSqlValues.cloudsql.fullDbName.toString();
63
63
  const instanceName = cloudSqlValues.cloudsql.instanceConnectionName;
64
64
  return {
@@ -69,17 +69,17 @@ const getProxyInfoForKubernetes = async (vorpal, context) => {
69
69
  };
70
70
  };
71
71
  const getProxyInfoForCloudRun = async (vorpal, context) => {
72
- var _a, _b, _c;
72
+ var _a, _b, _c, _d, _e;
73
73
  if (!(0, pipeline_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "google-cloudrun") ||
74
74
  !((_b = context.deploy) === null || _b === void 0 ? void 0 : _b.config.cloudSql)) {
75
75
  throw new Error("unsupported");
76
76
  }
77
77
  const envVars = await (0, getProjectConfig_1.getEnvVarsResolved)(vorpal, context.env, context.name);
78
- const DB_PASSWORD = envVars === null || envVars === void 0 ? void 0 : envVars.DB_PASSWORD;
79
- const DB_USER = envVars === null || envVars === void 0 ? void 0 : envVars.DB_USER;
78
+ const DB_PASSWORD = (_c = envVars === null || envVars === void 0 ? void 0 : envVars.DB_PASSWORD) === null || _c === void 0 ? void 0 : _c.toString();
79
+ const DB_USER = (_d = envVars === null || envVars === void 0 ? void 0 : envVars.DB_USER) === null || _d === void 0 ? void 0 : _d.toString();
80
80
  const DB_NAME = context.environment.envVars.DB_NAME.toString();
81
81
  return {
82
- instanceName: (_c = context.deploy) === null || _c === void 0 ? void 0 : _c.config.cloudSql.instanceConnectionName,
82
+ instanceName: (_e = context.deploy) === null || _e === void 0 ? void 0 : _e.config.cloudSql.instanceConnectionName,
83
83
  DB_PASSWORD,
84
84
  DB_NAME,
85
85
  DB_USER,
package/dist/cli/src/apps/cli/commands/project/commandCloudSqlProxy.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"commandCloudSqlProxy.js","sourceRoot":"","sources":["../../../../../../../src/apps/cli/commands/project/commandCloudSqlProxy.ts"],"names":[],"mappings":";;AACA,kDAG6B;AAG7B,0EAI6C;AAC7C,6DAA2D;AAC3D,uEAA0F;AAQ1F,kBAAe,KAAK,EAAE,MAAc,EAAE,EAAE,CACtC,MAAM;KACH,OAAO,CAAC,wCAAwC,EAAE,uBAAuB,CAAC;KAC1E,YAAY,CAAC,MAAM,IAAA,kCAAgB,GAAE,CAAC;KACtC,MAAM,CAAC,KAAK,WAAW,EAAE,YAAY,EAAE;;IACtC,MAAM,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,IAAA,8BAAW,EAAC,YAAY,CAAC,CAAC;IACzD,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,IAAI,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;QAC/B,OAAO;IACT,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,IAAA,6CAA0B,EAAC,GAAG,EAAE,aAAa,CAAC,CAAC;IACrE,IAAI,SAAoB,CAAC;IAEzB,IAAI,GAAG,KAAK,QAAQ,EAAE,CAAC;QACrB,MAAM,CAAC,GAAG,CACR,6EAA6E,CAC9E,CAAC;IACJ,CAAC;IACD,IAAI,IAAA,yBAAc,EAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC;QACzD,SAAS,GAAG,MAAM,yBAAyB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC7D,CAAC;SAAM,IAAI,IAAA,yBAAc,EAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,CAAC;QACrE,SAAS,GAAG,MAAM,uBAAuB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC3D,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,4DAA4D;IAC5D,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,SAAS,CAAC;IAClE,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC;QACtC,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,OAAO;QAChB,OAAO,EAAE,cAAc;KACxB,CAAC,CAAC;IAEH,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACb,IAAI,CAAC,GAAG,CAAC,gBAAgB,WAAW,EAAE,CAAC,CAAC;IACxC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACb,IAAI,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;IAChC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACb,IAAI,CAAC,GAAG,CACN,6BAA6B,OAAO,IAAI,WAAW,cAAc,SAAS,IAAI,OAAO,gBAAgB,CACtG,CAAC;IACF,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACb,IAAI,CAAC,GAAG,CACN,iDAAiD,SAAS,IAAI,OAAO,uBAAuB,OAAO,aAAa,WAAW,EAAE,CAC9H,CAAC;IACF,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAEb,MAAM,IAAA,6CAAgC,EAAC;QACrC,YAAY;QACZ,SAAS;KACV,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEP,MAAM,yBAAyB,GAAG,KAAK,EACrC,MAAuB,EACvB,OAAyB,EACL,EAAE;;IACtB,IAAI,CAAC,IAAA,yBAAc,EAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC;QAC1D,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;IACjC,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,IAAA,qCAAkB,EAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5E,2EAA2E;IAC3E,MAAM,cAAc,GAAG,IAAA,6CAAkC,EAAC,OAAO,CAAC,CAAC;IAEnE,MAAM,WAAW,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,MAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,mBAAmB,CAAA,CAAC;IAEzE,MAAM,OAAO,GAAG,cAAc,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;IAE9D,MAAM,YAAY,GAAG,cAAc,CAAC,QAAQ,CAAC,sBAAsB,CAAC;IAEpE,OAAO;QACL,YAAY;QACZ,WAAW;QACX,OAAO;QACP,OAAO,EAAE,UAAU;KACpB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG,KAAK,EACnC,MAAuB,EACvB,OAAyB,EACL,EAAE;;IACtB,IACE,CAAC,IAAA,yBAAc,EAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,EAAE,iBAAiB,CAAC;QAC1D,CAAC,CAAA,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC,QAAQ,CAAA,EAChC,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;IACjC,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,IAAA,qCAAkB,EAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5E,MAAM,WAAW,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,CAAC;IACzC,MAAM,OAAO,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC;IAEjC,MAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;IAE/D,OAAO;QACL,YAAY,EAAE,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC,QAAQ,CAAC,sBAAsB;QACpE,WAAW;QACX,OAAO;QACP,OAAO;KACR,CAAC;AACJ,CAAC,CAAC"}
1
+ {"version":3,"file":"commandCloudSqlProxy.js","sourceRoot":"","sources":["../../../../../../../src/apps/cli/commands/project/commandCloudSqlProxy.ts"],"names":[],"mappings":";;AACA,kDAG6B;AAG7B,0EAI6C;AAC7C,6DAA2D;AAC3D,uEAA0F;AAQ1F,kBAAe,KAAK,EAAE,MAAc,EAAE,EAAE,CACtC,MAAM;KACH,OAAO,CAAC,wCAAwC,EAAE,uBAAuB,CAAC;KAC1E,YAAY,CAAC,MAAM,IAAA,kCAAgB,GAAE,CAAC;KACtC,MAAM,CAAC,KAAK,WAAW,EAAE,YAAY,EAAE;;IACtC,MAAM,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,IAAA,8BAAW,EAAC,YAAY,CAAC,CAAC;IACzD,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,IAAI,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;QAC/B,OAAO;IACT,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,IAAA,6CAA0B,EAAC,GAAG,EAAE,aAAa,CAAC,CAAC;IACrE,IAAI,SAAoB,CAAC;IAEzB,IAAI,GAAG,KAAK,QAAQ,EAAE,CAAC;QACrB,MAAM,CAAC,GAAG,CACR,6EAA6E,CAC9E,CAAC;IACJ,CAAC;IACD,IAAI,IAAA,yBAAc,EAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC;QACzD,SAAS,GAAG,MAAM,yBAAyB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC7D,CAAC;SAAM,IAAI,IAAA,yBAAc,EAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,CAAC;QACrE,SAAS,GAAG,MAAM,uBAAuB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC3D,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,4DAA4D;IAC5D,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,SAAS,CAAC;IAClE,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC;QACtC,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,OAAO;QAChB,OAAO,EAAE,cAAc;KACxB,CAAC,CAAC;IAEH,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACb,IAAI,CAAC,GAAG,CAAC,gBAAgB,WAAW,EAAE,CAAC,CAAC;IACxC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACb,IAAI,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;IAChC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACb,IAAI,CAAC,GAAG,CACN,6BAA6B,OAAO,IAAI,WAAW,cAAc,SAAS,IAAI,OAAO,gBAAgB,CACtG,CAAC;IACF,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACb,IAAI,CAAC,GAAG,CACN,iDAAiD,SAAS,IAAI,OAAO,uBAAuB,OAAO,aAAa,WAAW,EAAE,CAC9H,CAAC;IACF,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAEb,MAAM,IAAA,6CAAgC,EAAC;QACrC,YAAY;QACZ,SAAS;KACV,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEP,MAAM,yBAAyB,GAAG,KAAK,EACrC,MAAuB,EACvB,OAAyB,EACL,EAAE;;IACtB,IAAI,CAAC,IAAA,yBAAc,EAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC;QAC1D,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;IACjC,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,IAAA,qCAAkB,EAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5E,2EAA2E;IAC3E,MAAM,cAAc,GAAG,IAAA,6CAAkC,EAAC,OAAO,CAAC,CAAC;IAEnE,MAAM,WAAW,GAAG,MAAA,CAClB,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,MAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,mBAAmB,CAAA,CACrD,0CAAE,QAAQ,EAAE,CAAC;IAEd,MAAM,OAAO,GAAG,cAAc,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;IAE9D,MAAM,YAAY,GAAG,cAAc,CAAC,QAAQ,CAAC,sBAAsB,CAAC;IAEpE,OAAO;QACL,YAAY;QACZ,WAAW;QACX,OAAO;QACP,OAAO,EAAE,UAAU;KACpB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG,KAAK,EACnC,MAAuB,EACvB,OAAyB,EACL,EAAE;;IACtB,IACE,CAAC,IAAA,yBAAc,EAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,EAAE,iBAAiB,CAAC;QAC1D,CAAC,CAAA,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC,QAAQ,CAAA,EAChC,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;IACjC,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,IAAA,qCAAkB,EAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5E,MAAM,WAAW,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,0CAAE,QAAQ,EAAE,CAAC;IACrD,MAAM,OAAO,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,0CAAE,QAAQ,EAAE,CAAC;IAE7C,MAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;IAE/D,OAAO;QACL,YAAY,EAAE,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC,QAAQ,CAAC,sBAAsB;QACpE,WAAW;QACX,OAAO;QACP,OAAO;KACR,CAAC;AACJ,CAAC,CAAC"}
package/dist/cli/src/config/getProjectConfig.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getProjectConfig.js","sourceRoot":"","sources":["../../../../src/config/getProjectConfig.ts"],"names":[],"mappings":";;;AACA,kDAM6B;AAG7B,4CAA6E;AAE7E,gDAA+C;AAE/C,2BAA2B;AAE3B,6CAA4C;AAAnC,0GAAA,WAAW,OAAA;AAEpB,IAAI,aAAa,GAAkB,IAAI,CAAC;AAExC,8BAA8B;AAC9B,MAAM,sBAAsB,GAAG,KAAK,IAAI,EAAE;IACxC,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAU,GAAE,CAAC;IACnC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO;IACT,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,IAAA,qBAAU,EAAC,OAAO,CAAC,CAAC;IACzC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,wCAAwC;QACxC,OAAO;IACT,CAAC;IACD,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IAChC,MAAM,OAAO,GAAG,IAAA,UAAK,EAAC,IAAI,EAAE,GAAG,EAAE;QAC/B,OAAO,CAAC,KAAK,EAAE,CAAC;QAChB,sBAAsB,EAAE,CAAC;IAC3B,CAAC,CAAC,CAAC;IACH,aAAa,GAAG,MAAM,CAAC;AACzB,CAAC,CAAC;AAEK,MAAM,gBAAgB,GAAG,KAAK,IAAI,EAAE;IACzC,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,YAAY;QACZ,MAAM,sBAAsB,EAAE,CAAC;IACjC,CAAC;IACD,OAAO,aAAuB,CAAC;AACjC,CAAC,CAAC;AANW,QAAA,gBAAgB,oBAM3B;AAEK,MAAM,oBAAoB,GAAG,KAAK,IAAI,EAAE;IAC7C,MAAM,MAAM,GAAG,MAAM,IAAA,wBAAgB,GAAE,CAAC;IACxC,IAAI,CAAC,MAAM;QAAE,OAAO,EAAE,CAAC;IACvB,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;AACxC,CAAC,CAAC;AAJW,QAAA,oBAAoB,wBAI/B;AAEK,MAAM,0BAA0B,GAAG,KAAK,EAC7C,GAAW,EACX,aAAqB,EACrB,EAAE;IACF,MAAM,MAAM,GAAG,MAAM,IAAA,wBAAgB,GAAE,CAAC;IACxC,OAAO,MAAM,IAAA,iCAAsB,EAAC;QAClC,MAAM;QACN,aAAa;QACb,GAAG;KACJ,CAAC,CAAC;AACL,CAAC,CAAC;AAVW,QAAA,0BAA0B,8BAUrC;AACK,MAAM,+BAA+B,GAAG,KAAK,IAElD,EAAE;IACF,MAAM,MAAM,GAAG,MAAM,IAAA,wBAAgB,GAAE,CAAC;IACxC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE,CAC9D,IAAA,qBAAU,EAAC,MAAM,EAAE,aAAa,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,CAAC,CAAC,CACzE,CAAC;AACJ,CAAC,CAAC;AAVW,QAAA,+BAA+B,mCAU1C;AAEK,MAAM,uCAAuC,GAAG,KAAK,IAEzD,EAAE;IACH,MAAM,MAAM,GAAG,MAAM,IAAA,wBAAgB,GAAE,CAAC;IACxC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,aAAa,EAAE,EAAE,CAAC;QACpD,aAAa;QACb,IAAA,qBAAU,EAAC,MAAM,EAAE,aAAa,CAAC;KAClC,CAAC,CACH,CAAC;AACJ,CAAC,CAAC;AAdW,QAAA,uCAAuC,2CAclD;AAEK,MAAM,sBAAsB,GAAG,KAAK,IAAI,EAAE;IAC/C,OAAO,OAAO,CAAC,GAAG,CAChB,CAAC,MAAM,IAAA,uCAA+B,GAAE,CAAC;SACtC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,OAAO,CAAC;SAChC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,EAAE,EAAE,CAC9B,IAAA,kCAA0B,EAAC,GAAG,EAAE,aAAa,CAAC,CAC/C,CACJ,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,sBAAsB,0BAQjC;AAEK,MAAM,cAAc,GAAG,KAAK,EAAE,GAAW,EAAE,aAAqB,EAAE,EAAE;IACzE,MAAM,MAAM,GAAG,MAAM,IAAA,wBAAgB,GAAE,CAAC;IAExC,OAAO,IAAA,yBAAe,EAAC,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,EAAE,CAAC,CAAC;AACzD,CAAC,CAAC;AAJW,QAAA,cAAc,kBAIzB;AAEK,MAAM,YAAY,GAAG,KAAK,EAC/B,MAAuB,EACvB,GAAW,EACX,aAAqB,EACrB,YAAoB,EACpB,EAAE;IACF,MAAM,eAAe,GAAG,IAAA,2BAAgB,EAAC,GAAG,EAAE,aAAa,EAAE,YAAY,CAAC,CAAC;IAC3E,OAAO,MAAM,IAAA,kCAAyB,EAAC,MAAM,EAAE,eAAe,CAAC,CAAC;AAClE,CAAC,CAAC;AARW,QAAA,YAAY,gBAQvB;AAEF,MAAM,cAAc,GAAG,KAAK,EAC1B,MAA8B,EAC9B,OAA6B,EACI,EAAE;IACnC,MAAM,oBAAoB,GAAG,MAAM,IAAA,wBAAe,EAAC,MAAM,CAAC,CAAC;IAE3D,OAAO,MAAM,CAAC,WAAW,CACvB,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,gBAAgB,EAAE,EAAE,EAAE,CAChD,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;SACpB,MAAM,CACL,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;;QACf,OAAA,KAAK,KAAK,SAAS;YACnB,KAAK,KAAK,IAAI;YACd,CAAC,CAAA,MAAA,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC,0CAAE,MAAM,CAAA,CAAA;KAAA,CACvD;SACA,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;QACrB,GAAG;QACH,oBAAoB,CAAC,MAAM,CACzB,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CACZ,GAAG,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,EAC5D,GAAG,KAAK,EAAE,CACX;KACF,CAAC,CACL,CACF,CAAC;AACJ,CAAC,CAAC;AAEK,MAAM,kBAAkB,GAAG,KAAK,EACrC,MAA8B,EAC9B,GAAW,EACX,aAA4B,EAC5B,EAAE;IACF,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,MAAM,IAAA,sBAAc,EAAC,GAAG,EAAE,aAAa,CAAC,CAAC;QAE5D,yEAAyE;QACzE,yCAAyC;QACzC,OAAO,cAAc,CAAC,MAAM,EAAE;YAC5B;gBACE,OAAO,EAAE,UAAU,CAAC,OAAO;gBAC3B,gBAAgB,EAAE,UAAU,CAAC,gBAAgB;aAC9C;SACF,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,kBAAkB;QAClB,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC,CAAC;AAvBW,QAAA,kBAAkB,sBAuB7B;AAEF;;;GAGG;AACI,MAAM,yBAAyB,GAAG,KAAK,EAC5C,MAAuB,EACvB,GAAW,EACX,aAAqB,EACrB,EAAE;IACF,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,MAAM,IAAA,sBAAc,EAAC,GAAG,EAAE,aAAa,CAAC,CAAC;QAC5D,OAAO,cAAc,CAAC,MAAM,EAAE;YAC5B,UAAU,CAAC,WAAW,CAAC,KAAK;YAC5B,UAAU,CAAC,WAAW,CAAC,MAAM;SAC9B,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,kBAAkB;QAClB,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC,CAAC;AAfW,QAAA,yBAAyB,6BAepC"}
1
+ {"version":3,"file":"getProjectConfig.js","sourceRoot":"","sources":["../../../../src/config/getProjectConfig.ts"],"names":[],"mappings":"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"}
package/dist/pipeline/src/bash/BashExpression.d.ts CHANGED
@@ -34,8 +34,3 @@ export declare const getBashVariable: (name: string) => BashExpression;
34
34
  * @returns
35
35
  */
36
36
  export declare const joinBashExpressions: (parts: Array<StringOrBashExpression>, joiner?: string) => StringOrBashExpression;
37
- /**
38
- * escapes a string or bash expression for bash
39
- * it mainly escapes double quotes
40
- */
41
- export declare const bashEscape: (value: StringOrBashExpression | any) => any;
package/dist/pipeline/src/bash/BashExpression.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.bashEscape = exports.joinBashExpressions = exports.getBashVariable = exports.BashExpression = void 0;
3
+ exports.joinBashExpressions = exports.getBashVariable = exports.BashExpression = void 0;
4
4
  /**
5
5
  * this class represents a string that can be evaluated in bash scripts.
6
6
  *
@@ -64,18 +64,4 @@ const joinBashExpressions = (parts, joiner = "") => {
64
64
  }
65
65
  };
66
66
  exports.joinBashExpressions = joinBashExpressions;
67
- /**
68
- * escapes a string or bash expression for bash
69
- * it mainly escapes double quotes
70
- */
71
- const bashEscape = (value) => {
72
- if (value instanceof BashExpression) {
73
- return value.toString(); // no need to escape bash expressions, as we want them to evaluate
74
- }
75
- // we wrap it in double quotes, so we need to escape them
76
- if (typeof value === "string")
77
- return value.replace(/"/g, '\\"');
78
- return value;
79
- };
80
- exports.bashEscape = bashEscape;
81
67
  //# sourceMappingURL=BashExpression.js.map
package/dist/pipeline/src/bash/BashExpression.js.map CHANGED
@@ -1 +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;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"}
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;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"}
package/dist/pipeline/src/bash/bashEscape.d.ts ADDED
@@ -0,0 +1,30 @@
1
+ import type { VariableValue } from "../variables/VariableValue";
2
+ import { BashExpression } from "./BashExpression";
3
+ export type QuotesEscapeMode = "single" | "double";
4
+ export type EscapeOptions = {
5
+ quotes?: QuotesEscapeMode | false;
6
+ };
7
+ /**
8
+ * escapes a string or bash expression for bash
9
+ * it either can escape single or double quotes (double is default)
10
+ */
11
+ export declare const bashEscape: (value: VariableValue | any, options?: EscapeOptions) => string | BashExpression;
12
+ export declare const escapeString: (value: string | null | undefined, { quotes }?: EscapeOptions) => string;
13
+ export declare const escapeBashExpression: (value: BashExpression, options: EscapeOptions) => BashExpression;
14
+ export declare const escapeDoubleQuotes: (value: string | null | undefined) => string;
15
+ export declare const escapeSingleQuotes: (value: string | null | undefined) => string;
16
+ /**
17
+ *
18
+ * what an absolute nightmare.
19
+ * unfortunatly, dotenv has many limitations. You can't escape quotes properly.
20
+ *
21
+ * In order to be very forgiving, we need to do some magic here:
22
+ *
23
+ * - when the value contains no newlines, we are fine
24
+ * - if the value contains newlines, we need to wrap it in quotes. And thats where the problem begins:
25
+ * - you can't escape quotes. this is a shitty limitation of dotenv and node
26
+ * - you can have inner quotes, but they break in node.js (not in dotenv though), see https://github.com/nodejs/node/issues/54134
27
+ * - so we need to quote cleverly
28
+ * - to make things worse, we need to check whether we have a simple stirng or a bash expression, that needs to be evalulated first...
29
+ */
30
+ export declare const escapeForDotEnv: (value: VariableValue | undefined | null) => string;
package/dist/pipeline/src/bash/bashEscape.js ADDED
@@ -0,0 +1,129 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.escapeForDotEnv = exports.escapeSingleQuotes = exports.escapeDoubleQuotes = exports.escapeBashExpression = exports.escapeString = exports.bashEscape = void 0;
4
+ const globalScriptFunctions_1 = require("../globalScriptFunctions");
5
+ const VariableValueContainingReferences_1 = require("../variables/VariableValueContainingReferences");
6
+ const BashExpression_1 = require("./BashExpression");
7
+ /**
8
+ * escapes a string or bash expression for bash
9
+ * it either can escape single or double quotes (double is default)
10
+ */
11
+ const bashEscape = (value, options = {
12
+ quotes: "double",
13
+ }) => {
14
+ if (value instanceof BashExpression_1.BashExpression) {
15
+ // no need to escape
16
+ return (0, exports.escapeBashExpression)(value, options);
17
+ }
18
+ if (value instanceof VariableValueContainingReferences_1.VariableValueContainingReferences) {
19
+ return value.toString(options);
20
+ }
21
+ return (0, exports.escapeString)(value, options);
22
+ };
23
+ exports.bashEscape = bashEscape;
24
+ const escapeString = (value, { quotes } = {
25
+ quotes: "double",
26
+ }) => {
27
+ const quoteEscaped = quotes
28
+ ? quotes === "single"
29
+ ? (0, exports.escapeSingleQuotes)(value)
30
+ : (0, exports.escapeDoubleQuotes)(value)
31
+ : value;
32
+ return quoteEscaped;
33
+ };
34
+ exports.escapeString = escapeString;
35
+ const escapeBashExpression = (value, options) => {
36
+ // no need to escape, we just return the string
37
+ return value;
38
+ };
39
+ exports.escapeBashExpression = escapeBashExpression;
40
+ const escapeDoubleQuotes = (value) => value === null || value === void 0 ? void 0 : value.toString().replace(/"/g, '\\"');
41
+ exports.escapeDoubleQuotes = escapeDoubleQuotes;
42
+ const escapeSingleQuotes = (value) => value === null || value === void 0 ? void 0 : value.toString().replace(/'/g, "\\'");
43
+ exports.escapeSingleQuotes = escapeSingleQuotes;
44
+ /**
45
+ *
46
+ * what an absolute nightmare.
47
+ * unfortunatly, dotenv has many limitations. You can't escape quotes properly.
48
+ *
49
+ * In order to be very forgiving, we need to do some magic here:
50
+ *
51
+ * - when the value contains no newlines, we are fine
52
+ * - if the value contains newlines, we need to wrap it in quotes. And thats where the problem begins:
53
+ * - you can't escape quotes. this is a shitty limitation of dotenv and node
54
+ * - you can have inner quotes, but they break in node.js (not in dotenv though), see https://github.com/nodejs/node/issues/54134
55
+ * - so we need to quote cleverly
56
+ * - to make things worse, we need to check whether we have a simple stirng or a bash expression, that needs to be evalulated first...
57
+ */
58
+ const escapeForDotEnv = (value) => {
59
+ if (value === undefined || value === null) {
60
+ return "";
61
+ }
62
+ if (typeof value === "string") {
63
+ // if string contains newlines, we need to wrap it in quotes
64
+ // we additionaly escape newlines, that give best compatibility
65
+ if (value.includes("\n")) {
66
+ const newlinesReplaces = value.replace(/\n/g, "\\n");
67
+ // default to ", but if this is not possible, we try to use ' or `
68
+ const quote = value.includes(`"`)
69
+ ? value.includes(`'`)
70
+ ? value.includes("`")
71
+ ? // If all quote types are present, default to no
72
+ ""
73
+ : "`"
74
+ : "'"
75
+ : '"';
76
+ // if we found a quote, we can wrap the string in it
77
+ return `${quote}${newlinesReplaces}${quote}`;
78
+ }
79
+ else {
80
+ // otherwise we can return as is
81
+ return value;
82
+ }
83
+ }
84
+ else if (value instanceof BashExpression_1.BashExpression) {
85
+ return escapeBashExpressionForDotEnv(value);
86
+ }
87
+ else if (value instanceof VariableValueContainingReferences_1.VariableValueContainingReferences) {
88
+ // instead of doing it part-wise, we just do it all at once
89
+ const containsAnyBashExpression = value.parts.some((part) => part instanceof BashExpression_1.BashExpression);
90
+ if (!containsAnyBashExpression) {
91
+ return (0, exports.escapeForDotEnv)(value.toString({
92
+ quotes: "double",
93
+ }));
94
+ }
95
+ else {
96
+ const result = escapeBashExpressionForDotEnv(new BashExpression_1.BashExpression(value.toString({
97
+ quotes: "double",
98
+ })));
99
+ return result;
100
+ }
101
+ }
102
+ else {
103
+ return value;
104
+ }
105
+ };
106
+ exports.escapeForDotEnv = escapeForDotEnv;
107
+ // basically the same thing as above for bash
108
+ // thx chatgpt for this
109
+ const escapeForDotEnvScript = (0, globalScriptFunctions_1.registerGlobalScriptFunction)("escapeForDotEnv", `
110
+ input="\${1:-$(cat)}"
111
+ input="\${input//$'\\n'/\\\\n}"
112
+ if [[ "$input" == *\\\\n* ]]; then
113
+ if [[ "$input" == *\\"* && "$input" == *\\'* && "$input" == *\\\`* ]]; then
114
+ printf "%s\\n" "$input"
115
+ elif [[ "$input" == *\\"* && "$input" == *\\'* ]]; then
116
+ printf "\`%s\`\\n" "$input"
117
+ elif [[ "$input" == *\\"* ]]; then
118
+ printf "'%s'\\n" "$input"
119
+ else
120
+ printf "\\"%s\\"\\n" "$input"
121
+ fi
122
+ else
123
+ printf "%s\\n" "$input"
124
+ fi
125
+ `);
126
+ const escapeBashExpressionForDotEnv = (value) => {
127
+ return value.transformWithCommand(escapeForDotEnvScript.name).toString();
128
+ };
129
+ //# sourceMappingURL=bashEscape.js.map
package/dist/pipeline/src/bash/bashEscape.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"bashEscape.js","sourceRoot":"","sources":["../../../../../pipeline/src/bash/bashEscape.ts"],"names":[],"mappings":"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"}
package/dist/pipeline/src/bash/bashYaml.js CHANGED
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.writeBashYamlToFileScript = exports.yamlBashString = void 0;
4
4
  const yaml_1 = require("yaml");
5
5
  const BashExpression_1 = require("./BashExpression");
6
+ const VariableValueContainingReferences_1 = require("../variables/VariableValueContainingReferences");
6
7
  const bashExpressionType = {
7
8
  tag: "",
8
9
  resolve: (str) => {
@@ -13,10 +14,33 @@ const bashExpressionType = {
13
14
  // we create a BLOCK_LITERAL
14
15
  // but because bash will interpret the value, it may resolve to a multiline string
15
16
  // so we need to indent every line using sed
16
- return "|-\n" + node.value.transformWithCommand(`sed 's/^/${ctx.indent}/'`);
17
+ return ("|-\n" +
18
+ ctx.indent +
19
+ indentNewlinesInBashExpression(node.value, ctx.indent));
17
20
  },
18
21
  identify: (v) => v instanceof BashExpression_1.BashExpression,
19
22
  };
23
+ const indentNewlinesInBashExpression = (expression, indent) => {
24
+ return expression.transformWithCommand(`sed '1!s/^/${indent}/'`);
25
+ };
26
+ const variableContainingReferences = {
27
+ tag: "",
28
+ resolve: (str) => {
29
+ // not really needed,but let's make typescript happy
30
+ return new VariableValueContainingReferences_1.VariableValueContainingReferences(str);
31
+ },
32
+ stringify(node, ctx) {
33
+ const value = node.value;
34
+ const stringified = value.parts
35
+ .map((part) => part instanceof BashExpression_1.BashExpression
36
+ ? indentNewlinesInBashExpression(part, ctx.indent)
37
+ : // indent every new line
38
+ part.toString().replace(/\n/g, `\n${ctx.indent}`))
39
+ .join("");
40
+ return "|-\n" + ctx.indent + stringified;
41
+ },
42
+ identify: (v) => v instanceof VariableValueContainingReferences_1.VariableValueContainingReferences,
43
+ };
20
44
  /***
21
45
  * creates a yaml string that can be used in bash scripts
22
46
  * it handles BashExpressions correctly so that they can be evaluated in bash
@@ -25,7 +49,7 @@ const yamlBashString = (value) => {
25
49
  return (0, yaml_1.stringify)(value, {
26
50
  defaultStringType: "BLOCK_LITERAL",
27
51
  defaultKeyType: "PLAIN",
28
- customTags: [bashExpressionType],
52
+ customTags: [bashExpressionType, variableContainingReferences],
29
53
  aliasDuplicateObjects: false,
30
54
  lineWidth: 0,
31
55
  });
package/dist/pipeline/src/bash/bashYaml.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"bashYaml.js","sourceRoot":"","sources":["../../../../../pipeline/src/bash/bashYaml.ts"],"names":[],"mappings":";;;AACA,+BAAiC;AACjC,qDAAkD;AAElD,MAAM,kBAAkB,GAAc;IACpC,GAAG,EAAE,EAAE;IACP,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;QACf,oDAAoD;QACpD,OAAO,IAAI,+BAAc,CAAC,GAAG,CAAC,CAAC;IACjC,CAAC;IACD,SAAS,CAAC,IAAS,EAAE,GAAQ;QAC3B,4BAA4B;QAC5B,kFAAkF;QAClF,4CAA4C;QAC5C,OAAO,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,YAAY,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC;IAC9E,CAAC;IAED,QAAQ,EAAE,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,YAAY,+BAAc;CAClD,CAAC;AAEF;;;GAGG;AACI,MAAM,cAAc,GAAG,CAAC,KAAU,EAAE,EAAE;IAC3C,OAAO,IAAA,gBAAS,EAAC,KAAK,EAAE;QACtB,iBAAiB,EAAE,eAAe;QAClC,cAAc,EAAE,OAAO;QACvB,UAAU,EAAE,CAAC,kBAAkB,CAAC;QAChC,qBAAqB,EAAE,KAAK;QAC5B,SAAS,EAAE,CAAC;KACb,CAAC,CAAC;AACL,CAAC,CAAC;AARW,QAAA,cAAc,kBAQzB;AAEF;;;GAGG;AACI,MAAM,yBAAyB,GAAG,CAAC,KAAU,EAAE,QAAgB,EAAE,EAAE;IACxE,OAAO;QACL,SAAS,QAAQ;EACnB,IAAA,sBAAc,EAAC,KAAK,CAAC;;CAEtB;KACE,CAAC;AACJ,CAAC,CAAC;AAPW,QAAA,yBAAyB,6BAOpC"}
1
+ {"version":3,"file":"bashYaml.js","sourceRoot":"","sources":["../../../../../pipeline/src/bash/bashYaml.ts"],"names":[],"mappings":";;;AACA,+BAAiC;AACjC,qDAAkD;AAClD,sGAAmG;AAEnG,MAAM,kBAAkB,GAAc;IACpC,GAAG,EAAE,EAAE;IACP,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;QACf,oDAAoD;QACpD,OAAO,IAAI,+BAAc,CAAC,GAAG,CAAC,CAAC;IACjC,CAAC;IACD,SAAS,CAAC,IAAS,EAAE,GAAQ;QAC3B,4BAA4B;QAC5B,kFAAkF;QAClF,4CAA4C;QAC5C,OAAO,CACL,MAAM;YACN,GAAG,CAAC,MAAM;YACV,8BAA8B,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,CACvD,CAAC;IACJ,CAAC;IAED,QAAQ,EAAE,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,YAAY,+BAAc;CAClD,CAAC;AAEF,MAAM,8BAA8B,GAAG,CACrC,UAA0B,EAC1B,MAAc,EACd,EAAE;IACF,OAAO,UAAU,CAAC,oBAAoB,CAAC,cAAc,MAAM,IAAI,CAAC,CAAC;AACnE,CAAC,CAAC;AAEF,MAAM,4BAA4B,GAAc;IAC9C,GAAG,EAAE,EAAE;IACP,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;QACf,oDAAoD;QACpD,OAAO,IAAI,qEAAiC,CAAC,GAAG,CAAC,CAAC;IACpD,CAAC;IACD,SAAS,CAAC,IAAS,EAAE,GAAQ;QAC3B,MAAM,KAAK,GAAsC,IAAI,CAAC,KAAK,CAAC;QAC5D,MAAM,WAAW,GAAG,KAAK,CAAC,KAAK;aAC5B,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACZ,IAAI,YAAY,+BAAc;YAC5B,CAAC,CAAC,8BAA8B,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC;YAClD,CAAC,CAAC,wBAAwB;gBACxB,IAAI,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,CAAC,MAAM,EAAE,CAAC,CACtD;aACA,IAAI,CAAC,EAAE,CAAC,CAAC;QACZ,OAAO,MAAM,GAAG,GAAG,CAAC,MAAM,GAAG,WAAW,CAAC;IAC3C,CAAC;IAED,QAAQ,EAAE,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,YAAY,qEAAiC;CACrE,CAAC;AAEF;;;GAGG;AACI,MAAM,cAAc,GAAG,CAAC,KAAU,EAAE,EAAE;IAC3C,OAAO,IAAA,gBAAS,EAAC,KAAK,EAAE;QACtB,iBAAiB,EAAE,eAAe;QAClC,cAAc,EAAE,OAAO;QACvB,UAAU,EAAE,CAAC,kBAAkB,EAAE,4BAA4B,CAAC;QAC9D,qBAAqB,EAAE,KAAK;QAC5B,SAAS,EAAE,CAAC;KACb,CAAC,CAAC;AACL,CAAC,CAAC;AARW,QAAA,cAAc,kBAQzB;AAEF;;;GAGG;AACI,MAAM,yBAAyB,GAAG,CAAC,KAAU,EAAE,QAAgB,EAAE,EAAE;IACxE,OAAO;QACL,SAAS,QAAQ;EACnB,IAAA,sBAAc,EAAC,KAAK,CAAC;;CAEtB;KACE,CAAC;AACJ,CAAC,CAAC;AAPW,QAAA,yBAAyB,6BAOpC"}
package/dist/pipeline/src/bash/getInjectVarsScript.js CHANGED
@@ -2,14 +2,18 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getInjectVarsScript = void 0;
4
4
  const lodash_1 = require("lodash");
5
- const BashExpression_1 = require("./BashExpression");
5
+ const bashEscape_1 = require("./bashEscape");
6
6
  const getInjectVarsScript = (vars) => {
7
7
  if (!vars)
8
8
  return [];
9
9
  // filter out null and undefined values
10
10
  return Object.entries(vars)
11
11
  .filter(([, value]) => !(0, lodash_1.isNil)(value))
12
- .map(([key, value]) => `export ${key}="${value ? (0, BashExpression_1.bashEscape)(value) : ""}"`);
12
+ .map(([key, value]) => `export ${key}="${value
13
+ ? (0, bashEscape_1.bashEscape)(value, {
14
+ quotes: "double",
15
+ })
16
+ : ""}"`);
13
17
  };
14
18
  exports.getInjectVarsScript = getInjectVarsScript;
15
19
  //# sourceMappingURL=getInjectVarsScript.js.map
package/dist/pipeline/src/bash/getInjectVarsScript.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getInjectVarsScript.js","sourceRoot":"","sources":["../../../../../pipeline/src/bash/getInjectVarsScript.ts"],"names":[],"mappings":";;;AACA,mCAA+B;AAC/B,qDAA8C;AAEvC,MAAM,mBAAmB,GAAG,CAAC,IAAyB,EAAE,EAAE;IAC/D,IAAI,CAAC,IAAI;QAAE,OAAO,EAAE,CAAC;IACrB,uCAAuC;IACvC,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;SACxB,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,IAAA,cAAK,EAAC,KAAK,CAAC,CAAC;SAEpC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,UAAU,GAAG,KAAK,KAAK,CAAC,CAAC,CAAC,IAAA,2BAAU,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;AAChF,CAAC,CAAC;AAPW,QAAA,mBAAmB,uBAO9B"}
1
+ {"version":3,"file":"getInjectVarsScript.js","sourceRoot":"","sources":["../../../../../pipeline/src/bash/getInjectVarsScript.ts"],"names":[],"mappings":";;;AACA,mCAA+B;AAC/B,6CAA0C;AAEnC,MAAM,mBAAmB,GAAG,CAAC,IAAyB,EAAE,EAAE;IAC/D,IAAI,CAAC,IAAI;QAAE,OAAO,EAAE,CAAC;IACrB,uCAAuC;IACvC,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;SACxB,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,IAAA,cAAK,EAAC,KAAK,CAAC,CAAC;SAEpC,GAAG,CACF,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CACf,UAAU,GAAG,KACX,KAAK;QACH,CAAC,CAAC,IAAA,uBAAU,EAAC,KAAK,EAAE;YAChB,MAAM,EAAE,QAAQ;SACjB,CAAC;QACJ,CAAC,CAAC,EACN,GAAG,CACN,CAAC;AACN,CAAC,CAAC;AAhBW,QAAA,mBAAmB,uBAgB9B"}
package/dist/pipeline/src/bash/index.d.ts ADDED
@@ -0,0 +1,2 @@
1
+ export * from "./bashEscape";
2
+ export * from "./BashExpression";
package/dist/pipeline/src/bash/index.js ADDED
@@ -0,0 +1,19 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __exportStar = (this && this.__exportStar) || function(m, exports) {
14
+ for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
15
+ };
16
+ Object.defineProperty(exports, "__esModule", { value: true });
17
+ __exportStar(require("./bashEscape"), exports);
18
+ __exportStar(require("./BashExpression"), exports);
19
+ //# sourceMappingURL=index.js.map
package/dist/pipeline/src/bash/index.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../pipeline/src/bash/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA6B;AAC7B,mDAAiC"}