@signageos/cli 0.10.2 → 1.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 (146) hide show
  1. package/CHANGELOG.md +16 -0
  2. package/README.md +16 -1
  3. package/config/parameters.d.ts +1 -0
  4. package/config/parameters.js +4 -0
  5. package/dist/Applet/Generate/appletGenerateCommand.d.ts +44 -2
  6. package/dist/Applet/Generate/appletGenerateCommand.js +44 -35
  7. package/dist/Applet/Generate/appletGenerateCommand.js.map +1 -1
  8. package/dist/Applet/Start/appletStartCommand.d.ts +59 -2
  9. package/dist/Applet/Start/appletStartCommand.js +31 -22
  10. package/dist/Applet/Start/appletStartCommand.js.map +1 -1
  11. package/dist/Applet/Start/appletStartCommandHelper.d.ts +3 -2
  12. package/dist/Applet/Start/appletStartCommandHelper.js +5 -4
  13. package/dist/Applet/Start/appletStartCommandHelper.js.map +1 -1
  14. package/dist/Applet/Test/Upload/appletTestRunCommand.d.ts +52 -2
  15. package/dist/Applet/Test/Upload/appletTestRunCommand.js +44 -36
  16. package/dist/Applet/Test/Upload/appletTestRunCommand.js.map +1 -1
  17. package/dist/Applet/Test/Upload/appletTestRunFacade.js +2 -1
  18. package/dist/Applet/Test/Upload/appletTestRunFacade.js.map +1 -1
  19. package/dist/Applet/Test/Upload/appletTestUploadCommand.d.ts +42 -2
  20. package/dist/Applet/Test/Upload/appletTestUploadCommand.js +45 -37
  21. package/dist/Applet/Test/Upload/appletTestUploadCommand.js.map +1 -1
  22. package/dist/Applet/Test/Upload/appletTestUploadFacade.js +2 -1
  23. package/dist/Applet/Test/Upload/appletTestUploadFacade.js.map +1 -1
  24. package/dist/Applet/Test/appletTestCommand.d.ts +93 -2
  25. package/dist/Applet/Test/appletTestCommand.js +4 -2
  26. package/dist/Applet/Test/appletTestCommand.js.map +1 -1
  27. package/dist/Applet/Upload/appletUploadCommand.d.ts +63 -5
  28. package/dist/Applet/Upload/appletUploadCommand.js +142 -150
  29. package/dist/Applet/Upload/appletUploadCommand.js.map +1 -1
  30. package/dist/Applet/Upload/appletUploadCommandHelper.d.ts +17 -5
  31. package/dist/Applet/Upload/appletUploadCommandHelper.js +30 -47
  32. package/dist/Applet/Upload/appletUploadCommandHelper.js.map +1 -1
  33. package/dist/Applet/Upload/appletUploadFacade.d.ts +0 -7
  34. package/dist/Applet/Upload/appletUploadFacade.js +21 -23
  35. package/dist/Applet/Upload/appletUploadFacade.js.map +1 -1
  36. package/dist/Applet/Upload/appletUploadFacadeHelper.js +5 -4
  37. package/dist/Applet/Upload/appletUploadFacadeHelper.js.map +1 -1
  38. package/dist/Applet/appletCommand.d.ts +257 -2
  39. package/dist/Applet/appletCommand.js +4 -2
  40. package/dist/Applet/appletCommand.js.map +1 -1
  41. package/dist/Applet/appletFacade.d.ts +1 -3
  42. package/dist/Applet/appletFacade.js +28 -53
  43. package/dist/Applet/appletFacade.js.map +1 -1
  44. package/dist/Auth/loginCommand.d.ts +18 -2
  45. package/dist/Auth/loginCommand.js +16 -13
  46. package/dist/Auth/loginCommand.js.map +1 -1
  47. package/dist/Cache/tmpCache.js +1 -0
  48. package/dist/Cache/tmpCache.js.map +1 -1
  49. package/dist/Cli/helper.js +1 -0
  50. package/dist/Cli/helper.js.map +1 -1
  51. package/dist/Cli/packageVersion.d.ts +0 -6
  52. package/dist/Cli/packageVersion.js +10 -15
  53. package/dist/Cli/packageVersion.js.map +1 -1
  54. package/dist/Command/commandDefinition.d.ts +28 -0
  55. package/dist/Command/commandDefinition.js +8 -0
  56. package/dist/Command/commandDefinition.js.map +1 -0
  57. package/dist/Command/commandProcessor.d.ts +2 -10
  58. package/dist/Command/commandProcessor.js +13 -20
  59. package/dist/Command/commandProcessor.js.map +1 -1
  60. package/dist/Command/globalArgs.d.ts +2 -0
  61. package/dist/Command/globalArgs.js +16 -0
  62. package/dist/Command/globalArgs.js.map +1 -0
  63. package/dist/CommandLine/progressBarFactory.js +1 -0
  64. package/dist/CommandLine/progressBarFactory.js.map +1 -1
  65. package/dist/Device/Connect/connectCommand.d.ts +50 -2
  66. package/dist/Device/Connect/connectCommand.js +23 -18
  67. package/dist/Device/Connect/connectCommand.js.map +1 -1
  68. package/dist/Device/Connect/connectHelper.d.ts +0 -1
  69. package/dist/Device/Connect/connectHelper.js +39 -75
  70. package/dist/Device/Connect/connectHelper.js.map +1 -1
  71. package/dist/Device/Content/setContentCommand.d.ts +42 -2
  72. package/dist/Device/Content/setContentCommand.js +21 -13
  73. package/dist/Device/Content/setContentCommand.js.map +1 -1
  74. package/dist/Device/PowerAction/powerActionCommand.d.ts +42 -2
  75. package/dist/Device/PowerAction/powerActionCommand.js +17 -13
  76. package/dist/Device/PowerAction/powerActionCommand.js.map +1 -1
  77. package/dist/Device/deviceCommand.d.ts +129 -2
  78. package/dist/Device/deviceCommand.js +4 -2
  79. package/dist/Device/deviceCommand.js.map +1 -1
  80. package/dist/Device/deviceFacade.d.ts +11 -10
  81. package/dist/Device/deviceFacade.js +20 -15
  82. package/dist/Device/deviceFacade.js.map +1 -1
  83. package/dist/Emulator/createDomain.js +3 -2
  84. package/dist/Emulator/createDomain.js.map +1 -1
  85. package/dist/Emulator/emulatorFacade.d.ts +3 -1
  86. package/dist/Emulator/emulatorFacade.js +29 -27
  87. package/dist/Emulator/emulatorFacade.js.map +1 -1
  88. package/dist/Emulator/emulatorFactory.d.ts +3 -1
  89. package/dist/Emulator/emulatorFactory.js +19 -17
  90. package/dist/Emulator/emulatorFactory.js.map +1 -1
  91. package/dist/FileSystem/helper.js +21 -15
  92. package/dist/FileSystem/helper.js.map +1 -1
  93. package/dist/FileSystem/packageConfig.js +1 -0
  94. package/dist/FileSystem/packageConfig.js.map +1 -1
  95. package/dist/Firmware/Upload/firmwareUploadCommand.d.ts +48 -2
  96. package/dist/Firmware/Upload/firmwareUploadCommand.js +33 -20
  97. package/dist/Firmware/Upload/firmwareUploadCommand.js.map +1 -1
  98. package/dist/Firmware/Upload/firmwareUploadFacade.js +5 -4
  99. package/dist/Firmware/Upload/firmwareUploadFacade.js.map +1 -1
  100. package/dist/Firmware/Upload/firmwareUploadHelper.js +2 -2
  101. package/dist/Firmware/Upload/firmwareUploadHelper.js.map +1 -1
  102. package/dist/Firmware/firmwareCommand.d.ts +51 -2
  103. package/dist/Firmware/firmwareCommand.js +5 -8
  104. package/dist/Firmware/firmwareCommand.js.map +1 -1
  105. package/dist/Helper/localMachineHelper.d.ts +1 -0
  106. package/dist/Helper/localMachineHelper.js +94 -0
  107. package/dist/Helper/localMachineHelper.js.map +1 -0
  108. package/dist/Organization/Get/organizationGetCommand.d.ts +26 -2
  109. package/dist/Organization/Get/organizationGetCommand.js +11 -7
  110. package/dist/Organization/Get/organizationGetCommand.js.map +1 -1
  111. package/dist/Organization/List/organizationListCommand.d.ts +7 -2
  112. package/dist/Organization/List/organizationListCommand.js +6 -4
  113. package/dist/Organization/List/organizationListCommand.js.map +1 -1
  114. package/dist/Organization/SetDefault/organizationSetDefaultCommand.d.ts +18 -2
  115. package/dist/Organization/SetDefault/organizationSetDefaultCommand.js +12 -9
  116. package/dist/Organization/SetDefault/organizationSetDefaultCommand.js.map +1 -1
  117. package/dist/Organization/organizationCommand.d.ts +49 -2
  118. package/dist/Organization/organizationCommand.js +4 -2
  119. package/dist/Organization/organizationCommand.js.map +1 -1
  120. package/dist/Organization/organizationFacade.d.ts +20 -5
  121. package/dist/Organization/organizationFacade.js +60 -12
  122. package/dist/Organization/organizationFacade.js.map +1 -1
  123. package/dist/RunControl/runControlHelper.d.ts +1 -1
  124. package/dist/RunControl/runControlHelper.js +38 -14
  125. package/dist/RunControl/runControlHelper.js.map +1 -1
  126. package/dist/Stream/helper.js +1 -0
  127. package/dist/Stream/helper.js.map +1 -1
  128. package/dist/Timing/List/timingListCommand.d.ts +34 -2
  129. package/dist/Timing/List/timingListCommand.js +14 -10
  130. package/dist/Timing/List/timingListCommand.js.map +1 -1
  131. package/dist/Timing/timingCommand.d.ts +37 -2
  132. package/dist/Timing/timingCommand.js +4 -2
  133. package/dist/Timing/timingCommand.js.map +1 -1
  134. package/dist/generalCommand.d.ts +64 -0
  135. package/dist/generalCommand.js +46 -0
  136. package/dist/generalCommand.js.map +1 -0
  137. package/dist/helper.d.ts +6 -2
  138. package/dist/helper.js +13 -12
  139. package/dist/helper.js.map +1 -1
  140. package/dist/index.js +6 -18
  141. package/dist/index.js.map +1 -1
  142. package/package-lock.json +1094 -870
  143. package/package.json +14 -13
  144. package/dist/Command/ICommand.d.ts +0 -10
  145. package/dist/Command/ICommand.js +0 -3
  146. package/dist/Command/ICommand.js.map +0 -1
@@ -51,39 +51,47 @@ var __read = (this && this.__read) || function (o, n) {
51
51
  }
52
52
  return ar;
53
53
  };
54
- var __spread = (this && this.__spread) || function () {
55
- for (var ar = [], i = 0; i < arguments.length; i++) ar = ar.concat(__read(arguments[i]));
56
- return ar;
54
+ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
55
+ if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
56
+ if (ar || !(i in from)) {
57
+ if (!ar) ar = Array.prototype.slice.call(from, 0, i);
58
+ ar[i] = from[i];
59
+ }
60
+ }
61
+ return to.concat(ar || Array.prototype.slice.call(from));
57
62
  };
58
63
  Object.defineProperty(exports, "__esModule", { value: true });
64
+ exports.appletTestRun = void 0;
59
65
  var chalk_1 = require("chalk");
60
66
  var prompts = require("prompts");
61
67
  var helper_1 = require("../../../helper");
62
68
  var organizationFacade_1 = require("../../../Organization/organizationFacade");
63
69
  var appletFacade_1 = require("../../appletFacade");
64
- var appletUploadCommandHelper_1 = require("../../Upload/appletUploadCommandHelper");
65
70
  var progressBarFactory_1 = require("../../../CommandLine/progressBarFactory");
66
71
  var deviceFacade_1 = require("../../../Device/deviceFacade");
67
72
  var appletTestRunFacade_1 = require("./appletTestRunFacade");
68
73
  var wait_1 = require("../../../Timer/wait");
69
- exports.appletTestRun = {
74
+ var commandDefinition_1 = require("../../../Command/commandDefinition");
75
+ var OPTION_LIST = [
76
+ organizationFacade_1.NO_DEFAULT_ORGANIZATION_OPTION,
77
+ deviceFacade_1.DEVICE_UID_OPTION,
78
+ organizationFacade_1.ORGANIZATION_UID_OPTION,
79
+ {
80
+ name: 'test',
81
+ type: String,
82
+ multiple: true,
83
+ description: "Specify the test identifiers/files to be run. If not specified, all will be run.",
84
+ },
85
+ {
86
+ name: 'yes',
87
+ type: Boolean,
88
+ description: "Allow to run applet test without confirmation step",
89
+ },
90
+ ];
91
+ exports.appletTestRun = (0, commandDefinition_1.createCommandDefinition)({
70
92
  name: 'run',
71
93
  description: 'Runs applet tests',
72
- optionList: [
73
- deviceFacade_1.DEVICE_UID_OPTION,
74
- organizationFacade_1.ORGANIZATION_UID_OPTION,
75
- {
76
- name: 'test',
77
- type: String,
78
- multiple: true,
79
- description: "Specify the test identifiers/files to be run. If not specified, all will be run.",
80
- },
81
- {
82
- name: 'yes',
83
- type: Boolean,
84
- description: "Allow to run applet test without confirmation step",
85
- },
86
- ],
94
+ optionList: OPTION_LIST,
87
95
  commands: [],
88
96
  run: function (options) {
89
97
  var _a, _b, _c, _d;
@@ -95,27 +103,27 @@ exports.appletTestRun = {
95
103
  skipConfirmation = !!options.yes;
96
104
  tests = options.test;
97
105
  currentDirectory = process.cwd();
98
- return [4 /*yield*/, appletUploadCommandHelper_1.getOrganizationUidAndUpdateConfig(options)];
106
+ return [4 /*yield*/, (0, organizationFacade_1.getOrganizationUidOrDefaultOrSelect)(options)];
99
107
  case 1:
100
108
  organizationUid = _e.sent();
101
- return [4 /*yield*/, organizationFacade_1.getOrganization(organizationUid)];
109
+ return [4 /*yield*/, (0, organizationFacade_1.getOrganization)(organizationUid)];
102
110
  case 2:
103
111
  organization = _e.sent();
104
- restApi = helper_1.createOrganizationRestApi(organization);
105
- return [4 /*yield*/, deviceFacade_1.getDeviceUid(restApi, options)];
112
+ restApi = (0, helper_1.createOrganizationRestApi)(organization);
113
+ return [4 /*yield*/, (0, deviceFacade_1.getDeviceUid)(restApi, options)];
106
114
  case 3:
107
115
  deviceUid = _e.sent();
108
116
  return [4 /*yield*/, restApi.device.get(deviceUid)];
109
117
  case 4:
110
118
  device = _e.sent();
111
- return [4 /*yield*/, appletFacade_1.getAppletVersion(currentDirectory)];
119
+ return [4 /*yield*/, (0, appletFacade_1.getAppletVersion)(currentDirectory)];
112
120
  case 5:
113
121
  version = _e.sent();
114
- return [4 /*yield*/, appletFacade_1.tryGetAppletUid(currentDirectory)];
122
+ return [4 /*yield*/, (0, appletFacade_1.getAppletUid)(restApi)];
115
123
  case 6:
116
124
  appletUid = _e.sent();
117
125
  if (!appletUid) {
118
- throw new Error("applet uid is not present in package file.");
126
+ throw new Error('Not selected Applet or sos.appletUid is not present in package.json');
119
127
  }
120
128
  return [4 /*yield*/, restApi.applet.get(appletUid)];
121
129
  case 7:
@@ -129,14 +137,14 @@ exports.appletTestRun = {
129
137
  if (!tests || tests.length === 0) {
130
138
  tests = testSuites.map(function (testSuite) { return testSuite.identifier; });
131
139
  }
132
- appletTestRunFacade_1.validateTestIdentifiers(tests, testSuites);
140
+ (0, appletTestRunFacade_1.validateTestIdentifiers)(tests, testSuites);
133
141
  printRunTests(tests);
134
142
  if (!!skipConfirmation) return [3 /*break*/, 11];
135
143
  return [4 /*yield*/, prompts({
136
144
  type: 'confirm',
137
145
  name: 'continue',
138
- message: "Do you want to start testing " + chalk_1.default.green(applet.name) + " "
139
- + ("and version " + chalk_1.default.green(version) + " on device " + device.name + "?"),
146
+ message: "Do you want to start testing ".concat(chalk_1.default.green(applet.name), " ")
147
+ + "and version ".concat(chalk_1.default.green(version), " on device ").concat(device.name, "?"),
140
148
  })];
141
149
  case 10:
142
150
  response = _e.sent();
@@ -146,7 +154,7 @@ exports.appletTestRun = {
146
154
  _e.label = 11;
147
155
  case 11:
148
156
  RUNNING_TEST_TITLE = "Running applet tests";
149
- progressBar = progressBarFactory_1.createProgressBar();
157
+ progressBar = (0, progressBarFactory_1.createProgressBar)();
150
158
  _e.label = 12;
151
159
  case 12:
152
160
  _e.trys.push([12, , 19, 20]);
@@ -159,7 +167,7 @@ exports.appletTestRun = {
159
167
  _e.sent();
160
168
  deviceAppletTest = void 0;
161
169
  _e.label = 14;
162
- case 14: return [4 /*yield*/, wait_1.default(1e3)];
170
+ case 14: return [4 /*yield*/, (0, wait_1.default)(1e3)];
163
171
  case 15:
164
172
  _e.sent();
165
173
  lastCountFinished = ((_a = deviceAppletTest === null || deviceAppletTest === void 0 ? void 0 : deviceAppletTest.successfulTests.length) !== null && _a !== void 0 ? _a : 0) + ((_b = deviceAppletTest === null || deviceAppletTest === void 0 ? void 0 : deviceAppletTest.failedTests.length) !== null && _b !== void 0 ? _b : 0);
@@ -167,7 +175,7 @@ exports.appletTestRun = {
167
175
  case 16:
168
176
  deviceAppletTest = _e.sent();
169
177
  nextCountFinished = ((_c = deviceAppletTest === null || deviceAppletTest === void 0 ? void 0 : deviceAppletTest.successfulTests.length) !== null && _c !== void 0 ? _c : 0) + ((_d = deviceAppletTest === null || deviceAppletTest === void 0 ? void 0 : deviceAppletTest.failedTests.length) !== null && _d !== void 0 ? _d : 0);
170
- progressName = RUNNING_TEST_TITLE + ' ' + __spread(deviceAppletTest.failedTests.map(function (t) { return chalk_1.default.red(t); }), deviceAppletTest.successfulTests.map(function (t) { return chalk_1.default.green(t); }), deviceAppletTest.pendingTests.map(function (t) { return chalk_1.default.gray(t); })).join(',');
178
+ progressName = RUNNING_TEST_TITLE + ' ' + __spreadArray(__spreadArray(__spreadArray([], __read(deviceAppletTest.failedTests.map(function (t) { return chalk_1.default.red(t); })), false), __read(deviceAppletTest.successfulTests.map(function (t) { return chalk_1.default.green(t); })), false), __read(deviceAppletTest.pendingTests.map(function (t) { return chalk_1.default.gray(t); })), false).join(',');
171
179
  progressBar.update({
172
180
  add: nextCountFinished - lastCountFinished,
173
181
  name: progressName,
@@ -193,13 +201,13 @@ exports.appletTestRun = {
193
201
  });
194
202
  });
195
203
  },
196
- };
204
+ });
197
205
  function displaySuccessMessage(appletName, appletVersion, deviceAppletTest) {
198
- console.log("Applet " + chalk_1.default.green(appletName) + " version " + chalk_1.default.green(appletVersion) + " tests " + chalk_1.default.green('succeeded') + ".");
206
+ console.log("Applet ".concat(chalk_1.default.green(appletName), " version ").concat(chalk_1.default.green(appletVersion), " tests ").concat(chalk_1.default.green('succeeded'), "."));
199
207
  deviceAppletTest.successfulTests.forEach(function (file) { return console.log(chalk_1.default.green('✓ ' + file)); });
200
208
  }
201
209
  function displayFailureMessage(appletName, appletVersion, deviceAppletTest) {
202
- console.log("Applet " + chalk_1.default.green(appletName) + " version " + chalk_1.default.green(appletVersion) + " tests " + chalk_1.default.red('failed') + ".");
210
+ console.log("Applet ".concat(chalk_1.default.green(appletName), " version ").concat(chalk_1.default.green(appletVersion), " tests ").concat(chalk_1.default.red('failed'), "."));
203
211
  deviceAppletTest.failedTests.forEach(function (file) { return console.log(chalk_1.default.red('× ' + file)); });
204
212
  deviceAppletTest.successfulTests.forEach(function (file) { return console.log(chalk_1.default.green('✓ ' + file)); });
205
213
  }
@@ -1 +1 @@
1
- {"version":3,"file":"appletTestRunCommand.js","sourceRoot":"","sources":["../../../../src/Applet/Test/Upload/appletTestRunCommand.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"appletTestRunCommand.js","sourceRoot":"","sources":["../../../../src/Applet/Test/Upload/appletTestRunCommand.ts"],"names":[],"mappings":"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"}
@@ -11,6 +11,7 @@ var __values = (this && this.__values) || function(o) {
11
11
  throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
12
12
  };
13
13
  Object.defineProperty(exports, "__esModule", { value: true });
14
+ exports.validateTestIdentifiers = void 0;
14
15
  function validateTestIdentifiers(identifiers, suites) {
15
16
  var e_1, _a;
16
17
  var existingIdentifiers = suites.map(function (suite) { return suite.identifier; });
@@ -18,7 +19,7 @@ function validateTestIdentifiers(identifiers, suites) {
18
19
  for (var identifiers_1 = __values(identifiers), identifiers_1_1 = identifiers_1.next(); !identifiers_1_1.done; identifiers_1_1 = identifiers_1.next()) {
19
20
  var identifier = identifiers_1_1.value;
20
21
  if (!existingIdentifiers.includes(identifier)) {
21
- throw new Error("Test " + identifier + " is not in currently uploaded test suites.");
22
+ throw new Error("Test ".concat(identifier, " is not in currently uploaded test suites."));
22
23
  }
23
24
  }
24
25
  }
@@ -1 +1 @@
1
- {"version":3,"file":"appletTestRunFacade.js","sourceRoot":"","sources":["../../../../src/Applet/Test/Upload/appletTestRunFacade.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAEA,SAAgB,uBAAuB,CAAC,WAAqB,EAAE,MAA0B;;IACxF,IAAM,mBAAmB,GAAG,MAAM,CAAC,GAAG,CAAC,UAAC,KAAK,IAAK,OAAA,KAAK,CAAC,UAAU,EAAhB,CAAgB,CAAC,CAAC;;QACpE,KAAyB,IAAA,gBAAA,SAAA,WAAW,CAAA,wCAAA,iEAAE;YAAjC,IAAM,UAAU,wBAAA;YACpB,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;gBAC9C,MAAM,IAAI,KAAK,CAAC,UAAQ,UAAU,+CAA4C,CAAC,CAAC;aAChF;SACD;;;;;;;;;AACF,CAAC;AAPD,0DAOC"}
1
+ {"version":3,"file":"appletTestRunFacade.js","sourceRoot":"","sources":["../../../../src/Applet/Test/Upload/appletTestRunFacade.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAEA,SAAgB,uBAAuB,CAAC,WAAqB,EAAE,MAA0B;;IACxF,IAAM,mBAAmB,GAAG,MAAM,CAAC,GAAG,CAAC,UAAC,KAAK,IAAK,OAAA,KAAK,CAAC,UAAU,EAAhB,CAAgB,CAAC,CAAC;;QACpE,KAAyB,IAAA,gBAAA,SAAA,WAAW,CAAA,wCAAA,iEAAE;YAAjC,IAAM,UAAU,wBAAA;YACpB,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;gBAC9C,MAAM,IAAI,KAAK,CAAC,eAAQ,UAAU,+CAA4C,CAAC,CAAC;aAChF;SACD;;;;;;;;;AACF,CAAC;AAPD,0DAOC"}
@@ -1,2 +1,42 @@
1
- import ICommand from '../../../Command/ICommand';
2
- export declare const appletTestUpload: ICommand;
1
+ import { CommandLineOptions } from '../../../Command/commandDefinition';
2
+ declare const OPTION_LIST: readonly [{
3
+ readonly name: "no-default-organization";
4
+ readonly type: BooleanConstructor;
5
+ readonly description: "Prevent using the defaultOrganizationUid from ~/.sosrc which were set using command sos organization set-default";
6
+ }, {
7
+ readonly name: "organization-uid";
8
+ readonly type: StringConstructor;
9
+ readonly description: "Organization UID";
10
+ }, {
11
+ readonly name: "yes";
12
+ readonly type: BooleanConstructor;
13
+ readonly description: "Allow to upload new applet test or override existing test without confirmation step";
14
+ }, {
15
+ readonly name: "verbose";
16
+ readonly type: BooleanConstructor;
17
+ readonly description: "outputs all files to upload";
18
+ }];
19
+ export declare const appletTestUpload: {
20
+ name: "upload";
21
+ description: string;
22
+ optionList: readonly [{
23
+ readonly name: "no-default-organization";
24
+ readonly type: BooleanConstructor;
25
+ readonly description: "Prevent using the defaultOrganizationUid from ~/.sosrc which were set using command sos organization set-default";
26
+ }, {
27
+ readonly name: "organization-uid";
28
+ readonly type: StringConstructor;
29
+ readonly description: "Organization UID";
30
+ }, {
31
+ readonly name: "yes";
32
+ readonly type: BooleanConstructor;
33
+ readonly description: "Allow to upload new applet test or override existing test without confirmation step";
34
+ }, {
35
+ readonly name: "verbose";
36
+ readonly type: BooleanConstructor;
37
+ readonly description: "outputs all files to upload";
38
+ }];
39
+ commands: never[];
40
+ run(options: CommandLineOptions<typeof OPTION_LIST>): Promise<void>;
41
+ };
42
+ export {};
@@ -62,36 +62,44 @@ var __read = (this && this.__read) || function (o, n) {
62
62
  }
63
63
  return ar;
64
64
  };
65
- var __spread = (this && this.__spread) || function () {
66
- for (var ar = [], i = 0; i < arguments.length; i++) ar = ar.concat(__read(arguments[i]));
67
- return ar;
65
+ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
66
+ if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
67
+ if (ar || !(i in from)) {
68
+ if (!ar) ar = Array.prototype.slice.call(from, 0, i);
69
+ ar[i] = from[i];
70
+ }
71
+ }
72
+ return to.concat(ar || Array.prototype.slice.call(from));
68
73
  };
69
74
  Object.defineProperty(exports, "__esModule", { value: true });
75
+ exports.appletTestUpload = void 0;
70
76
  var chalk_1 = require("chalk");
71
77
  var prompts = require("prompts");
72
78
  var helper_1 = require("../../../helper");
73
79
  var organizationFacade_1 = require("../../../Organization/organizationFacade");
74
80
  var appletTestUploadFacade_1 = require("./appletTestUploadFacade");
75
81
  var appletFacade_1 = require("../../appletFacade");
76
- var appletUploadCommandHelper_1 = require("../../Upload/appletUploadCommandHelper");
77
82
  var progressBarFactory_1 = require("../../../CommandLine/progressBarFactory");
78
83
  var packageConfig_1 = require("../../../FileSystem/packageConfig");
79
- exports.appletTestUpload = {
84
+ var commandDefinition_1 = require("../../../Command/commandDefinition");
85
+ var OPTION_LIST = [
86
+ organizationFacade_1.NO_DEFAULT_ORGANIZATION_OPTION,
87
+ organizationFacade_1.ORGANIZATION_UID_OPTION,
88
+ {
89
+ name: 'yes',
90
+ type: Boolean,
91
+ description: "Allow to upload new applet test or override existing test without confirmation step",
92
+ },
93
+ {
94
+ name: 'verbose',
95
+ type: Boolean,
96
+ description: "outputs all files to upload",
97
+ },
98
+ ];
99
+ exports.appletTestUpload = (0, commandDefinition_1.createCommandDefinition)({
80
100
  name: 'upload',
81
101
  description: 'Uploads applet test',
82
- optionList: [
83
- organizationFacade_1.ORGANIZATION_UID_OPTION,
84
- {
85
- name: 'yes',
86
- type: Boolean,
87
- description: "Allow to upload new applet test or override existing test without confirmation step",
88
- },
89
- {
90
- name: 'verbose',
91
- type: Boolean,
92
- description: "outputs all files to upload",
93
- },
94
- ],
102
+ optionList: OPTION_LIST,
95
103
  commands: [],
96
104
  run: function (options) {
97
105
  var _a;
@@ -105,21 +113,21 @@ exports.appletTestUpload = {
105
113
  isVerbose = !!options.verbose;
106
114
  skipConfirmation = !!options.yes;
107
115
  currentDirectory = process.cwd();
108
- return [4 /*yield*/, appletUploadCommandHelper_1.getOrganizationUidAndUpdateConfig(options)];
116
+ return [4 /*yield*/, (0, organizationFacade_1.getOrganizationUidOrDefaultOrSelect)(options)];
109
117
  case 1:
110
118
  organizationUid = _c.sent();
111
- return [4 /*yield*/, organizationFacade_1.getOrganization(organizationUid)];
119
+ return [4 /*yield*/, (0, organizationFacade_1.getOrganization)(organizationUid)];
112
120
  case 2:
113
121
  organization = _c.sent();
114
- restApi = helper_1.createOrganizationRestApi(organization);
115
- return [4 /*yield*/, appletFacade_1.getAppletVersion(currentDirectory)];
122
+ restApi = (0, helper_1.createOrganizationRestApi)(organization);
123
+ return [4 /*yield*/, (0, appletFacade_1.getAppletVersion)(currentDirectory)];
116
124
  case 3:
117
125
  version = _c.sent();
118
- return [4 /*yield*/, appletFacade_1.tryGetAppletUid(currentDirectory)];
126
+ return [4 /*yield*/, (0, appletFacade_1.getAppletUid)(restApi)];
119
127
  case 4:
120
128
  appletUid = _c.sent();
121
129
  if (!appletUid) {
122
- throw new Error("applet uid is not present in package file.");
130
+ throw new Error('Not selected Applet or sos.appletUid is not present in package.json');
123
131
  }
124
132
  return [4 /*yield*/, restApi.applet.get(appletUid)];
125
133
  case 5:
@@ -127,14 +135,14 @@ exports.appletTestUpload = {
127
135
  return [4 /*yield*/, restApi.applet.version.get(appletUid, version)];
128
136
  case 6:
129
137
  appletVersion = _c.sent();
130
- return [4 /*yield*/, packageConfig_1.loadPackage(currentDirectory)];
138
+ return [4 /*yield*/, (0, packageConfig_1.loadPackage)(currentDirectory)];
131
139
  case 7:
132
140
  packageConfig = _c.sent();
133
141
  if (!((_a = packageConfig === null || packageConfig === void 0 ? void 0 : packageConfig.sos) === null || _a === void 0 ? void 0 : _a.tests)) {
134
142
  throw new Error("No key \"sos.tests\" found in package.json file. You have to specify all testing files there first.");
135
143
  }
136
144
  testFiles = packageConfig === null || packageConfig === void 0 ? void 0 : packageConfig.sos.tests;
137
- return [4 /*yield*/, appletTestUploadFacade_1.validateTestFiles(currentDirectory, testFiles)];
145
+ return [4 /*yield*/, (0, appletTestUploadFacade_1.validateTestFiles)(currentDirectory, testFiles)];
138
146
  case 8:
139
147
  _c.sent();
140
148
  if (isVerbose) {
@@ -157,7 +165,7 @@ exports.appletTestUpload = {
157
165
  }
158
166
  finally { if (e_1) throw e_1.error; }
159
167
  }
160
- return [4 /*yield*/, appletTestUploadFacade_1.loadTestFilesContents(currentDirectory, testFiles)];
168
+ return [4 /*yield*/, (0, appletTestUploadFacade_1.loadTestFilesContents)(currentDirectory, testFiles)];
161
169
  case 10:
162
170
  testFilesContents = _c.sent();
163
171
  identifiersToCreate = testFiles.filter(function (testFile) { return testSuitesMap[testFile] === undefined; });
@@ -169,8 +177,8 @@ exports.appletTestUpload = {
169
177
  return [4 /*yield*/, prompts({
170
178
  type: 'confirm',
171
179
  name: 'continue',
172
- message: "Do you want to do applet version test changes for applet " + chalk_1.default.green(applet.name) + " "
173
- + ("and version " + chalk_1.default.green(version) + "?"),
180
+ message: "Do you want to do applet version test changes for applet ".concat(chalk_1.default.green(applet.name), " ")
181
+ + "and version ".concat(chalk_1.default.green(version), "?"),
174
182
  })];
175
183
  case 11:
176
184
  response = _c.sent();
@@ -179,7 +187,7 @@ exports.appletTestUpload = {
179
187
  }
180
188
  _c.label = 12;
181
189
  case 12:
182
- progressBar = progressBarFactory_1.createProgressBar();
190
+ progressBar = (0, progressBarFactory_1.createProgressBar)();
183
191
  _c.label = 13;
184
192
  case 13:
185
193
  _c.trys.push([13, , 15, 16]);
@@ -187,7 +195,7 @@ exports.appletTestUpload = {
187
195
  size: identifiersToCreate.length + identifiersToUpdate.length + identifiersToDelete.length,
188
196
  name: "Uploading applet test files",
189
197
  });
190
- return [4 /*yield*/, Promise.all(__spread(identifiersToCreate.map(function (identifier) { return __awaiter(_this, void 0, void 0, function () {
198
+ return [4 /*yield*/, Promise.all(__spreadArray(__spreadArray(__spreadArray([], __read(identifiersToCreate.map(function (identifier) { return __awaiter(_this, void 0, void 0, function () {
191
199
  return __generator(this, function (_a) {
192
200
  switch (_a.label) {
193
201
  case 0: return [4 /*yield*/, restApi.applet.tests.create(applet.uid, appletVersion.version, {
@@ -200,7 +208,7 @@ exports.appletTestUpload = {
200
208
  return [2 /*return*/];
201
209
  }
202
210
  });
203
- }); }), identifiersToUpdate.map(function (identifier) { return __awaiter(_this, void 0, void 0, function () {
211
+ }); })), false), __read(identifiersToUpdate.map(function (identifier) { return __awaiter(_this, void 0, void 0, function () {
204
212
  return __generator(this, function (_a) {
205
213
  switch (_a.label) {
206
214
  case 0: return [4 /*yield*/, restApi.applet.tests.update(applet.uid, appletVersion.version, identifier, {
@@ -212,7 +220,7 @@ exports.appletTestUpload = {
212
220
  return [2 /*return*/];
213
221
  }
214
222
  });
215
- }); }), identifiersToDelete.map(function (identifier) { return __awaiter(_this, void 0, void 0, function () {
223
+ }); })), false), __read(identifiersToDelete.map(function (identifier) { return __awaiter(_this, void 0, void 0, function () {
216
224
  return __generator(this, function (_a) {
217
225
  switch (_a.label) {
218
226
  case 0: return [4 /*yield*/, restApi.applet.tests.delete(applet.uid, appletVersion.version, identifier)];
@@ -222,7 +230,7 @@ exports.appletTestUpload = {
222
230
  return [2 /*return*/];
223
231
  }
224
232
  });
225
- }); })))];
233
+ }); })), false))];
226
234
  case 14:
227
235
  _c.sent();
228
236
  displaySuccessMessage(applet.name, appletVersion.version);
@@ -235,10 +243,10 @@ exports.appletTestUpload = {
235
243
  });
236
244
  });
237
245
  },
238
- };
246
+ });
239
247
  function displaySuccessMessage(appletName, appletVersion) {
240
- console.log("Applet " + chalk_1.default.green(appletName) + " version " + chalk_1.default.green(appletVersion) + " tests has been uploaded.");
241
- console.log("To run the tests, use command " + chalk_1.default.blue("sos applet test run"));
248
+ console.log("Applet ".concat(chalk_1.default.green(appletName), " version ").concat(chalk_1.default.green(appletVersion), " tests has been uploaded."));
249
+ console.log("To run the tests, use command ".concat(chalk_1.default.blue("sos applet test run")));
242
250
  }
243
251
  function printMatchedFiles(testFiles) {
244
252
  if (testFiles.length > 0) {
@@ -1 +1 @@
1
- {"version":3,"file":"appletTestUploadCommand.js","sourceRoot":"","sources":["../../../../src/Applet/Test/Upload/appletTestUploadCommand.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"appletTestUploadCommand.js","sourceRoot":"","sources":["../../../../src/Applet/Test/Upload/appletTestUploadCommand.ts"],"names":[],"mappings":"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"}
@@ -47,6 +47,7 @@ var __values = (this && this.__values) || function(o) {
47
47
  throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
48
48
  };
49
49
  Object.defineProperty(exports, "__esModule", { value: true });
50
+ exports.loadTestFilesContents = exports.validateTestFiles = void 0;
50
51
  var fs = require("fs-extra");
51
52
  var path = require("path");
52
53
  function validateTestFiles(currentDirectory, testFiles) {
@@ -66,7 +67,7 @@ function validateTestFiles(currentDirectory, testFiles) {
66
67
  return [4 /*yield*/, fs.pathExists(testFilePath)];
67
68
  case 2:
68
69
  if (!(_b.sent())) {
69
- throw new Error("Test file " + testFilePath + " specified in package.json sos.tests doesn't exist");
70
+ throw new Error("Test file ".concat(testFilePath, " specified in package.json sos.tests doesn't exist"));
70
71
  }
71
72
  _b.label = 3;
72
73
  case 3:
@@ -1 +1 @@
1
- {"version":3,"file":"appletTestUploadFacade.js","sourceRoot":"","sources":["../../../../src/Applet/Test/Upload/appletTestUploadFacade.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA+B;AAC/B,2BAA6B;AAE7B,SAAsB,iBAAiB,CAAC,gBAAwB,EAAE,SAAmB;;;;;;;;oBAC7D,cAAA,SAAA,SAAS,CAAA;;;;oBAArB,QAAQ;oBACZ,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;oBACtD,qBAAM,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAA;;oBAAtC,IAAI,CAAC,CAAA,SAAiC,CAAA,EAAE;wBACvC,MAAM,IAAI,KAAK,CAAC,eAAa,YAAY,uDAAoD,CAAC,CAAC;qBAC/F;;;;;;;;;;;;;;;;;;;;CAEF;AAPD,8CAOC;AAED,SAAsB,qBAAqB,CAAC,gBAAwB,EAAE,SAAmB;;;;;;;oBAClF,WAAW,GAAqC,EAAE,CAAC;oBACzD,qBAAM,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,UAAO,QAAQ;;;;;wCACxC,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;wCAC5C,qBAAM,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAA;;wCAAxC,MAAM,GAAG,SAA+B;wCAC9C,WAAW,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;;;;6BAC1C,CAAC,CAAC,EAAA;;oBAJH,SAIG,CAAC;oBACJ,sBAAO,WAAW,EAAC;;;;CACnB;AARD,sDAQC"}
1
+ {"version":3,"file":"appletTestUploadFacade.js","sourceRoot":"","sources":["../../../../src/Applet/Test/Upload/appletTestUploadFacade.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA+B;AAC/B,2BAA6B;AAE7B,SAAsB,iBAAiB,CAAC,gBAAwB,EAAE,SAAmB;;;;;;;;oBAC7D,cAAA,SAAA,SAAS,CAAA;;;;oBAArB,QAAQ;oBACZ,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;oBACtD,qBAAM,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAA;;oBAAtC,IAAI,CAAC,CAAA,SAAiC,CAAA,EAAE;wBACvC,MAAM,IAAI,KAAK,CAAC,oBAAa,YAAY,uDAAoD,CAAC,CAAC;qBAC/F;;;;;;;;;;;;;;;;;;;;CAEF;AAPD,8CAOC;AAED,SAAsB,qBAAqB,CAAC,gBAAwB,EAAE,SAAmB;;;;;;;oBAClF,WAAW,GAAqC,EAAE,CAAC;oBACzD,qBAAM,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,UAAO,QAAQ;;;;;wCACxC,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;wCAC5C,qBAAM,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAA;;wCAAxC,MAAM,GAAG,SAA+B;wCAC9C,WAAW,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;;;;6BAC1C,CAAC,CAAC,EAAA;;oBAJH,SAIG,CAAC;oBACJ,sBAAO,WAAW,EAAC;;;;CACnB;AARD,sDAQC"}
@@ -1,2 +1,93 @@
1
- import ICommand from "../../Command/ICommand";
2
- export declare const appletTest: ICommand;
1
+ export declare const appletTest: {
2
+ name: "test";
3
+ description: string;
4
+ optionList: never[];
5
+ commands: ({
6
+ name: "run";
7
+ description: string;
8
+ optionList: readonly [{
9
+ readonly name: "no-default-organization";
10
+ readonly type: BooleanConstructor;
11
+ readonly description: "Prevent using the defaultOrganizationUid from ~/.sosrc which were set using command sos organization set-default";
12
+ }, {
13
+ readonly name: "device-uid";
14
+ readonly type: StringConstructor;
15
+ readonly description: "Device UID";
16
+ }, {
17
+ readonly name: "organization-uid";
18
+ readonly type: StringConstructor;
19
+ readonly description: "Organization UID";
20
+ }, {
21
+ readonly name: "test";
22
+ readonly type: StringConstructor;
23
+ readonly multiple: true;
24
+ readonly description: "Specify the test identifiers/files to be run. If not specified, all will be run.";
25
+ }, {
26
+ readonly name: "yes";
27
+ readonly type: BooleanConstructor;
28
+ readonly description: "Allow to run applet test without confirmation step";
29
+ }];
30
+ commands: never[];
31
+ run(options: import("../../Command/commandDefinition").CommandLineOptions<readonly [{
32
+ readonly name: "no-default-organization";
33
+ readonly type: BooleanConstructor;
34
+ readonly description: "Prevent using the defaultOrganizationUid from ~/.sosrc which were set using command sos organization set-default";
35
+ }, {
36
+ readonly name: "device-uid";
37
+ readonly type: StringConstructor;
38
+ readonly description: "Device UID";
39
+ }, {
40
+ readonly name: "organization-uid";
41
+ readonly type: StringConstructor;
42
+ readonly description: "Organization UID";
43
+ }, {
44
+ readonly name: "test";
45
+ readonly type: StringConstructor;
46
+ readonly multiple: true;
47
+ readonly description: "Specify the test identifiers/files to be run. If not specified, all will be run.";
48
+ }, {
49
+ readonly name: "yes";
50
+ readonly type: BooleanConstructor;
51
+ readonly description: "Allow to run applet test without confirmation step";
52
+ }]>): Promise<void>;
53
+ } | {
54
+ name: "upload";
55
+ description: string;
56
+ optionList: readonly [{
57
+ readonly name: "no-default-organization";
58
+ readonly type: BooleanConstructor;
59
+ readonly description: "Prevent using the defaultOrganizationUid from ~/.sosrc which were set using command sos organization set-default";
60
+ }, {
61
+ readonly name: "organization-uid";
62
+ readonly type: StringConstructor;
63
+ readonly description: "Organization UID";
64
+ }, {
65
+ readonly name: "yes";
66
+ readonly type: BooleanConstructor;
67
+ readonly description: "Allow to upload new applet test or override existing test without confirmation step";
68
+ }, {
69
+ readonly name: "verbose";
70
+ readonly type: BooleanConstructor;
71
+ readonly description: "outputs all files to upload";
72
+ }];
73
+ commands: never[];
74
+ run(options: import("../../Command/commandDefinition").CommandLineOptions<readonly [{
75
+ readonly name: "no-default-organization";
76
+ readonly type: BooleanConstructor;
77
+ readonly description: "Prevent using the defaultOrganizationUid from ~/.sosrc which were set using command sos organization set-default";
78
+ }, {
79
+ readonly name: "organization-uid";
80
+ readonly type: StringConstructor;
81
+ readonly description: "Organization UID";
82
+ }, {
83
+ readonly name: "yes";
84
+ readonly type: BooleanConstructor;
85
+ readonly description: "Allow to upload new applet test or override existing test without confirmation step";
86
+ }, {
87
+ readonly name: "verbose";
88
+ readonly type: BooleanConstructor;
89
+ readonly description: "outputs all files to upload";
90
+ }]>): Promise<void>;
91
+ })[];
92
+ run(): Promise<never>;
93
+ };
@@ -36,9 +36,11 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
36
36
  }
37
37
  };
38
38
  Object.defineProperty(exports, "__esModule", { value: true });
39
+ exports.appletTest = void 0;
40
+ var commandDefinition_1 = require("../../Command/commandDefinition");
39
41
  var appletTestRunCommand_1 = require("./Upload/appletTestRunCommand");
40
42
  var appletTestUploadCommand_1 = require("./Upload/appletTestUploadCommand");
41
- exports.appletTest = {
43
+ exports.appletTest = (0, commandDefinition_1.createCommandDefinition)({
42
44
  name: 'test',
43
45
  description: 'Applet test management',
44
46
  optionList: [],
@@ -53,5 +55,5 @@ exports.appletTest = {
53
55
  });
54
56
  });
55
57
  },
56
- };
58
+ });
57
59
  //# sourceMappingURL=appletTestCommand.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"appletTestCommand.js","sourceRoot":"","sources":["../../../src/Applet/Test/appletTestCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,sEAA8D;AAC9D,4EAAoE;AAEvD,QAAA,UAAU,GAAa;IACnC,IAAI,EAAE,MAAM;IACZ,WAAW,EAAE,wBAAwB;IACrC,UAAU,EAAE,EAAE;IACd,QAAQ,EAAE;QACT,0CAAgB;QAChB,oCAAa;KACb;IACK,GAAG;;;gBACR,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;;;KACnC;CACD,CAAC"}
1
+ {"version":3,"file":"appletTestCommand.js","sourceRoot":"","sources":["../../../src/Applet/Test/appletTestCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qEAA0E;AAC1E,sEAA8D;AAC9D,4EAAoE;AAEvD,QAAA,UAAU,GAAG,IAAA,2CAAuB,EAAC;IACjD,IAAI,EAAE,MAAM;IACZ,WAAW,EAAE,wBAAwB;IACrC,UAAU,EAAE,EAAE;IACd,QAAQ,EAAE;QACT,0CAAgB;QAChB,oCAAa;KACb;IACK,GAAG;;;gBACR,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;;;KACnC;CACD,CAAC,CAAC"}