@catladder/cli 0.0.0-main-48ef3537 → 0.0.0-main-632b986b

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 (14) hide show
  1. package/dist/apps/catenv/printVariables.js +19 -16
  2. package/dist/apps/catenv/printVariables.js.map +1 -1
  3. package/dist/apps/catenv/writeDotEnvFiles.js.map +1 -1
  4. package/dist/apps/catenv/writeEnvDTs.js +5 -5
  5. package/dist/apps/catenv/writeEnvDTs.js.map +1 -1
  6. package/dist/bundles/catenv/index.js +31 -37
  7. package/dist/bundles/cli/index.js +7 -16
  8. package/dist/config/getProjectConfig.d.ts +2 -2
  9. package/dist/tsconfig.tsbuildinfo +1 -1
  10. package/package.json +2 -2
  11. package/src/apps/catenv/printVariables.ts +11 -6
  12. package/src/apps/catenv/writeDotEnvFiles.ts +0 -2
  13. package/src/apps/catenv/writeEnvDTs.ts +2 -2
  14. package/src/config/getProjectConfig.ts +1 -1
package/dist/apps/catenv/printVariables.js CHANGED
@@ -51,29 +51,34 @@ exports.printVariables = void 0;
51
51
  var getProjectConfig_1 = require("../../config/getProjectConfig");
52
52
  var utils_1 = require("./utils");
53
53
  var getAllVariablesToPrint = function (config, choice) { return __awaiter(void 0, void 0, void 0, function () {
54
- var _a, env, currentComponent, variables;
54
+ var _a, env, currentComponent;
55
55
  return __generator(this, function (_b) {
56
56
  switch (_b.label) {
57
57
  case 0: return [4 /*yield*/, (0, utils_1.getCurrentComponentAndEnvFromChoice)(config, choice)];
58
58
  case 1:
59
59
  _a = _b.sent(), env = _a.env, currentComponent = _a.currentComponent;
60
- variables = {};
61
60
  if (!currentComponent) return [3 /*break*/, 3];
61
+ // don't print vars if dotenv is enabled
62
+ if (config.components[currentComponent].dotEnv) {
63
+ return [2 /*return*/, {}];
64
+ }
62
65
  return [4 /*yield*/, (0, getProjectConfig_1.getEnvVarsResolved)(null, env, currentComponent)];
63
- case 2:
64
- variables = _b.sent();
65
- return [3 /*break*/, 5];
66
+ case 2: return [2 /*return*/, _b.sent()];
66
67
  case 3: return [4 /*yield*/, Object.keys(config.components).reduce(function (acc, componentName) { return __awaiter(void 0, void 0, void 0, function () {
67
68
  var subappvars, _a;
68
69
  return __generator(this, function (_b) {
69
70
  switch (_b.label) {
70
- case 0: return [4 /*yield*/, (0, getProjectConfig_1.getEnvVarsResolved)(null, env, componentName)];
71
- case 1:
71
+ case 0:
72
+ if (!config.components[componentName].dotEnv) return [3 /*break*/, 2];
73
+ return [4 /*yield*/, acc];
74
+ case 1: return [2 /*return*/, _b.sent()];
75
+ case 2: return [4 /*yield*/, (0, getProjectConfig_1.getEnvVarsResolved)(null, env, componentName)];
76
+ case 3:
72
77
  subappvars = _b.sent();
73
78
  delete subappvars["_ALL_ENV_VAR_KEYS"];
74
79
  _a = [{}];
75
80
  return [4 /*yield*/, acc];
76
- case 2: return [2 /*return*/, __assign.apply(void 0, [__assign.apply(void 0, [__assign.apply(void 0, _a.concat([(_b.sent())])), subappvars]), Object.fromEntries(Object.entries(subappvars).map(function (_a) {
81
+ case 4: return [2 /*return*/, __assign.apply(void 0, [__assign.apply(void 0, [__assign.apply(void 0, _a.concat([(_b.sent())])), subappvars]), Object.fromEntries(Object.entries(subappvars).map(function (_a) {
77
82
  var key = _a[0], value = _a[1];
78
83
  return [
79
84
  "".concat((0, utils_1.sanitizeEnvVarName)(componentName.toUpperCase()), "_").concat(key),
@@ -82,14 +87,12 @@ var getAllVariablesToPrint = function (config, choice) { return __awaiter(void 0
82
87
  }))])];
83
88
  }
84
89
  });
85
- }); }, {})];
86
- case 4:
87
- // when in a monorep and not in a subapp, merge all env vars.
88
- // this is not 100% correct, but better than not exporting any vars at all
89
- // so we also add prefixed variants
90
- variables = _b.sent();
91
- _b.label = 5;
92
- case 5: return [2 /*return*/, variables];
90
+ }); }, Promise.resolve({}))];
91
+ case 4:
92
+ // when in a monorep and not in a subapp, merge all env vars.
93
+ // this is not 100% correct, but better than not exporting any vars at all
94
+ // so we also add prefixed variants
95
+ return [2 /*return*/, _b.sent()];
93
96
  }
94
97
  });
95
98
  }); };
package/dist/apps/catenv/printVariables.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"printVariables.js","sourceRoot":"","sources":["../../../src/apps/catenv/printVariables.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,kEAAmE;AAEnE,iCAIiB;AAEjB,IAAM,sBAAsB,GAAG,UAAO,MAAc,EAAE,MAAe;;;;oBACjC,qBAAM,IAAA,2CAAmC,EACzE,MAAM,EACN,MAAM,CACP,EAAA;;gBAHK,KAA4B,SAGjC,EAHO,GAAG,SAAA,EAAE,gBAAgB,sBAAA;gBAKzB,SAAS,GAA2B,EAAE,CAAC;qBACvC,gBAAgB,EAAhB,wBAAgB;gBACN,qBAAM,IAAA,qCAAkB,EAAC,IAAI,EAAE,GAAG,EAAE,gBAAgB,CAAC,EAAA;;gBAAjE,SAAS,GAAG,SAAqD,CAAC;;oBAKtD,qBAAM,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,CACrD,UAAO,GAAG,EAAE,aAAa;;;;oCACJ,qBAAM,IAAA,qCAAkB,EAAC,IAAI,EAAE,GAAG,EAAE,aAAa,CAAC,EAAA;;gCAA/D,UAAU,GAAG,SAAkD;gCACrE,OAAO,UAAU,CAAC,mBAAmB,CAAC,CAAC;;gCAEjC,qBAAM,GAAG,EAAA;oCADf,wGACK,CAAC,SAAS,CAAC,KACX,UAAU,IAEV,MAAM,CAAC,WAAW,CACnB,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,UAAC,EAAY;4CAAX,GAAG,QAAA,EAAE,KAAK,QAAA;wCAAM,OAAA;4CAC/C,UAAG,IAAA,0BAAkB,EAAC,aAAa,CAAC,WAAW,EAAE,CAAC,cAAI,GAAG,CAAE;4CAC3D,KAAK;yCACN;oCAHgD,CAGhD,CAAC,CACH,IACD;;;qBACH,EACD,EAAE,CACH,EAAA;;gBApBD,6DAA6D;gBAC7D,0EAA0E;gBAC1E,mCAAmC;gBACnC,SAAS,GAAG,SAiBX,CAAC;;oBAGJ,sBAAO,SAAS,EAAC;;;KAClB,CAAC;AAEK,IAAM,cAAc,GAAG,UAAO,MAAc,EAAE,MAAe;;;;oBAChD,qBAAM,sBAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,EAAA;;gBAAxD,SAAS,GAAG,SAA4C;gBAE9D,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC,CAAC;;;;KAClD,CAAC;AAJW,QAAA,cAAc,kBAIzB;AAEF,IAAM,wBAAwB,GAAG,UAAC,SAAoB;IACpD,OAAA,IAAA,0BAAkB,EAAC,SAAS,EAAE,SAAS,CAAC;AAAxC,CAAwC,CAAC"}
1
+ {"version":3,"file":"printVariables.js","sourceRoot":"","sources":["../../../src/apps/catenv/printVariables.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,kEAAmE;AAEnE,iCAIiB;AAEjB,IAAM,sBAAsB,GAAG,UAAO,MAAc,EAAE,MAAe;;;;oBACjC,qBAAM,IAAA,2CAAmC,EACzE,MAAM,EACN,MAAM,CACP,EAAA;;gBAHK,KAA4B,SAGjC,EAHO,GAAG,SAAA,EAAE,gBAAgB,sBAAA;qBAKzB,gBAAgB,EAAhB,wBAAgB;gBAClB,wCAAwC;gBACxC,IAAI,MAAM,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,MAAM,EAAE;oBAC9C,sBAAO,EAAE,EAAC;iBACX;gBACM,qBAAM,IAAA,qCAAkB,EAAC,IAAI,EAAE,GAAG,EAAE,gBAAgB,CAAC,EAAA;oBAA5D,sBAAO,SAAqD,EAAC;oBAKtD,qBAAM,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,CAChD,UAAO,GAAG,EAAE,aAAa;;;;;qCAEnB,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,MAAM,EAAvC,wBAAuC;gCAClC,qBAAM,GAAG,EAAA;oCAAhB,sBAAO,SAAS,EAAC;oCAEA,qBAAM,IAAA,qCAAkB,EAAC,IAAI,EAAE,GAAG,EAAE,aAAa,CAAC,EAAA;;gCAA/D,UAAU,GAAG,SAAkD;gCACrE,OAAO,UAAU,CAAC,mBAAmB,CAAC,CAAC;;gCAEjC,qBAAM,GAAG,EAAA;oCADf,wGACK,CAAC,SAAS,CAAC,KACX,UAAU,IAEV,MAAM,CAAC,WAAW,CACnB,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,UAAC,EAAY;4CAAX,GAAG,QAAA,EAAE,KAAK,QAAA;wCAAM,OAAA;4CAC/C,UAAG,IAAA,0BAAkB,EAAC,aAAa,CAAC,WAAW,EAAE,CAAC,cAAI,GAAG,CAAE;4CAC3D,KAAK;yCACN;oCAHgD,CAGhD,CAAC,CACH,IACD;;;qBACH,EACD,OAAO,CAAC,OAAO,CAAC,EAA4B,CAAC,CAC9C,EAAA;;YAxBD,6DAA6D;YAC7D,0EAA0E;YAC1E,mCAAmC;YACnC,sBAAO,SAqBN,EAAC;;;KAEL,CAAC;AAEK,IAAM,cAAc,GAAG,UAAO,MAAc,EAAE,MAAe;;;;oBAChD,qBAAM,sBAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,EAAA;;gBAAxD,SAAS,GAAG,SAA4C;gBAE9D,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC,CAAC;;;;KAClD,CAAC;AAJW,QAAA,cAAc,kBAIzB;AAEF,IAAM,wBAAwB,GAAG,UAAC,SAAoB;IACpD,OAAA,IAAA,0BAAkB,EAAC,SAAS,EAAE,SAAS,CAAC;AAAxC,CAAwC,CAAC"}
package/dist/apps/catenv/writeDotEnvFiles.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"writeDotEnvFiles.js","sourceRoot":"","sources":["../../../src/apps/catenv/writeDotEnvFiles.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,qCAAqC;AACrC,6BAA4B;AAC5B,kEAAmE;AACnE,iDAAkD;AAElD,iCAKiB;AAEV,IAAM,gBAAgB,GAAG,UAAO,MAAc,EAAE,MAAe;;;;oBAClC,qBAAM,IAAA,2CAAmC,EACzE,MAAM,EACN,MAAM,CACP,EAAA;;gBAHK,KAA4B,SAGjC,EAHO,GAAG,SAAA,EAAE,gBAAgB,sBAAA;gBAOvB,gCAAgC,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC;qBACvE,MAAM,CAAC,UAAC,EAAa;wBAAV,SAAS,QAAA;oBAAM,OAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM;gBAAjB,CAAiB,CAAC;qBAC5C,GAAG,CAAC,UAAC,EAAe;wBAAd,aAAa,QAAA;oBAAM,OAAA,aAAa;gBAAb,CAAa,CAAC,CAAC;gBAErC,kCAAkC,GAAG,gBAAgB;oBACzD,CAAC,CAAC,gCAAgC,CAAC,QAAQ,CAAC,gBAAgB,CAAC;wBAC3D,CAAC,CAAC,CAAC,gBAAgB,CAAC;wBACpB,CAAC,CAAC,EAAE;oBACN,CAAC,CAAC,gCAAgC,CAAC;gBACrB,qBAAM,IAAA,qBAAU,GAAE,EAAA;;gBAA5B,OAAO,GAAG,SAAkB;sBAE4B,EAAlC,yEAAkC;;;qBAAlC,CAAA,gDAAkC,CAAA;gBAAnD,aAAa;gBACJ,qBAAM,IAAA,qCAAkB,EAAC,IAAI,EAAE,GAAG,EAAE,aAAa,CAAC,EAAA;;gBAA9D,SAAS,GAAG,SAAkD;gBACpE,OAAO,SAAS,CAAC,mBAAmB,CAAC,CAAC;gBAChC,YAAY,GAAG,IAAA,4BAAoB,EAAC,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;gBACpE,QAAQ,GAAG,IAAA,WAAI,EAAC,YAAY,EAAE,MAAM,CAAC,CAAC;gBAEtC,kBAAkB,GAAG,IAAA,yBAAiB,EAAC,SAAS,CAAC,CAAC;gBACxD,qBAAM,IAAA,oBAAS,EACb,QAAQ,EACR,0DAA0D;wBACxD,IAAA,0BAAkB,EAAC,kBAAkB,CAAC,CACzC,EAAA;;gBAJD,SAIC,CAAC;;;gBAXwB,IAAkC,CAAA;;;;;KAa/D,CAAC;AAhCW,QAAA,gBAAgB,oBAgC3B"}
1
+ {"version":3,"file":"writeDotEnvFiles.js","sourceRoot":"","sources":["../../../src/apps/catenv/writeDotEnvFiles.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,qCAAqC;AACrC,6BAA4B;AAC5B,kEAAmE;AACnE,iDAAkD;AAElD,iCAKiB;AAEV,IAAM,gBAAgB,GAAG,UAAO,MAAc,EAAE,MAAe;;;;oBAClC,qBAAM,IAAA,2CAAmC,EACzE,MAAM,EACN,MAAM,CACP,EAAA;;gBAHK,KAA4B,SAGjC,EAHO,GAAG,SAAA,EAAE,gBAAgB,sBAAA;gBAKvB,gCAAgC,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC;qBACvE,MAAM,CAAC,UAAC,EAAa;wBAAV,SAAS,QAAA;oBAAM,OAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM;gBAAjB,CAAiB,CAAC;qBAC5C,GAAG,CAAC,UAAC,EAAe;wBAAd,aAAa,QAAA;oBAAM,OAAA,aAAa;gBAAb,CAAa,CAAC,CAAC;gBAErC,kCAAkC,GAAG,gBAAgB;oBACzD,CAAC,CAAC,gCAAgC,CAAC,QAAQ,CAAC,gBAAgB,CAAC;wBAC3D,CAAC,CAAC,CAAC,gBAAgB,CAAC;wBACpB,CAAC,CAAC,EAAE;oBACN,CAAC,CAAC,gCAAgC,CAAC;gBACrB,qBAAM,IAAA,qBAAU,GAAE,EAAA;;gBAA5B,OAAO,GAAG,SAAkB;sBAE4B,EAAlC,yEAAkC;;;qBAAlC,CAAA,gDAAkC,CAAA;gBAAnD,aAAa;gBACJ,qBAAM,IAAA,qCAAkB,EAAC,IAAI,EAAE,GAAG,EAAE,aAAa,CAAC,EAAA;;gBAA9D,SAAS,GAAG,SAAkD;gBACpE,OAAO,SAAS,CAAC,mBAAmB,CAAC,CAAC;gBAChC,YAAY,GAAG,IAAA,4BAAoB,EAAC,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;gBACpE,QAAQ,GAAG,IAAA,WAAI,EAAC,YAAY,EAAE,MAAM,CAAC,CAAC;gBAEtC,kBAAkB,GAAG,IAAA,yBAAiB,EAAC,SAAS,CAAC,CAAC;gBACxD,qBAAM,IAAA,oBAAS,EACb,QAAQ,EACR,0DAA0D;wBACxD,IAAA,0BAAkB,EAAC,kBAAkB,CAAC,CACzC,EAAA;;gBAJD,SAIC,CAAC;;;gBAXwB,IAAkC,CAAA;;;;;KAa/D,CAAC;AA9BW,QAAA,gBAAgB,oBA8B3B"}
package/dist/apps/catenv/writeEnvDTs.js CHANGED
@@ -43,7 +43,7 @@ var getProjectConfig_1 = require("../../config/getProjectConfig");
43
43
  var projects_1 = require("../../utils/projects");
44
44
  var utils_1 = require("./utils");
45
45
  var writeDTsFiles = function (config, choice) { return __awaiter(void 0, void 0, void 0, function () {
46
- var _a, env, currentComponent, componentsWithEnabledEnvDTsWrite, componentsToActuallyWriteDotEnvNow, gitRoot, _i, componentsToActuallyWriteDotEnvNow_1, componentName, envNames, envDTsContent, componentDir, filePath;
46
+ var _a, env, currentComponent, componentsWithEnabledEnvDTsWrite, componentsToActuallyWriteEnvDts, gitRoot, _i, componentsToActuallyWriteEnvDts_1, componentName, envNames, envDTsContent, componentDir, filePath;
47
47
  return __generator(this, function (_b) {
48
48
  switch (_b.label) {
49
49
  case 0: return [4 /*yield*/, (0, utils_1.getCurrentComponentAndEnvFromChoice)(config, choice)];
@@ -58,7 +58,7 @@ var writeDTsFiles = function (config, choice) { return __awaiter(void 0, void 0,
58
58
  var componentName = _a[0];
59
59
  return componentName;
60
60
  });
61
- componentsToActuallyWriteDotEnvNow = currentComponent
61
+ componentsToActuallyWriteEnvDts = currentComponent
62
62
  ? componentsWithEnabledEnvDTsWrite.includes(currentComponent)
63
63
  ? [currentComponent]
64
64
  : []
@@ -66,11 +66,11 @@ var writeDTsFiles = function (config, choice) { return __awaiter(void 0, void 0,
66
66
  return [4 /*yield*/, (0, projects_1.getGitRoot)()];
67
67
  case 2:
68
68
  gitRoot = _b.sent();
69
- _i = 0, componentsToActuallyWriteDotEnvNow_1 = componentsToActuallyWriteDotEnvNow;
69
+ _i = 0, componentsToActuallyWriteEnvDts_1 = componentsToActuallyWriteEnvDts;
70
70
  _b.label = 3;
71
71
  case 3:
72
- if (!(_i < componentsToActuallyWriteDotEnvNow_1.length)) return [3 /*break*/, 7];
73
- componentName = componentsToActuallyWriteDotEnvNow_1[_i];
72
+ if (!(_i < componentsToActuallyWriteEnvDts_1.length)) return [3 /*break*/, 7];
73
+ componentName = componentsToActuallyWriteEnvDts_1[_i];
74
74
  return [4 /*yield*/, getEnvsForDTs(env, componentName)];
75
75
  case 4:
76
76
  envNames = _b.sent();
package/dist/apps/catenv/writeEnvDTs.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"writeEnvDTs.js","sourceRoot":"","sources":["../../../src/apps/catenv/writeEnvDTs.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,qCAAqC;AACrC,6BAA4B;AAC5B,kEAA+D;AAC/D,iDAAkD;AAElD,iCAGiB;AAEV,IAAM,aAAa,GAAG,UAAO,MAAc,EAAE,MAAe;;;;oBAC/B,qBAAM,IAAA,2CAAmC,EACzE,MAAM,EACN,MAAM,CACP,EAAA;;gBAHK,KAA4B,SAGjC,EAHO,GAAG,SAAA,EAAE,gBAAgB,sBAAA;gBAKvB,gCAAgC,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC;qBACvE,MAAM,CAAC,UAAC,EAAa;wBAAV,SAAS,QAAA;oBAAM,OAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM;gBAAjB,CAAiB,CAAC;qBAC5C,GAAG,CAAC,UAAC,EAAe;wBAAd,aAAa,QAAA;oBAAM,OAAA,aAAa;gBAAb,CAAa,CAAC,CAAC;gBAErC,kCAAkC,GAAG,gBAAgB;oBACzD,CAAC,CAAC,gCAAgC,CAAC,QAAQ,CAAC,gBAAgB,CAAC;wBAC3D,CAAC,CAAC,CAAC,gBAAgB,CAAC;wBACpB,CAAC,CAAC,EAAE;oBACN,CAAC,CAAC,gCAAgC,CAAC;gBACrB,qBAAM,IAAA,qBAAU,GAAE,EAAA;;gBAA5B,OAAO,GAAG,SAAkB;sBAE4B,EAAlC,yEAAkC;;;qBAAlC,CAAA,gDAAkC,CAAA;gBAAnD,aAAa;gBACL,qBAAM,aAAa,CAAC,GAAG,EAAE,aAAa,CAAC,EAAA;;gBAAlD,QAAQ,GAAG,SAAuC;gBAClD,aAAa,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAC;gBAE9C,YAAY,GAAG,IAAA,4BAAoB,EAAC,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;gBACpE,QAAQ,GAAG,IAAA,WAAI,EAAC,YAAY,EAAE,UAAU,CAAC,CAAC;gBAChD,qBAAM,IAAA,oBAAS,EAAC,QAAQ,EAAE,aAAa,CAAC,EAAA;;gBAAxC,SAAwC,CAAC;;;gBANf,IAAkC,CAAA;;;;;KAQ/D,CAAC;AAzBW,QAAA,aAAa,iBAyBxB;AAEF,SAAe,aAAa,CAC1B,GAAW,EACX,aAAqB;;;;;wBAED,qBAAM,IAAA,iCAAc,EAAC,GAAG,EAAE,aAAa,CAAC,EAAA;;oBAAtD,WAAW,GAAG,SAAwC;oBACtD,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;oBAC9C,aAAa,GAAG,IAAI,GAAG,CAC3B,WAAW,CAAC,gBAAgB;yBACzB,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,MAAM,EAAR,CAAQ,CAAC;yBACvB,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,GAAG,EAAL,CAAK,CAAC;yBACjB,MAAM,CAAC,CAAC,mBAAmB,CAAC,CAAC,CACjC,CAAC;oBACI,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAArB,CAAqB,CAAC,CAAC;oBAEnE,sBAAO,UAAU,EAAC;;;;CACnB;AAED,SAAS,mBAAmB,CAAC,QAAkB;IAC7C,OAAO,2PASP,QAAQ,CAAC,GAAG,CAAC,UAAC,IAAI,IAAK,OAAA,gBAAS,IAAI,aAAU,EAAvB,CAAuB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,sBAI3D,CAAC;AACF,CAAC"}
1
+ {"version":3,"file":"writeEnvDTs.js","sourceRoot":"","sources":["../../../src/apps/catenv/writeEnvDTs.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,qCAAqC;AACrC,6BAA4B;AAC5B,kEAA+D;AAC/D,iDAAkD;AAElD,iCAGiB;AAEV,IAAM,aAAa,GAAG,UAAO,MAAc,EAAE,MAAe;;;;oBAC/B,qBAAM,IAAA,2CAAmC,EACzE,MAAM,EACN,MAAM,CACP,EAAA;;gBAHK,KAA4B,SAGjC,EAHO,GAAG,SAAA,EAAE,gBAAgB,sBAAA;gBAKvB,gCAAgC,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC;qBACvE,MAAM,CAAC,UAAC,EAAa;wBAAV,SAAS,QAAA;oBAAM,OAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM;gBAAjB,CAAiB,CAAC;qBAC5C,GAAG,CAAC,UAAC,EAAe;wBAAd,aAAa,QAAA;oBAAM,OAAA,aAAa;gBAAb,CAAa,CAAC,CAAC;gBAErC,+BAA+B,GAAG,gBAAgB;oBACtD,CAAC,CAAC,gCAAgC,CAAC,QAAQ,CAAC,gBAAgB,CAAC;wBAC3D,CAAC,CAAC,CAAC,gBAAgB,CAAC;wBACpB,CAAC,CAAC,EAAE;oBACN,CAAC,CAAC,gCAAgC,CAAC;gBACrB,qBAAM,IAAA,qBAAU,GAAE,EAAA;;gBAA5B,OAAO,GAAG,SAAkB;sBAEyB,EAA/B,mEAA+B;;;qBAA/B,CAAA,6CAA+B,CAAA;gBAAhD,aAAa;gBACL,qBAAM,aAAa,CAAC,GAAG,EAAE,aAAa,CAAC,EAAA;;gBAAlD,QAAQ,GAAG,SAAuC;gBAClD,aAAa,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAC;gBAE9C,YAAY,GAAG,IAAA,4BAAoB,EAAC,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;gBACpE,QAAQ,GAAG,IAAA,WAAI,EAAC,YAAY,EAAE,UAAU,CAAC,CAAC;gBAChD,qBAAM,IAAA,oBAAS,EAAC,QAAQ,EAAE,aAAa,CAAC,EAAA;;gBAAxC,SAAwC,CAAC;;;gBANf,IAA+B,CAAA;;;;;KAQ5D,CAAC;AAzBW,QAAA,aAAa,iBAyBxB;AAEF,SAAe,aAAa,CAC1B,GAAW,EACX,aAAqB;;;;;wBAED,qBAAM,IAAA,iCAAc,EAAC,GAAG,EAAE,aAAa,CAAC,EAAA;;oBAAtD,WAAW,GAAG,SAAwC;oBACtD,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;oBAC9C,aAAa,GAAG,IAAI,GAAG,CAC3B,WAAW,CAAC,gBAAgB;yBACzB,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,MAAM,EAAR,CAAQ,CAAC;yBACvB,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,GAAG,EAAL,CAAK,CAAC;yBACjB,MAAM,CAAC,CAAC,mBAAmB,CAAC,CAAC,CACjC,CAAC;oBACI,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAArB,CAAqB,CAAC,CAAC;oBAEnE,sBAAO,UAAU,EAAC;;;;CACnB;AAED,SAAS,mBAAmB,CAAC,QAAkB;IAC7C,OAAO,2PASP,QAAQ,CAAC,GAAG,CAAC,UAAC,IAAI,IAAK,OAAA,gBAAS,IAAI,aAAU,EAAvB,CAAuB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,sBAI3D,CAAC;AACF,CAAC"}
package/dist/bundles/catenv/index.js CHANGED
@@ -131,29 +131,34 @@ exports.printVariables = void 0;
131
131
  var getProjectConfig_1 = __nccwpck_require__(4146);
132
132
  var utils_1 = __nccwpck_require__(4640);
133
133
  var getAllVariablesToPrint = function (config, choice) { return __awaiter(void 0, void 0, void 0, function () {
134
- var _a, env, currentComponent, variables;
134
+ var _a, env, currentComponent;
135
135
  return __generator(this, function (_b) {
136
136
  switch (_b.label) {
137
137
  case 0: return [4 /*yield*/, (0, utils_1.getCurrentComponentAndEnvFromChoice)(config, choice)];
138
138
  case 1:
139
139
  _a = _b.sent(), env = _a.env, currentComponent = _a.currentComponent;
140
- variables = {};
141
140
  if (!currentComponent) return [3 /*break*/, 3];
141
+ // don't print vars if dotenv is enabled
142
+ if (config.components[currentComponent].dotEnv) {
143
+ return [2 /*return*/, {}];
144
+ }
142
145
  return [4 /*yield*/, (0, getProjectConfig_1.getEnvVarsResolved)(null, env, currentComponent)];
143
- case 2:
144
- variables = _b.sent();
145
- return [3 /*break*/, 5];
146
+ case 2: return [2 /*return*/, _b.sent()];
146
147
  case 3: return [4 /*yield*/, Object.keys(config.components).reduce(function (acc, componentName) { return __awaiter(void 0, void 0, void 0, function () {
147
148
  var subappvars, _a;
148
149
  return __generator(this, function (_b) {
149
150
  switch (_b.label) {
150
- case 0: return [4 /*yield*/, (0, getProjectConfig_1.getEnvVarsResolved)(null, env, componentName)];
151
- case 1:
151
+ case 0:
152
+ if (!config.components[componentName].dotEnv) return [3 /*break*/, 2];
153
+ return [4 /*yield*/, acc];
154
+ case 1: return [2 /*return*/, _b.sent()];
155
+ case 2: return [4 /*yield*/, (0, getProjectConfig_1.getEnvVarsResolved)(null, env, componentName)];
156
+ case 3:
152
157
  subappvars = _b.sent();
153
158
  delete subappvars["_ALL_ENV_VAR_KEYS"];
154
159
  _a = [{}];
155
160
  return [4 /*yield*/, acc];
156
- case 2: return [2 /*return*/, __assign.apply(void 0, [__assign.apply(void 0, [__assign.apply(void 0, _a.concat([(_b.sent())])), subappvars]), Object.fromEntries(Object.entries(subappvars).map(function (_a) {
161
+ case 4: return [2 /*return*/, __assign.apply(void 0, [__assign.apply(void 0, [__assign.apply(void 0, _a.concat([(_b.sent())])), subappvars]), Object.fromEntries(Object.entries(subappvars).map(function (_a) {
157
162
  var key = _a[0], value = _a[1];
158
163
  return [
159
164
  "".concat((0, utils_1.sanitizeEnvVarName)(componentName.toUpperCase()), "_").concat(key),
@@ -162,14 +167,12 @@ var getAllVariablesToPrint = function (config, choice) { return __awaiter(void 0
162
167
  }))])];
163
168
  }
164
169
  });
165
- }); }, {})];
166
- case 4:
167
- // when in a monorep and not in a subapp, merge all env vars.
168
- // this is not 100% correct, but better than not exporting any vars at all
169
- // so we also add prefixed variants
170
- variables = _b.sent();
171
- _b.label = 5;
172
- case 5: return [2 /*return*/, variables];
170
+ }); }, Promise.resolve({}))];
171
+ case 4:
172
+ // when in a monorep and not in a subapp, merge all env vars.
173
+ // this is not 100% correct, but better than not exporting any vars at all
174
+ // so we also add prefixed variants
175
+ return [2 /*return*/, _b.sent()];
173
176
  }
174
177
  });
175
178
  }); };
@@ -458,7 +461,7 @@ var getProjectConfig_1 = __nccwpck_require__(4146);
458
461
  var projects_1 = __nccwpck_require__(1619);
459
462
  var utils_1 = __nccwpck_require__(4640);
460
463
  var writeDTsFiles = function (config, choice) { return __awaiter(void 0, void 0, void 0, function () {
461
- var _a, env, currentComponent, componentsWithEnabledEnvDTsWrite, componentsToActuallyWriteDotEnvNow, gitRoot, _i, componentsToActuallyWriteDotEnvNow_1, componentName, envNames, envDTsContent, componentDir, filePath;
464
+ var _a, env, currentComponent, componentsWithEnabledEnvDTsWrite, componentsToActuallyWriteEnvDts, gitRoot, _i, componentsToActuallyWriteEnvDts_1, componentName, envNames, envDTsContent, componentDir, filePath;
462
465
  return __generator(this, function (_b) {
463
466
  switch (_b.label) {
464
467
  case 0: return [4 /*yield*/, (0, utils_1.getCurrentComponentAndEnvFromChoice)(config, choice)];
@@ -473,7 +476,7 @@ var writeDTsFiles = function (config, choice) { return __awaiter(void 0, void 0,
473
476
  var componentName = _a[0];
474
477
  return componentName;
475
478
  });
476
- componentsToActuallyWriteDotEnvNow = currentComponent
479
+ componentsToActuallyWriteEnvDts = currentComponent
477
480
  ? componentsWithEnabledEnvDTsWrite.includes(currentComponent)
478
481
  ? [currentComponent]
479
482
  : []
@@ -481,11 +484,11 @@ var writeDTsFiles = function (config, choice) { return __awaiter(void 0, void 0,
481
484
  return [4 /*yield*/, (0, projects_1.getGitRoot)()];
482
485
  case 2:
483
486
  gitRoot = _b.sent();
484
- _i = 0, componentsToActuallyWriteDotEnvNow_1 = componentsToActuallyWriteDotEnvNow;
487
+ _i = 0, componentsToActuallyWriteEnvDts_1 = componentsToActuallyWriteEnvDts;
485
488
  _b.label = 3;
486
489
  case 3:
487
- if (!(_i < componentsToActuallyWriteDotEnvNow_1.length)) return [3 /*break*/, 7];
488
- componentName = componentsToActuallyWriteDotEnvNow_1[_i];
490
+ if (!(_i < componentsToActuallyWriteEnvDts_1.length)) return [3 /*break*/, 7];
491
+ componentName = componentsToActuallyWriteEnvDts_1[_i];
489
492
  return [4 /*yield*/, getEnvsForDTs(env, componentName)];
490
493
  case 4:
491
494
  envNames = _b.sent();
@@ -39686,21 +39689,12 @@ var getDockerImageVariables = function (context) {
39686
39689
  };
39687
39690
  };
39688
39691
  exports.getDockerImageVariables = getDockerImageVariables;
39689
- var requiresDockerBuild = function (context) {
39690
- var deployConfig = context.componentConfig.deploy;
39691
- if ((0, deploy_1.isOfDeployType)(deployConfig, "kubernetes")) {
39692
- return true;
39693
- }
39694
- if ((0, deploy_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
39695
- return true;
39696
- }
39697
- if ((0, deploy_1.isOfDeployType)(deployConfig, "custom") && deployConfig.requiresDocker) {
39698
- return true;
39699
- }
39700
- if ((0, deploy_1.isOfDeployType)(deployConfig, "dockerTag")) {
39701
- return true;
39702
- }
39703
- return false;
39692
+ /**
39693
+ * Weather the context requires a docker build
39694
+ */
39695
+ var requiresDockerBuild = function (_a) {
39696
+ var deploy = _a.componentConfig.deploy;
39697
+ return (0, deploy_1.isOfDeployType)(deploy, "kubernetes", "google-cloudrun", "dockerTag") || (0, deploy_1.isOfDeployType)(deploy, "custom") && deploy.requiresDocker;
39704
39698
  };
39705
39699
  exports.requiresDockerBuild = requiresDockerBuild;
39706
39700
  var getDockerBaseVariables = function () {
@@ -40834,7 +40828,7 @@ exports.readConfigSync = readConfigSync;
40834
40828
 
40835
40829
  exports.__esModule = true;
40836
40830
  exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
40837
- exports.PIPELINE_IMAGE_TAG = "main-48ef3537" || 0;
40831
+ exports.PIPELINE_IMAGE_TAG = "main-632b986b" || 0;
40838
40832
  exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
40839
40833
 
40840
40834
  /***/ }),
package/dist/bundles/cli/index.js CHANGED
@@ -350754,21 +350754,12 @@ var getDockerImageVariables = function (context) {
350754
350754
  };
350755
350755
  };
350756
350756
  exports.getDockerImageVariables = getDockerImageVariables;
350757
- var requiresDockerBuild = function (context) {
350758
- var deployConfig = context.componentConfig.deploy;
350759
- if ((0, deploy_1.isOfDeployType)(deployConfig, "kubernetes")) {
350760
- return true;
350761
- }
350762
- if ((0, deploy_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
350763
- return true;
350764
- }
350765
- if ((0, deploy_1.isOfDeployType)(deployConfig, "custom") && deployConfig.requiresDocker) {
350766
- return true;
350767
- }
350768
- if ((0, deploy_1.isOfDeployType)(deployConfig, "dockerTag")) {
350769
- return true;
350770
- }
350771
- return false;
350757
+ /**
350758
+ * Weather the context requires a docker build
350759
+ */
350760
+ var requiresDockerBuild = function (_a) {
350761
+ var deploy = _a.componentConfig.deploy;
350762
+ return (0, deploy_1.isOfDeployType)(deploy, "kubernetes", "google-cloudrun", "dockerTag") || (0, deploy_1.isOfDeployType)(deploy, "custom") && deploy.requiresDocker;
350772
350763
  };
350773
350764
  exports.requiresDockerBuild = requiresDockerBuild;
350774
350765
  var getDockerBaseVariables = function () {
@@ -351902,7 +351893,7 @@ exports.readConfigSync = readConfigSync;
351902
351893
 
351903
351894
  exports.__esModule = true;
351904
351895
  exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
351905
- exports.PIPELINE_IMAGE_TAG = "main-48ef3537" || 0;
351896
+ exports.PIPELINE_IMAGE_TAG = "main-632b986b" || 0;
351906
351897
  exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
351907
351898
 
351908
351899
  /***/ }),
package/dist/config/getProjectConfig.d.ts CHANGED
@@ -16,9 +16,9 @@ export declare const getAllComponentsWithAllEnvsHierarchical: () => Promise<{
16
16
  export declare const getAllPipelineContexts: () => Promise<import("@catladder/pipeline").Context[]>;
17
17
  export declare const getEnvironment: (env: string, componentName: string) => Promise<import("@catladder/pipeline").Environment>;
18
18
  export declare const getGitlabVar: (vorpal: CommandInstance, env: string, componentName: string, variableName: string) => Promise<string>;
19
- export declare const getEnvVarsResolved: (vorpal: CommandInstance | null, env: string, componentName: string | null) => Promise<any>;
19
+ export declare const getEnvVarsResolved: (vorpal: CommandInstance | null, env: string, componentName: string | null) => Promise<Record<string, string>>;
20
20
  /**
21
21
  *
22
22
  * is used to get job only vars that should also be editable locally with catladder.
23
23
  */
24
- export declare const getJobOnlyEnvVarsResolved: (vorpal: CommandInstance, env: string, componentName: string) => Promise<any>;
24
+ export declare const getJobOnlyEnvVarsResolved: (vorpal: CommandInstance, env: string, componentName: string) => Promise<Record<string, string>>;