@catladder/cli 1.170.0 → 2.0.0

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 (147) hide show
  1. package/dist/bundles/catenv/index.js +3 -3
  2. package/dist/bundles/cli/index.js +6 -6
  3. package/dist/cli/src/apps/catenv/catenv.js +2 -3
  4. package/dist/cli/src/apps/catenv/catenv.js.map +1 -1
  5. package/dist/cli/src/apps/catenv/printVariables.js +4 -2
  6. package/dist/cli/src/apps/catenv/printVariables.js.map +1 -1
  7. package/dist/cli/src/apps/catenv/types.d.ts +0 -1
  8. package/dist/cli/src/apps/catenv/utils.d.ts +2 -5
  9. package/dist/cli/src/apps/catenv/utils.js +4 -9
  10. package/dist/cli/src/apps/catenv/utils.js.map +1 -1
  11. package/dist/cli/src/apps/catenv/writeDotEnvFiles.js +2 -4
  12. package/dist/cli/src/apps/catenv/writeDotEnvFiles.js.map +1 -1
  13. package/dist/cli/src/apps/catenv/writeEnvDTs.js +1 -1
  14. package/dist/cli/src/apps/catenv/writeEnvDTs.js.map +1 -1
  15. package/dist/cli/src/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.js +12 -12
  16. package/dist/cli/src/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.js.map +1 -1
  17. package/dist/cli/src/apps/cli/commands/project/commandCloudSqlProxy.js +6 -6
  18. package/dist/cli/src/apps/cli/commands/project/commandCloudSqlProxy.js.map +1 -1
  19. package/dist/cli/src/apps/cli/commands/project/index.js +0 -6
  20. package/dist/cli/src/apps/cli/commands/project/index.js.map +1 -1
  21. package/dist/cli/src/config/getProjectConfig.js +14 -26
  22. package/dist/cli/src/config/getProjectConfig.js.map +1 -1
  23. package/dist/pipeline/src/bash/BashExpression.d.ts +1 -5
  24. package/dist/pipeline/src/bash/BashExpression.js +4 -15
  25. package/dist/pipeline/src/bash/BashExpression.js.map +1 -1
  26. package/dist/pipeline/src/bash/bashEscape.d.ts +32 -0
  27. package/dist/pipeline/src/bash/bashEscape.js +131 -0
  28. package/dist/pipeline/src/bash/bashEscape.js.map +1 -0
  29. package/dist/pipeline/src/bash/bashYaml.js +26 -2
  30. package/dist/pipeline/src/bash/bashYaml.js.map +1 -1
  31. package/dist/pipeline/src/bash/getInjectVarsScript.js +6 -2
  32. package/dist/pipeline/src/bash/getInjectVarsScript.js.map +1 -1
  33. package/dist/pipeline/src/bash/index.d.ts +2 -0
  34. package/dist/pipeline/src/bash/index.js +19 -0
  35. package/dist/pipeline/src/bash/index.js.map +1 -0
  36. package/dist/pipeline/src/build/base/createAppBuildJob.js +2 -3
  37. package/dist/pipeline/src/build/base/createAppBuildJob.js.map +1 -1
  38. package/dist/pipeline/src/build/base/writeDotEnv.js +6 -4
  39. package/dist/pipeline/src/build/base/writeDotEnv.js.map +1 -1
  40. package/dist/pipeline/src/build/custom/testJob.js +10 -11
  41. package/dist/pipeline/src/build/custom/testJob.js.map +1 -1
  42. package/dist/pipeline/src/build/docker.d.ts +3 -3
  43. package/dist/pipeline/src/build/node/buildJob.js +1 -1
  44. package/dist/pipeline/src/build/node/buildJob.js.map +1 -1
  45. package/dist/pipeline/src/build/node/cache.d.ts +1 -3
  46. package/dist/pipeline/src/build/node/cache.js +1 -27
  47. package/dist/pipeline/src/build/node/cache.js.map +1 -1
  48. package/dist/pipeline/src/build/node/testJob.js +10 -11
  49. package/dist/pipeline/src/build/node/testJob.js.map +1 -1
  50. package/dist/pipeline/src/build/rails/build.js +0 -1
  51. package/dist/pipeline/src/build/rails/build.js.map +1 -1
  52. package/dist/pipeline/src/build/rails/test.js +7 -8
  53. package/dist/pipeline/src/build/rails/test.js.map +1 -1
  54. package/dist/pipeline/src/build/types.d.ts +0 -10
  55. package/dist/pipeline/src/build/types.js.map +1 -1
  56. package/dist/pipeline/src/context/createComponentContext.js +0 -1
  57. package/dist/pipeline/src/context/createComponentContext.js.map +1 -1
  58. package/dist/pipeline/src/context/getEnvConfig.js +2 -1
  59. package/dist/pipeline/src/context/getEnvConfig.js.map +1 -1
  60. package/dist/pipeline/src/context/getEnvironment.js +0 -1
  61. package/dist/pipeline/src/context/getEnvironment.js.map +1 -1
  62. package/dist/pipeline/src/context/getEnvironmentVariables.d.ts +5 -6
  63. package/dist/pipeline/src/context/getEnvironmentVariables.js +31 -30
  64. package/dist/pipeline/src/context/getEnvironmentVariables.js.map +1 -1
  65. package/dist/pipeline/src/deploy/base/deploy.js +3 -4
  66. package/dist/pipeline/src/deploy/base/deploy.js.map +1 -1
  67. package/dist/pipeline/src/deploy/cloudRun/createJobs/getCloudRunDeployScripts.js +2 -2
  68. package/dist/pipeline/src/deploy/cloudRun/createJobs/getCloudRunDeployScripts.js.map +1 -1
  69. package/dist/pipeline/src/deploy/cloudRun/index.js +2 -2
  70. package/dist/pipeline/src/deploy/cloudRun/index.js.map +1 -1
  71. package/dist/pipeline/src/deploy/cloudRun/utils/getServiceName.d.ts +1 -1
  72. package/dist/pipeline/src/deploy/kubernetes/cloudSql/index.d.ts +2 -2
  73. package/dist/pipeline/src/deploy/kubernetes/cloudSql/index.js +3 -15
  74. package/dist/pipeline/src/deploy/kubernetes/cloudSql/index.js.map +1 -1
  75. package/dist/pipeline/src/deploy/kubernetes/deployJob.js +0 -2
  76. package/dist/pipeline/src/deploy/kubernetes/deployJob.js.map +1 -1
  77. package/dist/pipeline/src/deploy/kubernetes/index.js +2 -2
  78. package/dist/pipeline/src/deploy/kubernetes/index.js.map +1 -1
  79. package/dist/pipeline/src/deploy/kubernetes/kubeEnv.d.ts +3 -3
  80. package/dist/pipeline/src/deploy/kubernetes/kubeValues.d.ts +3 -4
  81. package/dist/pipeline/src/deploy/kubernetes/kubeValues.js +2 -3
  82. package/dist/pipeline/src/deploy/kubernetes/kubeValues.js.map +1 -1
  83. package/dist/pipeline/src/deploy/types/base.d.ts +0 -6
  84. package/dist/pipeline/src/deploy/types/kubernetes.d.ts +1 -34
  85. package/dist/pipeline/src/globalScriptFunctions/index.d.ts +14 -0
  86. package/dist/pipeline/src/globalScriptFunctions/index.js +32 -0
  87. package/dist/pipeline/src/globalScriptFunctions/index.js.map +1 -0
  88. package/dist/pipeline/src/index.d.ts +2 -0
  89. package/dist/pipeline/src/index.js +2 -0
  90. package/dist/pipeline/src/index.js.map +1 -1
  91. package/dist/pipeline/src/pipeline/gitlab/createGitlabJobs.js +2 -4
  92. package/dist/pipeline/src/pipeline/gitlab/createGitlabJobs.js.map +1 -1
  93. package/dist/pipeline/src/pipeline/gitlab/createGitlabPipeline.d.ts +1 -1
  94. package/dist/pipeline/src/pipeline/gitlab/createGitlabPipeline.js +6 -1
  95. package/dist/pipeline/src/pipeline/gitlab/createGitlabPipeline.js.map +1 -1
  96. package/dist/pipeline/src/pipeline/packageManager.js +7 -5
  97. package/dist/pipeline/src/pipeline/packageManager.js.map +1 -1
  98. package/dist/pipeline/src/runner/index.d.ts +1 -1
  99. package/dist/pipeline/src/runner/index.js.map +1 -1
  100. package/dist/pipeline/src/types/config.d.ts +6 -9
  101. package/dist/pipeline/src/types/context.d.ts +2 -9
  102. package/dist/pipeline/src/types/context.js.map +1 -1
  103. package/dist/pipeline/src/types/gitlab-types.d.ts +1 -0
  104. package/dist/pipeline/src/types/jobs.d.ts +0 -8
  105. package/dist/pipeline/src/utils/gitlab.js +10 -2
  106. package/dist/pipeline/src/utils/gitlab.js.map +1 -1
  107. package/dist/pipeline/src/utils/writeFiles.js +1 -5
  108. package/dist/pipeline/src/utils/writeFiles.js.map +1 -1
  109. package/dist/pipeline/src/variables/VariableValue.d.ts +3 -0
  110. package/dist/pipeline/src/variables/VariableValue.js +3 -0
  111. package/dist/pipeline/src/variables/VariableValue.js.map +1 -0
  112. package/dist/pipeline/src/variables/VariableValueContainingReferences.d.ts +24 -0
  113. package/dist/pipeline/src/variables/VariableValueContainingReferences.js +69 -0
  114. package/dist/pipeline/src/variables/VariableValueContainingReferences.js.map +1 -0
  115. package/dist/pipeline/src/variables/resolveAllReferences.d.ts +3 -0
  116. package/dist/pipeline/src/variables/resolveAllReferences.js +25 -0
  117. package/dist/pipeline/src/variables/resolveAllReferences.js.map +1 -0
  118. package/dist/pipeline/src/variables/resolveAllReferencesOnce.d.ts +5 -0
  119. package/dist/pipeline/src/variables/resolveAllReferencesOnce.js +23 -0
  120. package/dist/pipeline/src/variables/resolveAllReferencesOnce.js.map +1 -0
  121. package/dist/pipeline/src/variables/resolveReferencesOnce.d.ts +8 -0
  122. package/dist/pipeline/src/variables/resolveReferencesOnce.js +21 -0
  123. package/dist/pipeline/src/variables/resolveReferencesOnce.js.map +1 -0
  124. package/dist/tsconfig.tsbuildinfo +1 -1
  125. package/package.json +1 -1
  126. package/src/apps/catenv/catenv.ts +1 -3
  127. package/src/apps/catenv/printVariables.ts +4 -4
  128. package/src/apps/catenv/types.ts +2 -2
  129. package/src/apps/catenv/utils.ts +8 -12
  130. package/src/apps/catenv/writeDotEnvFiles.ts +3 -6
  131. package/src/apps/catenv/writeEnvDTs.ts +1 -1
  132. package/src/apps/cli/commands/project/cloudSql/commandProjectRestoreDb.ts +16 -10
  133. package/src/apps/cli/commands/project/commandCloudSqlProxy.ts +5 -3
  134. package/src/apps/cli/commands/project/index.ts +1 -7
  135. package/src/config/getProjectConfig.ts +21 -26
  136. package/dist/pipeline/src/bash/replaceAsync.d.ts +0 -2
  137. package/dist/pipeline/src/bash/replaceAsync.js +0 -40
  138. package/dist/pipeline/src/bash/replaceAsync.js.map +0 -1
  139. package/dist/pipeline/src/context/resolveReferences.d.ts +0 -6
  140. package/dist/pipeline/src/context/resolveReferences.js +0 -65
  141. package/dist/pipeline/src/context/resolveReferences.js.map +0 -1
  142. package/dist/pipeline/src/deploy/kubernetes/processSecretsAsFiles.d.ts +0 -85
  143. package/dist/pipeline/src/deploy/kubernetes/processSecretsAsFiles.js +0 -27
  144. package/dist/pipeline/src/deploy/kubernetes/processSecretsAsFiles.js.map +0 -1
  145. package/dist/pipeline/src/packageInfos.d.ts +0 -4
  146. package/dist/pipeline/src/packageInfos.js +0 -17
  147. package/dist/pipeline/src/packageInfos.js.map +0 -1
@@ -6,14 +6,13 @@ const writeDotEnvFiles_1 = require("./writeDotEnvFiles");
6
6
  const writeEnvDTs_1 = require("./writeEnvDTs");
7
7
  const pipeline_1 = require("../../../../pipeline/src/index.js");
8
8
  exports.default = async (choice) => {
9
+ var _a;
9
10
  const config = await (0, getProjectConfig_1.getProjectConfig)();
10
11
  if (!config) {
11
12
  return;
12
13
  }
13
14
  await Promise.all([
14
- config.pipelineType
15
- ? (0, pipeline_1.generatePipelineFiles)(config, config.pipelineType, "local")
16
- : undefined,
15
+ (0, pipeline_1.generatePipelineFiles)(config, (_a = config.pipelineType) !== null && _a !== void 0 ? _a : "gitlab", "local"),
17
16
  (0, writeDotEnvFiles_1.writeDotEnvFiles)(config, choice),
18
17
  (0, writeEnvDTs_1.writeDTsFiles)(config, choice),
19
18
  (0, printVariables_1.printVariables)(config, choice),
@@ -1 +1 @@
1
- {"version":3,"file":"catenv.js","sourceRoot":"","sources":["../../../../../src/apps/catenv/catenv.ts"],"names":[],"mappings":";;AAAA,oEAAiE;AACjE,qDAAkD;AAElD,yDAAsD;AACtD,+CAA8C;AAC9C,kDAA4D;AAE5D,kBAAe,KAAK,EAAE,MAAe,EAAE,EAAE;IACvC,MAAM,MAAM,GAAG,MAAM,IAAA,mCAAgB,GAAE,CAAC;IACxC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO;IACT,CAAC;IAED,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,MAAM,CAAC,YAAY;YACjB,CAAC,CAAC,IAAA,gCAAqB,EAAC,MAAM,EAAE,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC;YAC7D,CAAC,CAAC,SAAS;QACb,IAAA,mCAAgB,EAAC,MAAM,EAAE,MAAM,CAAC;QAEhC,IAAA,2BAAa,EAAC,MAAM,EAAE,MAAM,CAAC;QAE7B,IAAA,+BAAc,EAAC,MAAM,EAAE,MAAM,CAAC;KAC/B,CAAC,CAAC;AACL,CAAC,CAAC"}
1
+ {"version":3,"file":"catenv.js","sourceRoot":"","sources":["../../../../../src/apps/catenv/catenv.ts"],"names":[],"mappings":";;AAAA,oEAAiE;AACjE,qDAAkD;AAElD,yDAAsD;AACtD,+CAA8C;AAC9C,kDAA4D;AAE5D,kBAAe,KAAK,EAAE,MAAe,EAAE,EAAE;;IACvC,MAAM,MAAM,GAAG,MAAM,IAAA,mCAAgB,GAAE,CAAC;IACxC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO;IACT,CAAC;IAED,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,IAAA,gCAAqB,EAAC,MAAM,EAAE,MAAA,MAAM,CAAC,YAAY,mCAAI,QAAQ,EAAE,OAAO,CAAC;QACvE,IAAA,mCAAgB,EAAC,MAAM,EAAE,MAAM,CAAC;QAEhC,IAAA,2BAAa,EAAC,MAAM,EAAE,MAAM,CAAC;QAE7B,IAAA,+BAAc,EAAC,MAAM,EAAE,MAAM,CAAC;KAC/B,CAAC,CAAC;AACL,CAAC,CAAC"}
@@ -4,10 +4,11 @@ exports.printVariables = void 0;
4
4
  const getProjectConfig_1 = require("../../config/getProjectConfig");
5
5
  const utils_1 = require("./utils");
6
6
  const getAllVariablesToPrint = async (config, choice) => {
7
+ var _a;
7
8
  const { env, currentComponent } = await (0, utils_1.getCurrentComponentAndEnvFromChoice)(config, choice);
8
9
  if (currentComponent) {
9
10
  // don't print vars if dotenv is enabled
10
- if (config.components[currentComponent].dotEnv) {
11
+ if ((_a = config.components[currentComponent].dotEnv) !== null && _a !== void 0 ? _a : true) {
11
12
  return {};
12
13
  }
13
14
  return await (0, getProjectConfig_1.getEnvVarsResolved)(null, env, currentComponent);
@@ -17,8 +18,9 @@ const getAllVariablesToPrint = async (config, choice) => {
17
18
  // this is not 100% correct, but better than not exporting any vars at all
18
19
  // so we also add prefixed variants
19
20
  return await Object.keys(config.components).reduce(async (acc, componentName) => {
21
+ var _a;
20
22
  // don't print vars if dotenv is enabled
21
- if (config.components[componentName].dotEnv) {
23
+ if ((_a = config.components[componentName].dotEnv) !== null && _a !== void 0 ? _a : true) {
22
24
  return await acc;
23
25
  }
24
26
  const subappvars = await (0, getProjectConfig_1.getEnvVarsResolved)(null, env, componentName);
@@ -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,MAAM,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,MAAM,EAAE,CAAC;YAC/C,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,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,MAAM,EAAE,CAAC;gBAC5C,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"}
@@ -2,4 +2,3 @@ export type Choice = {
2
2
  env?: string;
3
3
  componentName?: string;
4
4
  };
5
- export type Variables = Record<string, string>;
@@ -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;
@@ -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
@@ -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"}
@@ -9,7 +9,7 @@ const utils_1 = require("./utils");
9
9
  const writeDotEnvFiles = async (config, choice) => {
10
10
  const { env, currentComponent } = await (0, utils_1.getCurrentComponentAndEnvFromChoice)(config, choice);
11
11
  const componentsWithEnabledDotEnvWrite = Object.entries(config.components)
12
- .filter(([, component]) => component === null || component === void 0 ? void 0 : component.dotEnv) // when set to true or "local"
12
+ .filter(([, component]) => { var _a; return (_a = component === null || component === void 0 ? void 0 : component.dotEnv) !== null && _a !== void 0 ? _a : true; }) // when set to true or "local"
13
13
  .map(([componentName]) => componentName);
14
14
  const componentsToActuallyWriteDotEnvNow = currentComponent
15
15
  ? componentsWithEnabledDotEnvWrite.includes(currentComponent)
@@ -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
  }
@@ -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,CAAC,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,CAAC,CAAC,8BAA8B;SAC3E,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"}
@@ -9,7 +9,7 @@ const utils_1 = require("./utils");
9
9
  const writeDTsFiles = async (config, choice) => {
10
10
  const { env, currentComponent } = await (0, utils_1.getCurrentComponentAndEnvFromChoice)(config, choice);
11
11
  const componentsWithEnabledEnvDTsWrite = Object.entries(config.components)
12
- .filter(([, component]) => component === null || component === void 0 ? void 0 : component.envDTs)
12
+ .filter(([, component]) => { var _a; return (_a = component === null || component === void 0 ? void 0 : component.envDTs) !== null && _a !== void 0 ? _a : true; })
13
13
  .map(([componentName]) => componentName);
14
14
  const componentsToActuallyWriteEnvDts = currentComponent
15
15
  ? componentsWithEnabledEnvDTsWrite.includes(currentComponent)
@@ -1 +1 @@
1
- {"version":3,"file":"writeEnvDTs.js","sourceRoot":"","sources":["../../../../../src/apps/catenv/writeEnvDTs.ts"],"names":[],"mappings":";;;AAAA,kDAAsE;AACtE,+BAA4B;AAC5B,oEAA+D;AAC/D,mDAAkD;AAElD,mCAGiB;AAEV,MAAM,aAAa,GAAG,KAAK,EAAE,MAAc,EAAE,MAAe,EAAE,EAAE;IACrE,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,CAAC,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,CAAC;SAC5C,GAAG,CAAC,CAAC,CAAC,aAAa,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC;IAE3C,MAAM,+BAA+B,GAAG,gBAAgB;QACtD,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,+BAA+B,EAAE,CAAC;QAC5D,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;QACzD,MAAM,aAAa,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QAEpD,MAAM,YAAY,GAAG,IAAA,4BAAoB,EAAC,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;QAC1E,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,YAAY,EAAE,UAAU,CAAC,CAAC;QAChD,MAAM,IAAA,6BAAkB,EAAC,QAAQ,EAAE,aAAa,EAAE;YAChD,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC;AA3BW,QAAA,aAAa,iBA2BxB;AAEF,KAAK,UAAU,aAAa,CAC1B,GAAW,EACX,aAAqB;IAErB,MAAM,WAAW,GAAG,MAAM,IAAA,iCAAc,EAAC,GAAG,EAAE,aAAa,CAAC,CAAC;IAC7D,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IACpD,MAAM,aAAa,GAAG,IAAI,GAAG,CAC3B,WAAW,CAAC,gBAAgB;SACzB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;SACvB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;SACjB,MAAM,CAAC,CAAC,mBAAmB,CAAC,CAAC,CACjC,CAAC;IACF,MAAM,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAEnE,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,mBAAmB,CAAC,QAAkB;IAC7C,OAAO;;;;;;;;;EASP,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,IAAI,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;;;;CAI3D,CAAC;AACF,CAAC"}
1
+ {"version":3,"file":"writeEnvDTs.js","sourceRoot":"","sources":["../../../../../src/apps/catenv/writeEnvDTs.ts"],"names":[],"mappings":";;;AAAA,kDAAsE;AACtE,+BAA4B;AAC5B,oEAA+D;AAC/D,mDAAkD;AAElD,mCAGiB;AAEV,MAAM,aAAa,GAAG,KAAK,EAAE,MAAc,EAAE,MAAe,EAAE,EAAE;IACrE,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;SACpD,GAAG,CAAC,CAAC,CAAC,aAAa,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC;IAE3C,MAAM,+BAA+B,GAAG,gBAAgB;QACtD,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,+BAA+B,EAAE,CAAC;QAC5D,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;QACzD,MAAM,aAAa,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QAEpD,MAAM,YAAY,GAAG,IAAA,4BAAoB,EAAC,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;QAC1E,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,YAAY,EAAE,UAAU,CAAC,CAAC;QAChD,MAAM,IAAA,6BAAkB,EAAC,QAAQ,EAAE,aAAa,EAAE;YAChD,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC;AA3BW,QAAA,aAAa,iBA2BxB;AAEF,KAAK,UAAU,aAAa,CAC1B,GAAW,EACX,aAAqB;IAErB,MAAM,WAAW,GAAG,MAAM,IAAA,iCAAc,EAAC,GAAG,EAAE,aAAa,CAAC,CAAC;IAC7D,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IACpD,MAAM,aAAa,GAAG,IAAI,GAAG,CAC3B,WAAW,CAAC,gBAAgB;SACzB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;SACvB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;SACjB,MAAM,CAAC,CAAC,mBAAmB,CAAC,CAAC,CACjC,CAAC;IACF,MAAM,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAEnE,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,mBAAmB,CAAC,QAAkB;IAC7C,OAAO;;;;;;;;;EASP,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,IAAI,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;;;;CAI3D,CAAC;AACF,CAAC"}
@@ -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",
@@ -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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"}
@@ -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,
@@ -1 +1 @@
1
- {"version":3,"file":"commandCloudSqlProxy.js","sourceRoot":"","sources":["../../../../../../../src/apps/cli/commands/project/commandCloudSqlProxy.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"commandCloudSqlProxy.js","sourceRoot":"","sources":["../../../../../../../src/apps/cli/commands/project/commandCloudSqlProxy.ts"],"names":[],"mappings":"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"}
@@ -14,7 +14,6 @@ const commandGitlabCi_1 = __importDefault(require("./commandGitlabCi"));
14
14
  const commandSetup_1 = __importDefault(require("./commandSetup"));
15
15
  const commandRenewToken_1 = __importDefault(require("./commandRenewToken"));
16
16
  const commandListPods_1 = __importDefault(require("./commandListPods"));
17
- const commandMigrateHelm3_1 = __importDefault(require("./commandMigrateHelm3"));
18
17
  const commandNamespace_1 = __importDefault(require("./commandNamespace"));
19
18
  const commandOpenCostDashboard_1 = __importDefault(require("./commandOpenCostDashboard"));
20
19
  const commandOpenDashboard_1 = __importDefault(require("./commandOpenDashboard"));
@@ -22,10 +21,8 @@ const commandOpenEnv_1 = __importDefault(require("./commandOpenEnv"));
22
21
  const commandOpenGit_1 = __importDefault(require("./commandOpenGit"));
23
22
  const commandOpenLogs_1 = __importDefault(require("./commandOpenLogs"));
24
23
  const commandPauseProject_1 = __importDefault(require("./commandPauseProject"));
25
- const commandOpenGrafana_1 = __importDefault(require("./commandOpenGrafana"));
26
24
  const commandPortForward_1 = __importDefault(require("./commandPortForward"));
27
25
  const commandTriggerCronjob_1 = __importDefault(require("./commandTriggerCronjob"));
28
- const commandOpenGrafanaPod_1 = __importDefault(require("./commandOpenGrafanaPod"));
29
26
  const commandSecretsClearBackups_1 = __importDefault(require("./commandSecretsClearBackups"));
30
27
  const commandProjectRestoreDb_1 = __importDefault(require("./cloudSql/commandProjectRestoreDb"));
31
28
  const commandSecurityEvaluate_1 = __importDefault(require("./commandSecurityEvaluate"));
@@ -40,8 +37,6 @@ exports.default = async (vorpal) => {
40
37
  (0, commandOpenDashboard_1.default)(vorpal);
41
38
  (0, commandOpenLogs_1.default)(vorpal);
42
39
  (0, commandOpenCostDashboard_1.default)(vorpal);
43
- (0, commandOpenGrafana_1.default)(vorpal);
44
- (0, commandOpenGrafanaPod_1.default)(vorpal);
45
40
  (0, commandCloudSqlProxy_1.default)(vorpal);
46
41
  (0, commandProjectRestoreDb_1.default)(vorpal);
47
42
  (0, commandOpenGit_1.default)(vorpal);
@@ -54,7 +49,6 @@ exports.default = async (vorpal) => {
54
49
  (0, commandPortForward_1.default)(vorpal);
55
50
  (0, commandGitlabCi_1.default)(vorpal);
56
51
  (0, commandGetMyTotalWorktime_1.default)(vorpal);
57
- (0, commandMigrateHelm3_1.default)(vorpal);
58
52
  (0, commandSecurityEvaluate_1.default)(vorpal);
59
53
  };
60
54
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../src/apps/cli/commands/project/index.ts"],"names":[],"mappings":";;;;;AACA,kFAA0D;AAC1D,kFAA0D;AAE1D,4EAAoD;AACpD,kFAA0D;AAC1D,sEAA8C;AAC9C,4FAAoE;AACpE,wEAAgD;AAChD,wEAAgD;AAChD,kEAA0C;AAC1C,4EAAoD;AACpD,wEAAgD;AAChD,gFAAwD;AACxD,0EAAkD;AAClD,0FAAkE;AAClE,kFAA0D;AAC1D,sEAA8C;AAC9C,sEAA8C;AAC9C,wEAAgD;AAChD,gFAAwD;AACxD,8EAAsD;AACtD,8EAAsD;AACtD,oFAA4D;AAE5D,oFAA4D;AAC5D,8FAAsE;AACtE,iGAAyE;AACzE,wFAAgE;AAEhE,kBAAe,KAAK,EAAE,MAAc,EAAE,EAAE;IACtC,IAAA,sBAAY,EAAC,MAAM,CAAC,CAAC;IACrB,IAAA,2BAAiB,EAAC,MAAM,CAAC,CAAC;IAE1B,IAAA,wBAAc,EAAC,MAAM,CAAC,CAAC;IAEvB,IAAA,0BAAgB,EAAC,MAAM,CAAC,CAAC;IACzB,IAAA,yBAAe,EAAC,MAAM,CAAC,CAAC;IACxB,IAAA,6BAAmB,EAAC,MAAM,CAAC,CAAC;IAC5B,IAAA,8BAAoB,EAAC,MAAM,CAAC,CAAC;IAE7B,IAAA,8BAAoB,EAAC,MAAM,CAAC,CAAC;IAE7B,IAAA,yBAAe,EAAC,MAAM,CAAC,CAAC;IAExB,IAAA,kCAAwB,EAAC,MAAM,CAAC,CAAC;IAEjC,IAAA,4BAAkB,EAAC,MAAM,CAAC,CAAC;IAC3B,IAAA,+BAAqB,EAAC,MAAM,CAAC,CAAC;IAC9B,IAAA,8BAAoB,EAAC,MAAM,CAAC,CAAC;IAC7B,IAAA,iCAAuB,EAAC,MAAM,CAAC,CAAC;IAChC,IAAA,wBAAc,EAAC,MAAM,CAAC,CAAC;IACvB,IAAA,wBAAc,EAAC,MAAM,CAAC,CAAC;IACvB,IAAA,+BAAqB,EAAC,MAAM,CAAC,CAAC;IAC9B,IAAA,8BAAoB,EAAC,MAAM,CAAC,CAAC;IAC7B,IAAA,oCAA0B,EAAC,MAAM,CAAC,CAAC;IACnC,IAAA,2BAAiB,EAAC,MAAM,CAAC,CAAC;IAE1B,IAAA,yBAAe,EAAC,MAAM,CAAC,CAAC;IACxB,IAAA,4BAAkB,EAAC,MAAM,CAAC,CAAC;IAE3B,IAAA,yBAAe,EAAC,MAAM,CAAC,CAAC;IAExB,IAAA,mCAAyB,EAAC,MAAM,CAAC,CAAC;IAClC,IAAA,6BAAmB,EAAC,MAAM,CAAC,CAAC;IAC5B,IAAA,iCAAuB,EAAC,MAAM,CAAC,CAAC;AAClC,CAAC,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../src/apps/cli/commands/project/index.ts"],"names":[],"mappings":";;;;;AACA,kFAA0D;AAC1D,kFAA0D;AAE1D,4EAAoD;AACpD,kFAA0D;AAC1D,sEAA8C;AAC9C,4FAAoE;AACpE,wEAAgD;AAChD,wEAAgD;AAChD,kEAA0C;AAC1C,4EAAoD;AACpD,wEAAgD;AAChD,0EAAkD;AAClD,0FAAkE;AAClE,kFAA0D;AAC1D,sEAA8C;AAC9C,sEAA8C;AAC9C,wEAAgD;AAChD,gFAAwD;AACxD,8EAAsD;AACtD,oFAA4D;AAC5D,8FAAsE;AACtE,iGAAyE;AACzE,wFAAgE;AAEhE,kBAAe,KAAK,EAAE,MAAc,EAAE,EAAE;IACtC,IAAA,sBAAY,EAAC,MAAM,CAAC,CAAC;IACrB,IAAA,2BAAiB,EAAC,MAAM,CAAC,CAAC;IAE1B,IAAA,wBAAc,EAAC,MAAM,CAAC,CAAC;IAEvB,IAAA,0BAAgB,EAAC,MAAM,CAAC,CAAC;IACzB,IAAA,yBAAe,EAAC,MAAM,CAAC,CAAC;IACxB,IAAA,6BAAmB,EAAC,MAAM,CAAC,CAAC;IAC5B,IAAA,8BAAoB,EAAC,MAAM,CAAC,CAAC;IAE7B,IAAA,8BAAoB,EAAC,MAAM,CAAC,CAAC;IAE7B,IAAA,yBAAe,EAAC,MAAM,CAAC,CAAC;IAExB,IAAA,kCAAwB,EAAC,MAAM,CAAC,CAAC;IAEjC,IAAA,8BAAoB,EAAC,MAAM,CAAC,CAAC;IAC7B,IAAA,iCAAuB,EAAC,MAAM,CAAC,CAAC;IAChC,IAAA,wBAAc,EAAC,MAAM,CAAC,CAAC;IACvB,IAAA,wBAAc,EAAC,MAAM,CAAC,CAAC;IACvB,IAAA,+BAAqB,EAAC,MAAM,CAAC,CAAC;IAC9B,IAAA,8BAAoB,EAAC,MAAM,CAAC,CAAC;IAC7B,IAAA,oCAA0B,EAAC,MAAM,CAAC,CAAC;IACnC,IAAA,2BAAiB,EAAC,MAAM,CAAC,CAAC;IAE1B,IAAA,yBAAe,EAAC,MAAM,CAAC,CAAC;IACxB,IAAA,4BAAkB,EAAC,MAAM,CAAC,CAAC;IAE3B,IAAA,yBAAe,EAAC,MAAM,CAAC,CAAC;IAExB,IAAA,mCAAyB,EAAC,MAAM,CAAC,CAAC;IAElC,IAAA,iCAAuB,EAAC,MAAM,CAAC,CAAC;AAClC,CAAC,CAAC"}
@@ -103,21 +103,15 @@ const getEnvVarsResolved = async (vorpal, env, componentName) => {
103
103
  if (!componentName) {
104
104
  return {};
105
105
  }
106
- try {
107
- const envionment = await (0, exports.getEnvironment)(env, componentName);
108
- // in the pipeline the secrets alreadyy exists and bash will expand them
109
- // but here we need to manually load them
110
- return resolveSecrets(vorpal, [
111
- {
112
- envVars: envionment.envVars,
113
- secretEnvVarKeys: envionment.secretEnvVarKeys,
114
- },
115
- ]);
116
- }
117
- catch (e) {
118
- // env is disabled
119
- return {};
120
- }
106
+ const envionment = await (0, exports.getEnvironment)(env, componentName);
107
+ // in the pipeline the secrets alreadyy exists and bash will expand them
108
+ // but here we need to manually load them
109
+ return resolveSecrets(vorpal, [
110
+ {
111
+ envVars: envionment.envVars,
112
+ secretEnvVarKeys: envionment.secretEnvVarKeys,
113
+ },
114
+ ]);
121
115
  };
122
116
  exports.getEnvVarsResolved = getEnvVarsResolved;
123
117
  /**
@@ -125,17 +119,11 @@ exports.getEnvVarsResolved = getEnvVarsResolved;
125
119
  * is used to get job only vars that should also be editable locally with catladder.
126
120
  */
127
121
  const getJobOnlyEnvVarsResolved = async (vorpal, env, componentName) => {
128
- try {
129
- const envionment = await (0, exports.getEnvironment)(env, componentName);
130
- return resolveSecrets(vorpal, [
131
- envionment.jobOnlyVars.build,
132
- envionment.jobOnlyVars.deploy,
133
- ]);
134
- }
135
- catch (e) {
136
- // env is disabled
137
- return {};
138
- }
122
+ const envionment = await (0, exports.getEnvironment)(env, componentName);
123
+ return resolveSecrets(vorpal, [
124
+ envionment.jobOnlyVars.build,
125
+ envionment.jobOnlyVars.deploy,
126
+ ]);
139
127
  };
140
128
  exports.getJobOnlyEnvVarsResolved = getJobOnlyEnvVarsResolved;
141
129
  //# sourceMappingURL=getProjectConfig.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"getProjectConfig.js","sourceRoot":"","sources":["../../../../src/config/getProjectConfig.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"getProjectConfig.js","sourceRoot":"","sources":["../../../../src/config/getProjectConfig.ts"],"names":[],"mappings":"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"}
@@ -8,6 +8,7 @@ export declare class BashExpression {
8
8
  constructor(value: string | BashExpression);
9
9
  toJSON(): string;
10
10
  toString(): string;
11
+ replace(searchValue: any, replacer: (substring: string, ...args: any[]) => string): BashExpression;
11
12
  /**
12
13
  *
13
14
  * @returns a bash expression to lowercase the string
@@ -33,8 +34,3 @@ export declare const getBashVariable: (name: string) => BashExpression;
33
34
  * @returns
34
35
  */
35
36
  export declare const joinBashExpressions: (parts: Array<StringOrBashExpression>, joiner?: string) => StringOrBashExpression;
36
- /**
37
- * escapes a string or bash expression for bash
38
- * it mainly escapes double quotes
39
- */
40
- export declare const bashEscape: (value: StringOrBashExpression | any) => any;
@@ -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
  *
@@ -16,6 +16,9 @@ class BashExpression {
16
16
  toString() {
17
17
  return this.value.toString();
18
18
  }
19
+ replace(searchValue, replacer) {
20
+ return new BashExpression(this.value.toString().replace(searchValue, replacer));
21
+ }
19
22
  /**
20
23
  *
21
24
  * @returns a bash expression to lowercase the string
@@ -61,18 +64,4 @@ const joinBashExpressions = (parts, joiner = "") => {
61
64
  }
62
65
  };
63
66
  exports.joinBashExpressions = joinBashExpressions;
64
- /**
65
- * escapes a string or bash expression for bash
66
- * it mainly escapes double quotes
67
- */
68
- const bashEscape = (value) => {
69
- if (value instanceof BashExpression) {
70
- return value.toString(); // no need to escape bash expressions, as we want them to evaluate
71
- }
72
- // we wrap it in double quotes, so we need to escape them
73
- if (typeof value === "string")
74
- return value.replace(/"/g, '\\"');
75
- return value;
76
- };
77
- exports.bashEscape = bashEscape;
78
67
  //# sourceMappingURL=BashExpression.js.map
@@ -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;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"}
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"}
@@ -0,0 +1,32 @@
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
+ * escape env vars for .env files.
19
+ * unfortunatly, the format has many limitations. In order to be very forgiving, we need to do some magic here:
20
+ *
21
+ * - when the value contains no newlines, we are fine
22
+ * - if the value contains newlines, we need to wrap it in quotes. And thats where the problem begins:
23
+ * - you can't escape quotes. this is a limitation of dotenv and node
24
+ * - you can have inner quotes, but they break in node.js (not in dotenv though), see https://github.com/nodejs/node/issues/54134
25
+ * - so we need to quote cleverly
26
+ * - to make things worse, we need to check whether we have a simple stirng or a bash expression, that needs to be evalulated first...
27
+ *
28
+ * what an absolute nightmare.
29
+ *
30
+ * - other languages are currently only partially supported, since most .env implementations are slightly different
31
+ */
32
+ export declare const escapeForDotEnv: (value: VariableValue | undefined | null) => string;