@serverless-devs/s 2.0.81 → 2.0.84-alpha.10

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 (44) hide show
  1. package/.prettierrc.json +0 -1
  2. package/bin/s-set-analysis +2 -0
  3. package/bin/s-set-locale +2 -0
  4. package/lib/cli/cli-manager.js +6 -7
  5. package/lib/cli/index.js +2 -2
  6. package/lib/config/add/index.d.ts +0 -1
  7. package/lib/config/add/index.js +2 -2
  8. package/lib/config/delete/index.js +2 -2
  9. package/lib/config/get/index.js +2 -2
  10. package/lib/config/index.js +2 -2
  11. package/lib/core/command/command-manager.js +14 -15
  12. package/lib/core/component/index.js +4 -4
  13. package/lib/error/index.d.ts +1 -1
  14. package/lib/error/index.js +42 -3
  15. package/lib/index.js +10 -2
  16. package/lib/init/index.js +3 -52
  17. package/lib/init/init-config.d.ts +8 -41
  18. package/lib/init/init-config.js +163 -351
  19. package/lib/init/init-manager.d.ts +5 -2
  20. package/lib/init/init-manager.js +49 -55
  21. package/lib/onboarding/index.d.ts +2 -0
  22. package/lib/onboarding/index.js +123 -0
  23. package/lib/set/analysis/index.d.ts +1 -0
  24. package/lib/set/analysis/index.js +17 -0
  25. package/lib/set/index.d.ts +0 -1
  26. package/lib/set/index.js +2 -2
  27. package/lib/set/locale/index.d.ts +1 -0
  28. package/lib/set/locale/index.js +17 -0
  29. package/lib/set/registry/index.js +3 -3
  30. package/lib/specification/parse.js +4 -6
  31. package/lib/utils/common.d.ts +3 -1
  32. package/lib/utils/common.js +27 -76
  33. package/lib/utils/i18n/en.d.ts +40 -0
  34. package/lib/utils/i18n/en.js +42 -0
  35. package/lib/utils/i18n/index.d.ts +2 -0
  36. package/lib/utils/i18n/index.js +16 -0
  37. package/lib/utils/i18n/zh.d.ts +40 -0
  38. package/lib/utils/i18n/zh.js +42 -0
  39. package/lib/utils/index.d.ts +1 -0
  40. package/lib/utils/index.js +4 -2
  41. package/lib/utils/logger.d.ts +1 -0
  42. package/lib/utils/logger.js +4 -1
  43. package/package.json +6 -6
  44. package/post-publish.sh +3 -1
package/.prettierrc.json CHANGED
@@ -6,7 +6,6 @@
6
6
  "bracketSpacing": true,
7
7
  "jsxBracketSameLine": true,
8
8
  "arrowParens": "avoid",
9
- "insertPragma": true,
10
9
  "tabWidth": 2,
11
10
  "useTabs": false
12
11
  }
package/bin/s-set-analysis ADDED
@@ -0,0 +1,2 @@
1
+ #!/usr/bin/env node
2
+ require('../lib/set/analysis');
package/bin/s-set-locale ADDED
@@ -0,0 +1,2 @@
1
+ #!/usr/bin/env node
2
+ require('../lib/set/locale');
package/lib/cli/cli-manager.js CHANGED
@@ -46,8 +46,9 @@ var path_1 = __importDefault(require("path"));
46
46
  var os_1 = __importDefault(require("os"));
47
47
  var fs_1 = __importDefault(require("fs"));
48
48
  var common_1 = require("../utils/common");
49
+ var error_1 = require("../error");
49
50
  var s_core_1 = __importDefault(require("../utils/s-core"));
50
- var _a = (0, s_core_1.default)(), getCredential = _a.getCredential, loadComponent = _a.loadComponent;
51
+ var _a = (0, s_core_1.default)(), getCredential = _a.getCredential, loadComponent = _a.loadComponent, colors = _a.colors;
51
52
  var CliManager = /** @class */ (function () {
52
53
  function CliManager(inputs) {
53
54
  this.inputs = inputs;
@@ -187,19 +188,17 @@ var CliManager = /** @class */ (function () {
187
188
  return [3 /*break*/, 17];
188
189
  case 16:
189
190
  e_3 = _b.sent();
190
- utils_1.logger.error("Failed to execute:\n\n " + (0, common_1.emoji)('❌') + " Message: " + e_3.message + "\n " + (0, common_1.emoji)('🧭') + " You can get help for this component by [s cli " + component + " -h]\n " + (0, common_1.emoji)('😈') + " If you have questions, please tell us: https://github.com/Serverless-Devs/Serverless-Devs/issues\n");
191
- process.exit(-1);
191
+ (0, error_1.handleError)(e_3, 'Failed to execute:');
192
192
  return [3 /*break*/, 17];
193
193
  case 17: return [3 /*break*/, 19];
194
194
  case 18:
195
- utils_1.logger.error("Failed to execute:\n\n " + (0, common_1.emoji)('❌') + " Message: Component " + component + " does not include [" + command + "] method\n " + (0, common_1.emoji)('🧭') + " You can get help for this component by [s cli " + component + " -h]\n " + (0, common_1.emoji)('😈') + " If you have questions, please tell us: https://github.com/Serverless-Devs/Serverless-Devs/issues\n");
195
+ utils_1.logger.error("Failed to execute:\n\n " + (0, common_1.emoji)('❌') + " Message: Component " + component + " does not include [" + command + "] method\n " + (0, common_1.emoji)('🧭') + " You can get help for this component by [s cli " + component + " -h]\n " + (0, common_1.emoji)('😈') + " If you have questions, please tell us: " + colors.underline('https://github.com/Serverless-Devs/Serverless-Devs/issues') + "\n");
196
196
  process.exit(-1);
197
197
  _b.label = 19;
198
198
  case 19: return [3 /*break*/, 21];
199
199
  case 20:
200
200
  e_4 = _b.sent();
201
- utils_1.logger.error("Failed to execute:\n\n " + (0, common_1.emoji)('❌') + " Message: " + e_4.message + "\n " + (0, common_1.emoji)('🧭') + " You can get more component on: https://github.com/Serverless-Devs/package-awesome\n " + (0, common_1.emoji)('😈') + " If you have questions, please tell us: https://github.com/Serverless-Devs/Serverless-Devs/issues\n");
202
- process.exit(-1);
201
+ (0, error_1.handleError)(e_4, 'Failed to execute:');
203
202
  return [3 /*break*/, 21];
204
203
  case 21: return [2 /*return*/, result];
205
204
  }
@@ -209,4 +208,4 @@ var CliManager = /** @class */ (function () {
209
208
  return CliManager;
210
209
  }());
211
210
  exports.default = CliManager;
212
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpLW1hbmFnZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2xpL2NsaS1tYW5hZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxjQUFjOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUVkLGtDQUFrQztBQUNsQyxvREFBMkI7QUFDM0IsOENBQXdCO0FBQ3hCLDBDQUFvQjtBQUNwQiwwQ0FBb0I7QUFDcEIsMENBQXdDO0FBQ3hDLDJEQUFzQztBQUNoQyxJQUFBLEtBQW1DLElBQUEsZ0JBQU8sR0FBRSxFQUExQyxhQUFhLG1CQUFBLEVBQUUsYUFBYSxtQkFBYyxDQUFDO0FBUW5EO0lBR0Usb0JBQVksTUFBaUI7UUFDM0IsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUM7SUFDdkIsQ0FBQztJQUVELHNDQUFpQixHQUFqQixVQUFrQixRQUFnQixFQUFFLE1BQWM7UUFDaEQsSUFBTSxjQUFjLEdBQUcsUUFBUSxDQUFDLE1BQU0sQ0FBQztRQUN2QyxJQUFNLFNBQVMsR0FBRyxJQUFJLEtBQUssQ0FBQyxNQUFNLEdBQUcsY0FBYyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQy9ELE9BQU8sS0FBRyxRQUFRLEdBQUcsU0FBUyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsUUFBSyxDQUFDO0lBQy9DLENBQUM7SUFFSyx5QkFBSSxHQUFWOzs7Ozs7d0JBQ00sTUFBTSxHQUFHLEVBQUUsQ0FBQzs7Ozt3QkFFVixLQUF3QyxJQUFJLENBQUMsTUFBTSxFQUFqRCxTQUFTLGVBQUEsRUFBRSxPQUFPLGFBQUEsRUFBRSxNQUFNLFlBQUEsRUFBRSxLQUFLLFdBQUEsQ0FBaUI7d0JBRXBELFdBQVcsR0FBRyxFQUFFLENBQUM7Ozs7d0JBRWIsVUFBVSxHQUFHLGNBQUksQ0FBQyxJQUFJLENBQUMsWUFBRSxDQUFDLE9BQU8sRUFBRSxFQUFFLElBQUksRUFBRSxhQUFhLENBQUMs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
211
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpLW1hbmFnZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2xpL2NsaS1tYW5hZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxjQUFjOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUVkLGtDQUFrQztBQUNsQyxvREFBMkI7QUFDM0IsOENBQXdCO0FBQ3hCLDBDQUFvQjtBQUNwQiwwQ0FBb0I7QUFDcEIsMENBQXdDO0FBQ3hDLGtDQUF1QztBQUN2QywyREFBc0M7QUFDaEMsSUFBQSxLQUEyQyxJQUFBLGdCQUFPLEdBQUUsRUFBbEQsYUFBYSxtQkFBQSxFQUFFLGFBQWEsbUJBQUEsRUFBRSxNQUFNLFlBQWMsQ0FBQztBQVEzRDtJQUdFLG9CQUFZLE1BQWlCO1FBQzNCLElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDO0lBQ3ZCLENBQUM7SUFFRCxzQ0FBaUIsR0FBakIsVUFBa0IsUUFBZ0IsRUFBRSxNQUFjO1FBQ2hELElBQU0sY0FBYyxHQUFHLFFBQVEsQ0FBQyxNQUFNLENBQUM7UUFDdkMsSUFBTSxTQUFTLEdBQUcsSUFBSSxLQUFLLENBQUMsTUFBTSxHQUFHLGNBQWMsQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUMvRCxPQUFPLEtBQUcsUUFBUSxHQUFHLFNBQVMsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLFFBQUssQ0FBQztJQUMvQyxDQUFDO0lBRUsseUJBQUksR0FBVjs7Ozs7O3dCQUNNLE1BQU0sR0FBRyxFQUFFLENBQUM7Ozs7d0JBRVYsS0FBd0MsSUFBSSxDQUFDLE1BQU0sRUFBakQsU0FBUyxlQUFBLEVBQUUsT0FBTyxhQUFBLEVBQUUsTUFBTSxZQUFBLEVBQUUsS0FBSyxXQUFBLENBQWlCO3dCQUVwRCxXQUFXLEdBQUcsRUFBRSxDQUFDOzs7O3dCQUViLFVBQVUsR0FBRyxjQUFJLENBQUMsSUFBSSxDQUFDLFlBQUUsQ0FBQyxPQUFPLEVBQUUsRUFBRSxJQUFJLEVBQUUsYUFBYSxDQUFDLENBQUM7d0JBQzFELGNBQWMsR0FBRyxpQkFBSSxDQUFDLElBQUksQ0FBQyxZQUFFLENBQUMsWUFBWSxDQUFDLFVBQVUsRUFBRSxNQUFNLENBQUMsSUFBSSxJQUFJLENBQUMsQ0FBQzs2QkFDMUUsY0FBYyxDQUFDLE1BQU0sQ0FBQyxFQUF0Qix3QkFBc0I7d0JBQ1YscUJBQU0sYUFBYSxDQUFDLE1BQU0sQ0FBQyxFQUFBOzt3QkFBekMsV0FBVyxHQUFHLFNBQTJCLENBQUM7Ozs7O3dCQUc1QyxXQUFXLEdBQUcsRUFBRSxDQUFDOzs0QkFFTyxxQkFBTSxhQUFhLENBQUMsU0FBUyxFQUFFLElBQUksRUFBRSxFQUFFLE1BQU0sUUFBQSxFQUFFLENBQUMsRUFBQTs7d0JBQXBFLGlCQUFpQixHQUFHLFNBQWdEOzZCQUN0RSxpQkFBaUIsRUFBakIseUJBQWlCO3dCQUNuQixJQUFJLENBQUMsT0FBTyxFQUFFOzRCQUNaLElBQUksaUJBQWlCLENBQUMsT0FBTyxDQUFDLEVBQUU7Z0NBQzlCLE9BQU8sR0FBRyxPQUFPLENBQUM7NkJBQ25CO2lDQUFNO2dDQUNMLE9BQU8sR0FBRyxrQkFBa0IsQ0FBQzs2QkFDOUI7eUJBQ0Y7NkJBQ0csQ0FBQSxPQUFPLEtBQUssa0JBQWtCLENBQUEsRUFBOUIseUJBQThCOzZCQUM1QixDQUFBLGlCQUFpQixDQUFDLEtBQUssSUFBSSxpQkFBaUIsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxNQUFNLEdBQUcsSUFBSSxDQUFBLEVBQWxFLHdCQUFrRTt3QkFDOUQsU0FBUyxHQUFHLGlCQUFpQixDQUFDLEtBQUssRUFBRSxDQUFDO3dCQUM1QyxPQUFPLENBQUMsR0FBRyxDQUFDLEtBQUcsU0FBVyxDQUFDLENBQUM7Ozs7d0JBR3RCLGlCQUFpQixHQUFHLGNBQUksQ0FBQyxJQUFJLENBQUMsaUJBQWlCLENBQUMsTUFBTSxFQUFFLGFBQWEsQ0FBQyxDQUFDO3dCQUNyRSxxQkFBTSxZQUFFLENBQUMsVUFBVSxDQUFDLGlCQUFpQixDQUFDLEVBQUE7O3dCQUE1QyxJQUFJLENBQUMsQ0FBQyxTQUFzQyxDQUFDLEVBQUU7NEJBQzdDLGlCQUFpQixHQUFHLGNBQUksQ0FBQyxJQUFJLENBQUMsaUJBQWlCLENBQUMsTUFBTSxFQUFFLGNBQWMsQ0FBQyxDQUFDO3lCQUN6RTt3QkFDd0IscUJBQU0saUJBQUksQ0FBQyxJQUFJLENBQUMsWUFBRSxDQUFDLFlBQVksQ0FBQyxpQkFBaUIsRUFBRSxNQUFNLENBQUMsQ0FBQyxFQUFBOzt3QkFBOUUsZ0JBQWdCLEdBQUcsU0FBMkQ7d0JBQ3BGLE9BQU8sQ0FBQyxHQUFHLENBQ1QsU0FBTyxnQkFBZ0IsQ0FBQyxNQUFNLENBQUMsU0FBSSxnQkFBZ0IsQ0FBQyxTQUFTLENBQUMsVUFBSyxnQkFBZ0IsQ0FBQyxhQUFhLENBQUMsT0FBSSxDQUN2RyxDQUFDO3dCQUNFLFVBQVUsR0FBRyxDQUFDLENBQUM7d0JBQ25CLElBQUksZ0JBQWdCLENBQUMsVUFBVSxDQUFDLEVBQUU7NEJBQ2hDLEtBQVcsSUFBSSxJQUFJLGdCQUFnQixDQUFDLFVBQVUsQ0FBQyxFQUFFO2dDQUMvQyxJQUFJLElBQUksQ0FBQyxNQUFNLEdBQUcsVUFBVSxFQUFFO29DQUM1QixVQUFVLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQztpQ0FDMUI7NkJBQ0Y7NEJBQ0QsS0FBVyxJQUFJLElBQUksZ0JBQWdCLENBQUMsVUFBVSxDQUFDLEVBQUU7Z0NBQy9DLE9BQU8sQ0FBQyxHQUFHLENBQUMsU0FBTyxJQUFJLENBQUMsaUJBQWlCLENBQUMsSUFBSSxFQUFFLFVBQVUsQ0FBQyxTQUFJLGdCQUFnQixDQUFDLFVBQVUsQ0FBQyxDQUFDLElBQUksQ0FBRyxDQUFDLENBQUM7NkJBQ3RHOzRCQUNELE9BQU8sQ0FBQyxHQUFHLENBQ1QsVUFDRSxnQkFBZ0IsQ0FBQyxVQUFVLENBQUM7Z0NBQzFCLENBQUMsQ0FBSSxJQUFBLGNBQUssRUFBQyxJQUFJLENBQUMsd0JBQXFCLEdBQUcsZ0JBQWdCLENBQUMsVUFBVSxDQUFDLEdBQUcsSUFBSTtnQ0FDM0UsQ0FBQyxDQUFDLEVBQUUsQ0FDTixDQUNILENBQUM7eUJBQ0g7Ozs7d0JBRUQsY0FBTSxDQUFDLEtBQUssQ0FBQyxxQ0FBcUMsQ0FBQyxDQUFDOzs2QkFHeEQsc0JBQU8sTUFBTSxFQUFDOzs2QkFFWixpQkFBaUIsQ0FBQyxPQUFPLENBQUMsRUFBMUIseUJBQTBCO3dCQUN4QixRQUFRLEdBQUcsRUFBRSxDQUFDO3dCQUNsQixJQUFJOzRCQUNGLFFBQVEsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEtBQUssSUFBSSxJQUFJLENBQUMsQ0FBQzt5QkFDdEM7d0JBQUMsT0FBTyxDQUFDLEVBQUU7NEJBQ1YsTUFBTSxJQUFJLEtBQUssQ0FBQyxrQ0FBa0MsQ0FBQyxDQUFDO3lCQUNyRDs7Ozt3QkFHSSxxQkFBTSxpQkFBaUIsQ0FBQyxPQUFPLENBQUMsQ0FBQztnQ0FDaEMsS0FBSyxFQUFFLFFBQVE7Z0NBQ2YsVUFBVSxFQUFFLFFBQVE7Z0NBQ3BCLFdBQVcsRUFBRSxXQUFXO2dDQUN4QixXQUFXLEVBQUUsV0FBVztnQ0FDeEIsT0FBTyxFQUFFLFNBQVM7Z0NBQ2xCLE9BQU8sRUFBRTtvQ0FDUCxXQUFXLEVBQUUsU0FBUztvQ0FDdEIsV0FBVyxFQUFFLFNBQVM7b0NBQ3RCLFNBQVMsRUFBRSxTQUFTO29DQUNwQixTQUFTLEVBQUUsU0FBUztvQ0FDcEIsUUFBUSxFQUFFLFNBQVM7b0NBQ25CLFFBQVEsRUFBRSxTQUFTO29DQUNuQixXQUFXLEVBQUUsTUFBTSxJQUFJLFNBQVM7b0NBQ2hDLFdBQVcsRUFBRSxNQUFNLElBQUksU0FBUztpQ0FDakM7Z0NBQ0QsT0FBTyxFQUFFO29DQUNQLFNBQVMsRUFBRSxFQUFFO29DQUNiLE1BQU0sRUFBRSxNQUFNLElBQUksU0FBUztvQ0FDM0IsV0FBVyxFQUFFLEVBQUU7aUNBQ2hCO2dDQUNELE9BQU8sRUFBRSxPQUFPO2dDQUNoQixPQUFPLEVBQUUsT0FBTztnQ0FDaEIsSUFBSSxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsV0FBVztnQ0FDN0IsT0FBTyxFQUFFLE9BQU8sQ0FBQyxhQUFhLENBQUM7Z0NBQy9CLElBQUksRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLFdBQVc7Z0NBQzdCLE9BQU8sRUFBRSxPQUFPLENBQUMsYUFBYSxDQUFDO2dDQUMvQixJQUFJLEVBQUU7b0NBQ0osVUFBVSxFQUFFLEVBQUU7aUNBQ2Y7Z0NBQ0QsSUFBSSxFQUFFO29DQUNKLFVBQVUsRUFBRSxFQUFFO2lDQUNmOzZCQUNGLENBQUMsRUFBQTs7d0JBbENKLE1BQU07NEJBQ0osQ0FBQyxTQWlDQyxDQUFDLElBQUksRUFBRSxDQUFDO3dCQUVSLFNBQVMsR0FBRyxpQkFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDO3dCQUU5RCxjQUFNLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsTUFBTSxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsb0JBQWtCLE9BQVMsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUM7Ozs7d0JBRTNGLElBQUEsbUJBQVcsRUFBQyxHQUFDLEVBQUUsb0JBQW9CLENBQUMsQ0FBQzs7Ozt3QkFHdkMsY0FBTSxDQUFDLEtBQUssQ0FBQyw2QkFDbkIsSUFBQSxjQUFLLEVBQUMsR0FBRyxDQUFDLDRCQUF1QixTQUFTLDJCQUFzQixPQUFPLG9CQUN2RSxJQUFBLGNBQUssRUFBQyxJQUFJLENBQUMsdURBQWtELFNBQVMsZ0JBQ3RFLElBQUEsY0FBSyxFQUFDLElBQUksQ0FBQyxnREFBMkMsTUFBTSxDQUFDLFNBQVMsQ0FDOUQsMkRBQTJELENBQzVELE9BQUksQ0FBQyxDQUFDO3dCQUNQLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQzs7Ozs7d0JBSXJCLElBQUEsbUJBQVcsRUFBQyxHQUFDLEVBQUUsb0JBQW9CLENBQUMsQ0FBQzs7NkJBRXZDLHNCQUFPLE1BQU0sRUFBQzs7OztLQUNmO0lBQ0gsaUJBQUM7QUFBRCxDQUFDLEFBNUlELElBNElDIn0=