@catladder/cli 1.18.0 → 1.19.1

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.
@@ -90,7 +90,7 @@ var getEnvVarsToEdit = function (instance, env, componentName) { return __awaite
90
90
  });
91
91
  }); };
92
92
  var doItFor = function (instance, envAndComponents) { return __awaiter(void 0, void 0, void 0, function () {
93
- var valuesToEdit, _a, _b, hasErrors, _i, _c, _d, componentName, envs, _e, envs_1, env, usedKeys, secretEnvVarKeys, extranous, missing, shouldContinue, _f, _g, _h, componentName, envs, _j, envs_2, env, context, _k, _l;
93
+ var valuesToEdit, _a, _b, hasErrors, _i, _c, _d, componentName, envs, _e, envs_1, env, usedKeys, secretEnvVarKeys, extranous, missing, shouldContinue, _f, _g, _h, componentName, envs, _j, envs_2, env, context, _k, _l, e_1;
94
94
  var _m;
95
95
  var _o, _p;
96
96
  return __generator(this, function (_q) {
@@ -203,42 +203,49 @@ var doItFor = function (instance, envAndComponents) { return __awaiter(void 0, v
203
203
  _f = 0, _g = Object.entries(envAndComponents);
204
204
  _q.label = 13;
205
205
  case 13:
206
- if (!(_f < _g.length)) return [3 /*break*/, 22];
206
+ if (!(_f < _g.length)) return [3 /*break*/, 25];
207
207
  _h = _g[_f], componentName = _h[0], envs = _h[1];
208
208
  _j = 0, envs_2 = envs;
209
209
  _q.label = 14;
210
210
  case 14:
211
- if (!(_j < envs_2.length)) return [3 /*break*/, 21];
211
+ if (!(_j < envs_2.length)) return [3 /*break*/, 24];
212
212
  env = envs_2[_j];
213
213
  return [4 /*yield*/, (0, gitlab_1.upsertAllVariables)(instance, valuesToEdit[componentName][env], env, componentName)];
214
214
  case 15:
215
215
  _q.sent();
216
- if (!(0, passwordstore_1.hasBitwarden)()) return [3 /*break*/, 19];
217
- return [4 /*yield*/, (0, getProjectConfig_1.getPipelineContextByChoice)(env, componentName)];
216
+ if (!(0, passwordstore_1.hasBitwarden)()) return [3 /*break*/, 22];
217
+ _q.label = 16;
218
218
  case 16:
219
+ _q.trys.push([16, 21, , 22]);
220
+ return [4 /*yield*/, (0, getProjectConfig_1.getPipelineContextByChoice)(env, componentName)];
221
+ case 17:
219
222
  context = _q.sent();
220
223
  if (!(context.componentConfig.deploy &&
221
- ((_p = (_o = context.componentConfig.deploy.values) === null || _o === void 0 ? void 0 : _o.cloudsql) === null || _p === void 0 ? void 0 : _p.enabled))) return [3 /*break*/, 19];
224
+ ((_p = (_o = context.componentConfig.deploy.values) === null || _o === void 0 ? void 0 : _o.cloudsql) === null || _p === void 0 ? void 0 : _p.enabled))) return [3 /*break*/, 20];
222
225
  _k = gitlab_1.upsertAllVariables;
223
226
  _l = [instance];
224
227
  _m = {};
225
228
  return [4 /*yield*/, (0, passwordstore_1.readPass)(constants_1.GOOGLE_CLOUD_SQL_PASS_PATH)];
226
- case 17: return [4 /*yield*/, _k.apply(void 0, _l.concat([(_m.cloudsqlProxyCredentials = _q.sent(),
229
+ case 18: return [4 /*yield*/, _k.apply(void 0, _l.concat([(_m.cloudsqlProxyCredentials = _q.sent(),
227
230
  _m), env,
228
231
  componentName]))];
229
- case 18:
230
- _q.sent();
231
- _q.label = 19;
232
232
  case 19:
233
- instance.log("✅ " + env + ":" + componentName);
233
+ _q.sent();
234
234
  _q.label = 20;
235
- case 20:
235
+ case 20: return [3 /*break*/, 22];
236
+ case 21:
237
+ e_1 = _q.sent();
238
+ return [3 /*break*/, 22];
239
+ case 22:
240
+ instance.log("✅ " + env + ":" + componentName);
241
+ _q.label = 23;
242
+ case 23:
236
243
  _j++;
237
244
  return [3 /*break*/, 14];
238
- case 21:
245
+ case 24:
239
246
  _f++;
240
247
  return [3 /*break*/, 13];
241
- case 22:
248
+ case 25:
242
249
  instance.log("done! 😻");
243
250
  instance.log("");
244
251
  return [2 /*return*/];
@@ -1 +1 @@
1
- {"version":3,"file":"commandConfigSecrets.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandConfigSecrets.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAA0C;AAC1C,2CAA2C;AAC3C,iCAAoC;AAEpC,0DAA0E;AAC1E,wEAO6C;AAC7C,2DAA0D;AAC1D,mDAA8D;AAC9D,iEAAyE;AACzE,qDAAkD;AAClD,2DAAkE;AAOlE,+FAA+F;AAC/F,IAAM,WAAW,GAAG,UAAC,CAAO;IAC1B,OAAA,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,UAAC,EAAqB;YAApB,aAAa,QAAA,EAAE,IAAI,QAAA;QACzC,OAAO;YACL,aAAa;YACb,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,UAAC,EAAc;oBAAb,GAAG,QAAA,EAAE,OAAO,QAAA;gBAAM,OAAA;oBAC3C,GAAG;oBACH,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,UAAC,EAAY;4BAAX,GAAG,QAAA,EAAE,KAAK,QAAA;wBACtC,IAAI;4BACF,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;yBACjC;wBAAC,OAAO,CAAC,EAAE;4BACV,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;yBACrB;oBACH,CAAC,CAAC,CACH;iBACF;YAX4C,CAW5C,CAAC,CACH;SACF,CAAC;IACJ,CAAC,CAAC,CACH;AApBD,CAoBC,CAAC;AACJ,IAAM,gBAAgB,GAAG,UACvB,QAAyB,EACzB,GAAW,EACX,aAAqB;;;;oBAEQ,qBAAM,IAAA,iCAAc,EAAC,GAAG,EAAE,aAAa,CAAC,EAAA;;gBAA7D,gBAAgB,GAAK,CAAA,SAAwC,CAAA,iBAA7C;gBAEL,qBAAM,IAAA,6BAAU,EAAC,QAAQ,EAAE,GAAG,EAAE,aAAa,CAAC,EAAA;;gBAA3D,UAAU,GAAG,SAA8C;gBACjE,sBAAO,MAAM,CAAC,WAAW,CACvB,gBAAgB,CAAC,GAAG,CAAC,UAAC,GAAG,IAAK,OAAA,CAAC,GAAG,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,EAAtB,CAAsB,CAAC,CACtD,EAAC;;;KACH,CAAC;AACF,IAAM,OAAO,GAAG,UACd,QAAyB,EACzB,gBAEC;;;;;;;gBAEwB,KAAA,CAAA,KAAA,MAAM,CAAA,CAAC,WAAW,CAAA;gBACzC,qBAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,GAAG,CAAC,UAAO,EAAqB;4BAApB,aAAa,QAAA,EAAE,IAAI,QAAA;;;;;;8CAC9D,aAAa;wCACb,KAAA,CAAA,KAAA,MAAM,CAAA,CAAC,WAAW,CAAA;wCAChB,qBAAM,OAAO,CAAC,GAAG,CACf,IAAI,CAAC,GAAG,CAAC,UAAO,GAAG;;;;;kEACjB,GAAG;4DACH,qBAAM,gBAAgB,CAAC,QAAQ,EAAE,GAAG,EAAE,aAAa,CAAC,EAAA;gEAF9B;gEAEtB,SAAoD;gEACrD;;;iDAAA,CAAC,CACH,EAAA;4CARiE;4CAEpE,cACE,SAKC,EACF;4CACF;;;;qBAAA,CAAC,CACH,EAAA;;gBAbC,YAAY,GAAS,cACvB,SAYC,EACF;gBACG,SAAS,GAAG,IAAI,CAAC;;;qBACd,SAAS;gBACC,qBAAM,IAAA,uBAAU,EAC7B,WAAW,CAAC,YAAY,CAAC,MACzB,0BAAY,4IAAA,wDAGR,EAIW,cAEZ,KANC,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC;yBAC/B,GAAG,CACF,UAAC,EAAqB;4BAApB,aAAa,QAAA,EAAE,IAAI,QAAA;wBAAM,OAAA,YAAK,aAAa,eAAK,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAE;oBAAxC,CAAwC,CACpE;yBACA,IAAI,CAAC,IAAI,CAAC,EAGhB,EAAA;;gBAZD,YAAY,GAAG,SAYd,CAAC;gBACF,mBAAmB;gBACnB,SAAS,GAAG,KAAK,CAAC;sBACkD,EAAhC,KAAA,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC;;;qBAAhC,CAAA,cAAgC,CAAA;gBAAzD,WAAqB,EAApB,aAAa,QAAA,EAAE,IAAI,QAAA;sBACP,EAAJ,aAAI;;;qBAAJ,CAAA,kBAAI,CAAA;gBAAX,GAAG;gBACN,QAAQ,GAAG,YAAY,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC;oBAC/C,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,CAAC;oBAC/C,CAAC,CAAC,EAAE,CAAC;gBAEsB,qBAAM,IAAA,iCAAc,EAAC,GAAG,EAAE,aAAa,CAAC,EAAA;;gBAA7D,gBAAgB,GAAK,CAAA,SAAwC,CAAA,iBAA7C;gBAClB,SAAS,GAAG,IAAA,mBAAU,EAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;gBACnD,OAAO,GAAG,IAAA,mBAAU,EAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;qBAEnD,CAAA,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,CAAA,EAA1C,wBAA0C;gBAC5C,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACjB,QAAQ,CAAC,GAAG,CACV,8DAA4C,aAAa,OAAG,CAC7D,CAAC;gBACF,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACjB,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;oBACxB,QAAQ,CAAC,GAAG,CAAC,8CAA8C,CAAC,CAAC;oBAC7D,SAAS,CAAC,OAAO,CAAC,UAAC,GAAG,IAAK,OAAA,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,EAAjB,CAAiB,CAAC,CAAC;oBAC9C,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;iBAClB;gBACD,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;oBACtB,QAAQ,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;oBACtD,OAAO,CAAC,OAAO,CAAC,UAAC,GAAG,IAAK,OAAA,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,EAAjB,CAAiB,CAAC,CAAC;oBAC5C,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;iBAClB;gBAED,qBAAM,IAAA,eAAK,EAAC,IAAI,CAAC,EAAA;;gBAAjB,SAAiB,CAAC;gBACS,qBAAM,QAAQ,CAAC,MAAM,CAAC;wBAC/C,SAAO,EAAE,IAAI;wBACb,OAAO,EAAE,eAAe;wBACxB,IAAI,EAAE,gBAAgB;wBACtB,IAAI,EAAE,SAAS;qBAChB,CAAC,EAAA;;gBALM,cAAc,GAAK,CAAA,SAKzB,CAAA,eALoB;gBAOtB,IAAI,CAAC,cAAc,EAAE;oBACnB,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;iBAC1B;gBACD,SAAS,GAAG,IAAI,CAAC;;;gBArCH,IAAI,CAAA;;;gBADY,IAAgC,CAAA;;;;gBA2CtE,QAAQ,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC;gBACxD,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;sBACmD,EAAhC,KAAA,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC;;;qBAAhC,CAAA,cAAgC,CAAA;gBAAzD,WAAqB,EAApB,aAAa,QAAA,EAAE,IAAI,QAAA;sBACP,EAAJ,aAAI;;;qBAAJ,CAAA,kBAAI,CAAA;gBAAX,GAAG;gBACZ,qBAAM,IAAA,2BAAkB,EACtB,QAAQ,EACR,YAAY,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,EAChC,GAAG,EACH,aAAa,CACd,EAAA;;gBALD,SAKC,CAAC;qBAEE,IAAA,4BAAY,GAAE,EAAd,yBAAc;gBAIA,qBAAM,IAAA,6CAA0B,EAAC,GAAG,EAAE,aAAa,CAAC,EAAA;;gBAA9D,OAAO,GAAG,SAAoD;qBAElE,CAAA,OAAO,CAAC,eAAe,CAAC,MAAM;qBAC9B,MAAA,MAAA,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,0CAAE,QAAQ,0CAAE,OAAO,CAAA,CAAA,EADxD,yBACwD;gBAElD,KAAA,2BAAkB,CAAA;sBACtB,QAAQ;;gBAEoB,qBAAM,IAAA,wBAAQ,EACtC,sCAA0B,CAC3B,EAAA;qBALL,qBAAM,6BAGF,2BAAwB,GAAE,SAEzB;6BAEH,GAAG;oBACH,aAAa,GACd,EAAA;;gBATD,SASC,CAAC;;;gBAGN,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,GAAG,GAAG,GAAG,GAAG,aAAa,CAAC,CAAC;;;gBA7B/B,IAAI,CAAA;;;gBADY,IAAgC,CAAA;;;gBAiCpE,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBACzB,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;;;;KAClB,CAAC;AAEK,IAAM,oBAAoB,GAAG,UAClC,MAAuB,EACvB,YAAqB;;;;;;qBAEjB,CAAC,YAAY,EAAb,wBAAa;gBACa,qBAAM,IAAA,0DAAuC,GAAE,EAAA;;gBAArE,mBAAmB,GAAG,SAA+C;gBAC3E,qBAAM,OAAO,CAAC,MAAM,EAAE,mBAAmB,CAAC,EAAA;;gBAA1C,SAA0C,CAAC;;;gBAErC,KAAyB,IAAA,8BAAW,EAAC,YAAY,CAAC,EAAhD,cAAG,EAAE,aAAa,mBAAA,CAA+B;qBAGrD,CAAC,aAAa,EAAd,wBAAc;gBACG,qBAAM,IAAA,uCAAoB,GAAE,EAAA;;gBAAzC,UAAU,GAAG,SAA4B;gBAC/C,qBAAM,OAAO,CACX,MAAM,EACN,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,EAAE,CAAC,KAAG,CAAC,CAAC,EAAV,CAAU,CAAC,CAAC,CACtD,EAAA;;gBAHD,SAGC,CAAC;;;qBAEA,aAAa,EAAb,wBAAa;gBACf,qBAAM,OAAO,CAAC,MAAM;wBAClB,GAAC,aAAa,IAAG,CAAC,KAAG,CAAC;4BACtB,EAAA;;gBAFF,SAEE,CAAC;;;;;KAGR,CAAC;AAxBW,QAAA,oBAAoB,wBAwB/B;AAEF,sBAAe,UAAO,MAAc;;;;;gBAClC,KAAA,CAAA,KAAA,MAAM;qBACH,OAAO,CACN,uCAAuC,EACvC,qCAAqC,CACtC,CAAA;qBACA,YAAY,CAAA;gBAAC,qBAAM,IAAA,yCAAuB,GAAE,EAAA;;gBAL/C,cAKgB,SAA+B,EAAC;qBAC7C,MAAM,CAAC,UAAgB,EAAgB;wBAAd,YAAY,kBAAA;;;;wCAC7B,qBAAM,IAAA,4BAAoB,EAAC,IAAI,EAAE,YAAY,CAAC,EAAA;wCAArD,sBAAO,SAA8C,EAAC;;;;iBACvD,CAAC,CAAC;;;;KACN,EAAC"}
1
+ {"version":3,"file":"commandConfigSecrets.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandConfigSecrets.ts"],"names":[],"mappings":"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"}
@@ -63,10 +63,8 @@ var commandOpenGrafana_1 = __importDefault(require("./commandOpenGrafana"));
63
63
  var commandPortForward_1 = __importDefault(require("./commandPortForward"));
64
64
  var commandTriggerCronjob_1 = __importDefault(require("./commandTriggerCronjob"));
65
65
  var commandOpenGrafanaPod_1 = __importDefault(require("./commandOpenGrafanaPod"));
66
- var commandReloadConfig_1 = __importDefault(require("./commandReloadConfig"));
67
66
  exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
68
67
  return __generator(this, function (_a) {
69
- (0, commandReloadConfig_1["default"])(vorpal);
70
68
  (0, commandSetup_1["default"])(vorpal);
71
69
  (0, commandEnvVars_1["default"])(vorpal);
72
70
  (0, commandNamespace_1["default"])(vorpal);
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gFAA0D;AAC1D,gFAA0D;AAC1D,kEAA4C;AAC5C,0EAAoD;AACpD,gFAA0D;AAC1D,oEAA8C;AAC9C,0FAAoE;AACpE,sEAAgD;AAChD,sEAAgD;AAChD,gEAA0C;AAC1C,4DAA4D;AAC5D,sEAAgD;AAChD,8EAAwD;AACxD,wEAAkD;AAClD,wFAAkE;AAClE,gFAA0D;AAC1D,oEAA8C;AAC9C,oEAA8C;AAC9C,sEAAgD;AAChD,8EAAwD;AACxD,4EAAsD;AACtD,4EAAsD;AACtD,kFAA4D;AAE5D,kFAA4D;AAC5D,8EAAwD;AAExD,sBAAe,UAAO,MAAc;;QAClC,IAAA,gCAAmB,EAAC,MAAM,CAAC,CAAC;QAC5B,IAAA,yBAAY,EAAC,MAAM,CAAC,CAAC;QAErB,IAAA,2BAAc,EAAC,MAAM,CAAC,CAAC;QAEvB,IAAA,6BAAgB,EAAC,MAAM,CAAC,CAAC;QACzB,IAAA,4BAAe,EAAC,MAAM,CAAC,CAAC;QACxB,IAAA,gCAAmB,EAAC,MAAM,CAAC,CAAC;QAC5B,IAAA,iCAAoB,EAAC,MAAM,CAAC,CAAC;QAE7B,IAAA,iCAAoB,EAAC,MAAM,CAAC,CAAC;QAE7B,IAAA,4BAAe,EAAC,MAAM,CAAC,CAAC;QAExB,IAAA,qCAAwB,EAAC,MAAM,CAAC,CAAC;QAEjC,IAAA,+BAAkB,EAAC,MAAM,CAAC,CAAC;QAC3B,IAAA,kCAAqB,EAAC,MAAM,CAAC,CAAC;QAC9B,IAAA,iCAAoB,EAAC,MAAM,CAAC,CAAC;QAC7B,IAAA,2BAAc,EAAC,MAAM,CAAC,CAAC;QACvB,IAAA,2BAAc,EAAC,MAAM,CAAC,CAAC;QACvB,IAAA,kCAAqB,EAAC,MAAM,CAAC,CAAC;QAC9B,IAAA,iCAAoB,EAAC,MAAM,CAAC,CAAC;QAC7B,IAAA,8BAAiB,EAAC,MAAM,CAAC,CAAC;QAC1B,IAAA,0BAAa,EAAC,MAAM,CAAC,CAAC;QAEtB,IAAA,4BAAe,EAAC,MAAM,CAAC,CAAC;QACxB,IAAA,+BAAkB,EAAC,MAAM,CAAC,CAAC;QAE3B,IAAA,4BAAe,EAAC,MAAM,CAAC,CAAC;QAExB,IAAA,sCAAyB,EAAC,MAAM,CAAC,CAAC;QAClC,IAAA,gCAAmB,EAAC,MAAM,CAAC,CAAC;;;KAC7B,EAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gFAA0D;AAC1D,gFAA0D;AAC1D,kEAA4C;AAC5C,0EAAoD;AACpD,gFAA0D;AAC1D,oEAA8C;AAC9C,0FAAoE;AACpE,sEAAgD;AAChD,sEAAgD;AAChD,gEAA0C;AAC1C,4DAA4D;AAC5D,sEAAgD;AAChD,8EAAwD;AACxD,wEAAkD;AAClD,wFAAkE;AAClE,gFAA0D;AAC1D,oEAA8C;AAC9C,oEAA8C;AAC9C,sEAAgD;AAChD,8EAAwD;AACxD,4EAAsD;AACtD,4EAAsD;AACtD,kFAA4D;AAE5D,kFAA4D;AAE5D,sBAAe,UAAO,MAAc;;QAClC,IAAA,yBAAY,EAAC,MAAM,CAAC,CAAC;QAErB,IAAA,2BAAc,EAAC,MAAM,CAAC,CAAC;QAEvB,IAAA,6BAAgB,EAAC,MAAM,CAAC,CAAC;QACzB,IAAA,4BAAe,EAAC,MAAM,CAAC,CAAC;QACxB,IAAA,gCAAmB,EAAC,MAAM,CAAC,CAAC;QAC5B,IAAA,iCAAoB,EAAC,MAAM,CAAC,CAAC;QAE7B,IAAA,iCAAoB,EAAC,MAAM,CAAC,CAAC;QAE7B,IAAA,4BAAe,EAAC,MAAM,CAAC,CAAC;QAExB,IAAA,qCAAwB,EAAC,MAAM,CAAC,CAAC;QAEjC,IAAA,+BAAkB,EAAC,MAAM,CAAC,CAAC;QAC3B,IAAA,kCAAqB,EAAC,MAAM,CAAC,CAAC;QAC9B,IAAA,iCAAoB,EAAC,MAAM,CAAC,CAAC;QAC7B,IAAA,2BAAc,EAAC,MAAM,CAAC,CAAC;QACvB,IAAA,2BAAc,EAAC,MAAM,CAAC,CAAC;QACvB,IAAA,kCAAqB,EAAC,MAAM,CAAC,CAAC;QAC9B,IAAA,iCAAoB,EAAC,MAAM,CAAC,CAAC;QAC7B,IAAA,8BAAiB,EAAC,MAAM,CAAC,CAAC;QAC1B,IAAA,0BAAa,EAAC,MAAM,CAAC,CAAC;QAEtB,IAAA,4BAAe,EAAC,MAAM,CAAC,CAAC;QACxB,IAAA,+BAAkB,EAAC,MAAM,CAAC,CAAC;QAE3B,IAAA,4BAAe,EAAC,MAAM,CAAC,CAAC;QAExB,IAAA,sCAAyB,EAAC,MAAM,CAAC,CAAC;QAClC,IAAA,gCAAmB,EAAC,MAAM,CAAC,CAAC;;;KAC7B,EAAC"}
@@ -41,7 +41,6 @@ var child_process_promise_1 = require("child-process-promise");
41
41
  var fs_extra_1 = require("fs-extra");
42
42
  var js_yaml_1 = require("js-yaml");
43
43
  var prettier_1 = require("prettier");
44
- var getProjectConfig_1 = require("../../../config/getProjectConfig");
45
44
  var projects_1 = require("../../../utils/projects");
46
45
  var writeConfig = function (vorpal, config, options) { return __awaiter(void 0, void 0, void 0, function () {
47
46
  var gitRoot, TS, configType, file, content, file, content;
@@ -96,9 +95,7 @@ var writeConfig = function (vorpal, config, options) { return __awaiter(void 0,
96
95
  case 8:
97
96
  _a.sent();
98
97
  _a.label = 9;
99
- case 9: return [4 /*yield*/, (0, getProjectConfig_1.reloadConfig)()];
100
- case 10:
101
- _a.sent();
98
+ case 9:
102
99
  vorpal.log("done!");
103
100
  vorpal.log("");
104
101
  return [2 /*return*/];
@@ -1 +1 @@
1
- {"version":3,"file":"writeConfig.js","sourceRoot":"","sources":["../../../../src/apps/cli/config/writeConfig.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+DAAoD;AACpD,qCAAqC;AACrC,mCAA+B;AAC/B,qCAAkC;AAElC,qEAAgE;AAChE,oDAAqD;AAE9C,IAAM,WAAW,GAAG,UACzB,MAAuB,EACvB,MAAc,EACd,OAEC;;;;oBAEe,qBAAM,IAAA,qBAAU,GAAE,EAAA;;gBAA5B,OAAO,GAAG,SAAkB;gBAC5B,EAAE,GAAG,0BAA0B,CAAC;gBACf,qBAAM,MAAM,CAAC,MAAM,CAAC;wBACzC,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,YAAY;wBAClB,OAAO,EAAE,CAAC,EAAE,EAAE,MAAM,CAAC;wBACrB,OAAO,EAAE,4CAA4C;qBACtD,CAAC,EAAA;;gBALM,UAAU,GAAK,CAAA,SAKrB,CAAA,WALgB;gBAMlB,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;qBACX,CAAA,UAAU,KAAK,EAAE,CAAA,EAAjB,wBAAiB;gBACb,IAAI,GAAG,OAAO,GAAG,eAAe,CAAC;gBACjC,OAAO,GAAG,IAAA,iBAAM,EACpB,6GAGyB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,+DAK7C,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,EAAC,CAAC,CAAC,YAAK,OAAO,CAAC,UAAU,OAAI,CAAC,CAAC,CAAC,EAAE,qBAEvD,EACD;oBACE,MAAM,EAAE,OAAO;iBAChB,CACF,CAAC;gBAEF,qBAAM,IAAA,oBAAS,EAAC,IAAI,EAAE,OAAO,EAAE;wBAC7B,QAAQ,EAAE,OAAO;qBAClB,CAAC,EAAA;;gBAFF,SAEE,CAAC;gBACH,MAAM,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;gBAClD,qBAAM,IAAA,6BAAK,EAAC,oDAAoD,EAAE;wBAChE,KAAK,EAAE,IAAI;qBACZ,CAAC,EAAA;;gBAFF,SAEE,CAAC;gBACH,qBAAM,IAAA,4BAAI,EAAC,UAAU,GAAG,IAAI,CAAC,EAAA;;gBAA7B,SAA6B,CAAC;;;gBAExB,IAAI,GAAG,OAAO,GAAG,gBAAgB,CAAC;gBAClC,OAAO,GAAG,IAAA,cAAI,EAAC,MAAM,CAAC,CAAC;gBAE7B,qBAAM,IAAA,oBAAS,EACb,IAAI,EACJ,OAAO;wBACL,MAAM;wBACN,CAAC,OAAO,CAAC,UAAU;4BACjB,CAAC,CAAC,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;4BACpD,CAAC,CAAC,EAAE,CAAC,EACT;wBACE,QAAQ,EAAE,OAAO;qBAClB,CACF,EAAA;;gBAVD,SAUC,CAAC;gBACF,qBAAM,IAAA,4BAAI,EAAC,UAAU,GAAG,IAAI,CAAC,EAAA;;gBAA7B,SAA6B,CAAC;;oBAEhC,qBAAM,IAAA,+BAAY,GAAE,EAAA;;gBAApB,SAAoB,CAAC;gBACrB,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBACpB,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;;;;KAChB,CAAC;AA/DW,QAAA,WAAW,eA+DtB"}
1
+ {"version":3,"file":"writeConfig.js","sourceRoot":"","sources":["../../../../src/apps/cli/config/writeConfig.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+DAAoD;AACpD,qCAAqC;AACrC,mCAA+B;AAC/B,qCAAkC;AAElC,oDAAqD;AAE9C,IAAM,WAAW,GAAG,UACzB,MAAuB,EACvB,MAAc,EACd,OAEC;;;;oBAEe,qBAAM,IAAA,qBAAU,GAAE,EAAA;;gBAA5B,OAAO,GAAG,SAAkB;gBAC5B,EAAE,GAAG,0BAA0B,CAAC;gBACf,qBAAM,MAAM,CAAC,MAAM,CAAC;wBACzC,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,YAAY;wBAClB,OAAO,EAAE,CAAC,EAAE,EAAE,MAAM,CAAC;wBACrB,OAAO,EAAE,4CAA4C;qBACtD,CAAC,EAAA;;gBALM,UAAU,GAAK,CAAA,SAKrB,CAAA,WALgB;gBAMlB,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;qBACX,CAAA,UAAU,KAAK,EAAE,CAAA,EAAjB,wBAAiB;gBACb,IAAI,GAAG,OAAO,GAAG,eAAe,CAAC;gBACjC,OAAO,GAAG,IAAA,iBAAM,EACpB,6GAGyB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,+DAK7C,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,EAAC,CAAC,CAAC,YAAK,OAAO,CAAC,UAAU,OAAI,CAAC,CAAC,CAAC,EAAE,qBAEvD,EACD;oBACE,MAAM,EAAE,OAAO;iBAChB,CACF,CAAC;gBAEF,qBAAM,IAAA,oBAAS,EAAC,IAAI,EAAE,OAAO,EAAE;wBAC7B,QAAQ,EAAE,OAAO;qBAClB,CAAC,EAAA;;gBAFF,SAEE,CAAC;gBACH,MAAM,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;gBAClD,qBAAM,IAAA,6BAAK,EAAC,oDAAoD,EAAE;wBAChE,KAAK,EAAE,IAAI;qBACZ,CAAC,EAAA;;gBAFF,SAEE,CAAC;gBACH,qBAAM,IAAA,4BAAI,EAAC,UAAU,GAAG,IAAI,CAAC,EAAA;;gBAA7B,SAA6B,CAAC;;;gBAExB,IAAI,GAAG,OAAO,GAAG,gBAAgB,CAAC;gBAClC,OAAO,GAAG,IAAA,cAAI,EAAC,MAAM,CAAC,CAAC;gBAE7B,qBAAM,IAAA,oBAAS,EACb,IAAI,EACJ,OAAO;wBACL,MAAM;wBACN,CAAC,OAAO,CAAC,UAAU;4BACjB,CAAC,CAAC,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;4BACpD,CAAC,CAAC,EAAE,CAAC,EACT;wBACE,QAAQ,EAAE,OAAO;qBAClB,CACF,EAAA;;gBAVD,SAUC,CAAC;gBACF,qBAAM,IAAA,4BAAI,EAAC,UAAU,GAAG,IAAI,CAAC,EAAA;;gBAA7B,SAA6B,CAAC;;;gBAEhC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBACpB,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;;;;KAChB,CAAC;AA9DW,QAAA,WAAW,eA8DtB"}
package/dist/catenv.js CHANGED
@@ -6,5 +6,8 @@ exports.__esModule = true;
6
6
  var catenv_1 = __importDefault(require("./apps/catenv/catenv"));
7
7
  var zx_1 = require("zx");
8
8
  zx_1.$.verbose = false;
9
- (0, catenv_1["default"])();
9
+ (0, catenv_1["default"])().then(function () {
10
+ // we have to exit manually, because we have some file watches
11
+ process.exit();
12
+ });
10
13
  //# sourceMappingURL=catenv.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"catenv.js","sourceRoot":"","sources":["../src/catenv.ts"],"names":[],"mappings":";;;;;AAAA,gEAA0C;AAC1C,yBAAuB;AACvB,MAAC,CAAC,OAAO,GAAG,KAAK,CAAC;AAClB,IAAA,mBAAM,GAAE,CAAC"}
1
+ {"version":3,"file":"catenv.js","sourceRoot":"","sources":["../src/catenv.ts"],"names":[],"mappings":";;;;;AAAA,gEAA0C;AAC1C,yBAAuB;AACvB,MAAC,CAAC,OAAO,GAAG,KAAK,CAAC;AAClB,IAAA,mBAAM,GAAE,CAAC,IAAI,CAAC;IACZ,8DAA8D;IAC9D,OAAO,CAAC,IAAI,EAAE,CAAC;AACjB,CAAC,CAAC,CAAC"}
@@ -1,7 +1,6 @@
1
+ import { Config } from "@catladder/pipeline";
1
2
  import { CommandInstance } from "vorpal";
2
- import memoizee from "memoizee";
3
- export declare const getProjectConfig: (() => Promise<import("@catladder/pipeline").Config>) & memoizee.Memoized<() => Promise<import("@catladder/pipeline").Config>>;
4
- export declare const reloadConfig: () => Promise<import("@catladder/pipeline").Config>;
3
+ export declare const getProjectConfig: () => Promise<Config>;
5
4
  export declare const getGitlabCiFilePath: () => Promise<string>;
6
5
  export declare const getGitlabCi: <T = Record<string, any>>() => Promise<T>;
7
6
  export declare const getProjectComponents: () => Promise<string[]>;
@@ -35,37 +35,53 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
35
35
  if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
36
36
  }
37
37
  };
38
- var __importDefault = (this && this.__importDefault) || function (mod) {
39
- return (mod && mod.__esModule) ? mod : { "default": mod };
40
- };
41
38
  exports.__esModule = true;
42
- exports.getEnvVars = exports.getGitlabVar = exports.getEnvironment = exports.getAllPipelineContexts = exports.getAllComponentsWithAllEnvsHierarchical = exports.getAllComponentsWithAllEnvsFlat = exports.getPipelineContextByChoice = exports.parseChoice = exports.getProjectComponents = exports.getGitlabCi = exports.getGitlabCiFilePath = exports.reloadConfig = exports.getProjectConfig = void 0;
39
+ exports.getEnvVars = exports.getGitlabVar = exports.getEnvironment = exports.getAllPipelineContexts = exports.getAllComponentsWithAllEnvsHierarchical = exports.getAllComponentsWithAllEnvsFlat = exports.getPipelineContextByChoice = exports.parseChoice = exports.getProjectComponents = exports.getGitlabCi = exports.getGitlabCiFilePath = exports.getProjectConfig = void 0;
43
40
  var pipeline_1 = require("@catladder/pipeline");
44
41
  var gitlab_1 = require("../utils/gitlab");
45
- var memoizee_1 = __importDefault(require("memoizee"));
46
42
  var projects_1 = require("../utils/projects");
47
43
  var files_1 = require("../utils/files");
48
- // currently cant change
49
- exports.getProjectConfig = (0, memoizee_1["default"])(function () { return __awaiter(void 0, void 0, void 0, function () {
50
- var gitRoot, e_1;
44
+ var fs_1 = require("fs");
45
+ var currentConfig = null;
46
+ // reload the config on change
47
+ var reloadConfigAndObserve = function () { return __awaiter(void 0, void 0, void 0, function () {
48
+ var gitRoot, result, config, path, watcher;
51
49
  return __generator(this, function (_a) {
52
50
  switch (_a.label) {
53
- case 0:
54
- _a.trys.push([0, 2, , 3]);
55
- return [4 /*yield*/, (0, projects_1.getGitRoot)()];
51
+ case 0: return [4 /*yield*/, (0, projects_1.getGitRoot)()];
56
52
  case 1:
57
53
  gitRoot = _a.sent();
58
- return [2 /*return*/, (0, pipeline_1.readConfigSync)(gitRoot)];
59
- case 2:
60
- e_1 = _a.sent();
61
- // ignore
62
- return [2 /*return*/, null];
63
- case 3: return [2 /*return*/];
54
+ result = (0, pipeline_1.readConfigSync)(gitRoot);
55
+ if (!result) {
56
+ // can't do anything, there is no config
57
+ return [2 /*return*/];
58
+ }
59
+ config = result.config, path = result.path;
60
+ watcher = (0, fs_1.watch)(path, function () {
61
+ watcher.close();
62
+ reloadConfigAndObserve();
63
+ });
64
+ currentConfig = config;
65
+ return [2 /*return*/];
64
66
  }
65
67
  });
66
- }); }, { promise: true });
67
- var reloadConfig = function () { return exports.getProjectConfig.clear(); };
68
- exports.reloadConfig = reloadConfig;
68
+ }); };
69
+ var getProjectConfig = function () { return __awaiter(void 0, void 0, void 0, function () {
70
+ return __generator(this, function (_a) {
71
+ switch (_a.label) {
72
+ case 0:
73
+ if (!!currentConfig) return [3 /*break*/, 2];
74
+ // initially
75
+ return [4 /*yield*/, reloadConfigAndObserve()];
76
+ case 1:
77
+ // initially
78
+ _a.sent();
79
+ _a.label = 2;
80
+ case 2: return [2 /*return*/, currentConfig];
81
+ }
82
+ });
83
+ }); };
84
+ exports.getProjectConfig = getProjectConfig;
69
85
  var getGitlabCiFilePath = function () { return __awaiter(void 0, void 0, void 0, function () {
70
86
  var gitRoot;
71
87
  return __generator(this, function (_a) {
@@ -79,7 +95,7 @@ var getGitlabCiFilePath = function () { return __awaiter(void 0, void 0, void 0,
79
95
  }); };
80
96
  exports.getGitlabCiFilePath = getGitlabCiFilePath;
81
97
  var getGitlabCi = function () { return __awaiter(void 0, void 0, void 0, function () {
82
- var _a, e_2;
98
+ var _a, e_1;
83
99
  return __generator(this, function (_b) {
84
100
  switch (_b.label) {
85
101
  case 0:
@@ -88,7 +104,7 @@ var getGitlabCi = function () { return __awaiter(void 0, void 0, void 0, functio
88
104
  return [4 /*yield*/, (0, exports.getGitlabCiFilePath)()];
89
105
  case 1: return [2 /*return*/, _a.apply(void 0, [_b.sent()])];
90
106
  case 2:
91
- e_2 = _b.sent();
107
+ e_1 = _b.sent();
92
108
  // ignore
93
109
  return [2 /*return*/, null];
94
110
  case 3: return [2 /*return*/];
@@ -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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAO6B;AAG7B,0CAA6E;AAE7E,8CAA+C;AAC/C,wCAA0C;AAC1C,yBAA2B;AAE3B,IAAI,aAAa,GAAW,IAAI,CAAC;AAEjC,8BAA8B;AAC9B,IAAM,sBAAsB,GAAG;;;;oBACb,qBAAM,IAAA,qBAAU,GAAE,EAAA;;gBAA5B,OAAO,GAAG,SAAkB;gBAC5B,MAAM,GAAG,IAAA,yBAAc,EAAC,OAAO,CAAC,CAAC;gBACvC,IAAI,CAAC,MAAM,EAAE;oBACX,wCAAwC;oBACxC,sBAAO;iBACR;gBACO,MAAM,GAAW,MAAM,OAAjB,EAAE,IAAI,GAAK,MAAM,KAAX,CAAY;gBAC1B,OAAO,GAAG,IAAA,UAAK,EAAC,IAAI,EAAE;oBAC1B,OAAO,CAAC,KAAK,EAAE,CAAC;oBAChB,sBAAsB,EAAE,CAAC;gBAC3B,CAAC,CAAC,CAAC;gBACH,aAAa,GAAG,MAAM,CAAC;;;;KACxB,CAAC;AAEK,IAAM,gBAAgB,GAAG;;;;qBAC1B,CAAC,aAAa,EAAd,wBAAc;gBAChB,YAAY;gBACZ,qBAAM,sBAAsB,EAAE,EAAA;;gBAD9B,YAAY;gBACZ,SAA8B,CAAC;;oBAEjC,sBAAO,aAAa,EAAC;;;KACtB,CAAC;AANW,QAAA,gBAAgB,oBAM3B;AAEK,IAAM,mBAAmB,GAAG;;;;oBACjB,qBAAM,IAAA,qBAAU,GAAE,EAAA;;gBAA5B,OAAO,GAAG,SAAkB;gBAClC,sBAAO,OAAO,GAAG,iBAAiB,EAAC;;;KACpC,CAAC;AAHW,QAAA,mBAAmB,uBAG9B;AACK,IAAM,WAAW,GAAG;;;;;;gBAEhB,KAAA,gBAAQ,CAAA;gBAAC,qBAAM,IAAA,2BAAmB,GAAE,EAAA;oBAA3C,sBAAO,kBAAS,SAA2B,EAAe,EAAC;;;gBAE3D,SAAS;gBACT,sBAAO,IAAI,EAAC;;;;KAEf,CAAC;AAPW,QAAA,WAAW,eAOtB;AAEK,IAAM,oBAAoB,GAAG;;;;oBACnB,qBAAM,IAAA,wBAAgB,GAAE,EAAA;;gBAAjC,MAAM,GAAG,SAAwB;gBACvC,IAAI,CAAC,MAAM;oBAAE,sBAAO,EAAE,EAAC;gBACvB,sBAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAC;;;KACvC,CAAC;AAJW,QAAA,oBAAoB,wBAI/B;AAEK,IAAM,WAAW,GAAG,UAAC,YAAoB;IACxC,IAAA,KAAuB,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,EAA7C,GAAG,QAAA,EAAE,aAAa,QAA2B,CAAC;IACrD,OAAO,EAAE,GAAG,KAAA,EAAE,aAAa,eAAA,EAAE,CAAC;AAChC,CAAC,CAAC;AAHW,QAAA,WAAW,eAGtB;AAEK,IAAM,0BAA0B,GAAG,UACxC,GAAW,EACX,aAAqB;;;;oBAEN,qBAAM,IAAA,wBAAgB,GAAE,EAAA;;gBAAjC,MAAM,GAAG,SAAwB;gBACvC,sBAAO,IAAA,wBAAa,EAAC,MAAM,EAAE,aAAa,EAAE,GAAG,CAAC,EAAC;;;KAClD,CAAC;AANW,QAAA,0BAA0B,8BAMrC;AACK,IAAM,+BAA+B,GAAG;;;;oBAG9B,qBAAM,IAAA,wBAAgB,GAAE,EAAA;;gBAAjC,MAAM,GAAG,SAAwB;gBACvC,IAAI,CAAC,MAAM,EAAE;oBACX,sBAAO,EAAE,EAAC;iBACX;gBACD,sBAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,UAAC,aAAa;wBAC1D,OAAA,IAAA,qBAAU,EAAC,MAAM,EAAE,aAAa,CAAC,CAAC,GAAG,CAAC,UAAC,GAAG,IAAK,OAAA,CAAC,EAAE,GAAG,KAAA,EAAE,aAAa,eAAA,EAAE,CAAC,EAAxB,CAAwB,CAAC;oBAAxE,CAAwE,CACzE,EAAC;;;KACH,CAAC;AAVW,QAAA,+BAA+B,mCAU1C;AAEK,IAAM,uCAAuC,GAAG;;;;oBAGtC,qBAAM,IAAA,wBAAgB,GAAE,EAAA;;gBAAjC,MAAM,GAAG,SAAwB;gBACvC,IAAI,CAAC,MAAM,EAAE;oBACX,sBAAO,EAAE,EAAC;iBACX;gBAED,sBAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,UAAC,aAAa,IAAK,OAAA;wBACpD,aAAa;wBACb,IAAA,qBAAU,EAAC,MAAM,EAAE,aAAa,CAAC;qBAClC,EAHqD,CAGrD,CAAC,CACH,EAAC;;;KACH,CAAC;AAdW,QAAA,uCAAuC,2CAclD;AAEK,IAAM,sBAAsB,GAAG;;;;;gBAC7B,KAAA,CAAA,KAAA,OAAO,CAAA,CAAC,GAAG,CAAA;gBACf,qBAAM,IAAA,uCAA+B,GAAE,EAAA;oBAD1C,sBAAO,cACL,CAAC,SAAuC,CAAC;yBACtC,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,GAAG,KAAK,OAAO,EAAjB,CAAiB,CAAC;yBAChC,GAAG,CAAC,UAAC,EAAsB;4BAApB,GAAG,SAAA,EAAE,aAAa,mBAAA;wBACxB,OAAA,IAAA,kCAA0B,EAAC,GAAG,EAAE,aAAa,CAAC;oBAA9C,CAA8C,CAC/C,EACJ,EAAC;;;KACH,CAAC;AARW,QAAA,sBAAsB,0BAQjC;AAEK,IAAM,cAAc,GAAG,UAAO,GAAW,EAAE,aAAqB;;;;oBACtD,qBAAM,IAAA,wBAAgB,GAAE,EAAA;;gBAAjC,MAAM,GAAG,SAAwB;gBAEvC,sBAAO,IAAA,yBAAe,EAAC,MAAM,EAAE,aAAa,EAAE,GAAG,CAAC,EAAC;;;KACpD,CAAC;AAJW,QAAA,cAAc,kBAIzB;AAEK,IAAM,YAAY,GAAG,UAC1B,MAAuB,EACvB,GAAW,EACX,aAAqB,EACrB,YAAoB;;;;;gBAEd,eAAe,GAAG,IAAA,2BAAgB,EAAC,GAAG,EAAE,aAAa,EAAE,YAAY,CAAC,CAAC;gBACpE,qBAAM,IAAA,kCAAyB,EAAC,MAAM,EAAE,eAAe,CAAC,EAAA;oBAA/D,sBAAO,SAAwD,EAAC;;;KACjE,CAAC;AARW,QAAA,YAAY,gBAQvB;AAEF,IAAM,cAAc,GAAG,UACrB,MAAuB,EACvB,UAAkC;;;;oBAEL,qBAAM,IAAA,wBAAe,EAAC,MAAM,CAAC,EAAA;;gBAApD,oBAAoB,GAAG,SAA6B;gBAE1D,sBAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,UAAC,EAAY;;4BAAX,GAAG,QAAA,EAAE,KAAK,QAAA;wBACzC,IAAM,cAAc,GAAG,MAAA,MAAA,MAAM,CAAC,KAAK,CAAC,0CAAE,QAAQ,mDAAG,MAAM,CAAC,CAAC;wBACzD,IAAI,cAAc,EAAE;4BAClB,KAAuB,UAAoB,EAApB,6CAAoB,EAApB,kCAAoB,EAApB,IAAoB,EAAE;gCAAxC,IAAM,QAAQ,6BAAA;gCACjB,KAAK,GAAG,KAAK,CAAC,OAAO,CACnB,IAAI,MAAM,CAAC,KAAK,GAAG,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,EACrC,QAAQ,CAAC,KAAK,CACf,CAAC;6BACH;4BACD,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;yBACrB;wBACD,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;oBACtB,CAAC,CAAC,CACH,EAAC;;;KACH,CAAC;AAEK,IAAM,UAAU,GAAG,UACxB,MAAuB,EACvB,GAAW,EACX,aAAqB;;;;oBAEF,qBAAM,IAAA,sBAAc,EAAC,GAAG,EAAE,aAAa,CAAC,EAAA;;gBAArD,UAAU,GAAG,SAAwC;gBAC3D,yEAAyE;gBACzE,yCAAyC;gBACzC,sBAAO,cAAc,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,EAAC;;;KACnD,CAAC;AATW,QAAA,UAAU,cASrB"}