@serverless-devs/s 2.0.83 → 2.0.84-alpha.4
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.
- package/.prettierrc.json +0 -1
- package/bin/s-set-analysis +2 -0
- package/bin/s-set-locale +2 -0
- package/lib/cli/cli-manager.js +6 -7
- package/lib/cli/index.js +2 -2
- package/lib/config/add/index.d.ts +0 -1
- package/lib/config/add/index.js +2 -2
- package/lib/config/delete/index.js +2 -2
- package/lib/config/get/index.js +2 -2
- package/lib/config/index.js +2 -2
- package/lib/core/command/command-manager.js +14 -15
- package/lib/core/component/index.js +4 -4
- package/lib/error/index.d.ts +1 -1
- package/lib/error/index.js +36 -3
- package/lib/index.js +10 -2
- package/lib/init/index.js +3 -52
- package/lib/init/init-config.d.ts +8 -41
- package/lib/init/init-config.js +163 -351
- package/lib/init/init-manager.d.ts +5 -2
- package/lib/init/init-manager.js +49 -55
- package/lib/onboarding/index.d.ts +2 -0
- package/lib/onboarding/index.js +123 -0
- package/lib/set/analysis/index.d.ts +1 -0
- package/lib/set/analysis/index.js +17 -0
- package/lib/set/index.d.ts +0 -1
- package/lib/set/index.js +2 -2
- package/lib/set/locale/index.d.ts +1 -0
- package/lib/set/locale/index.js +17 -0
- package/lib/set/registry/index.js +3 -3
- package/lib/specification/parse.js +4 -6
- package/lib/utils/common.d.ts +3 -1
- package/lib/utils/common.js +27 -76
- package/lib/utils/i18n/en.d.ts +39 -0
- package/lib/utils/i18n/en.js +41 -0
- package/lib/utils/i18n/index.d.ts +2 -0
- package/lib/utils/i18n/index.js +16 -0
- package/lib/utils/i18n/zh.d.ts +39 -0
- package/lib/utils/i18n/zh.js +41 -0
- package/lib/utils/index.d.ts +1 -0
- package/lib/utils/index.js +4 -2
- package/lib/utils/logger.d.ts +1 -0
- package/lib/utils/logger.js +4 -1
- package/package.json +6 -6
- package/post-publish.sh +3 -1
|
@@ -46,7 +46,9 @@ var specification_1 = require("../../specification");
|
|
|
46
46
|
var utils_1 = require("../../utils");
|
|
47
47
|
var component_1 = require("../component");
|
|
48
48
|
var common_1 = require("../../utils/common");
|
|
49
|
-
var
|
|
49
|
+
var error_1 = require("../../error");
|
|
50
|
+
var s_core_1 = __importDefault(require("../../utils/s-core"));
|
|
51
|
+
var colors = (0, s_core_1.default)().colors;
|
|
50
52
|
var getServiceConfig = specification_1.version.getServiceConfig;
|
|
51
53
|
var CommandManager = /** @class */ (function () {
|
|
52
54
|
function CommandManager(templateFile, method, customerCommandName, params) {
|
|
@@ -76,13 +78,13 @@ var CommandManager = /** @class */ (function () {
|
|
|
76
78
|
};
|
|
77
79
|
CommandManager.prototype.init = function () {
|
|
78
80
|
return __awaiter(this, void 0, void 0, function () {
|
|
79
|
-
var templateFile, outPutData, parse, parsedObj, realVariables, analysis, executeOrderList, tempCustomerCommandName, projectConfig, componentExecute, tempResult, e_1,
|
|
81
|
+
var templateFile, outPutData, parse, parsedObj, realVariables, analysis, executeOrderList, tempCustomerCommandName, projectConfig, componentExecute, tempResult, e_1, params, componentList, tempResult, item, outResult, e_2;
|
|
80
82
|
return __generator(this, function (_a) {
|
|
81
83
|
switch (_a.label) {
|
|
82
84
|
case 0:
|
|
83
85
|
_a.trys.push([0, 12, , 13]);
|
|
84
86
|
utils_1.logger.info('Start ...');
|
|
85
|
-
templateFile = checkTemplateFile(this.templateFile);
|
|
87
|
+
templateFile = (0, common_1.checkTemplateFile)(this.templateFile);
|
|
86
88
|
if (!templateFile) return [3 /*break*/, 10];
|
|
87
89
|
outPutData = {};
|
|
88
90
|
parse = new specification_1.Parse(templateFile);
|
|
@@ -114,11 +116,7 @@ var CommandManager = /** @class */ (function () {
|
|
|
114
116
|
return [3 /*break*/, 6];
|
|
115
117
|
case 5:
|
|
116
118
|
e_1 = _a.sent();
|
|
117
|
-
|
|
118
|
-
? "Project " + projectConfig.ProjectName + " does not include [" + this.method + "] method"
|
|
119
|
-
: e_1.message;
|
|
120
|
-
utils_1.logger.error("Project " + projectConfig.ProjectName + " failed to execute:\n \n " + (0, common_1.emoji)('📝') + " Message: " + errorMessage + "\n " + (0, common_1.emoji)('🧭') + " You can get help for this component by [s " + projectConfig.ProjectName + " -h]\n " + (0, common_1.emoji)('😈') + " If you have questions, please tell us: https://github.com/Serverless-Devs/Serverless-Devs/issues\n");
|
|
121
|
-
process.exit(-1);
|
|
119
|
+
(0, error_1.handleError)(e_1, "Project " + projectConfig.ProjectName + " failed to execute:");
|
|
122
120
|
return [3 /*break*/, 6];
|
|
123
121
|
case 6: return [3 /*break*/, 9];
|
|
124
122
|
case 7:
|
|
@@ -135,24 +133,25 @@ var CommandManager = /** @class */ (function () {
|
|
|
135
133
|
}
|
|
136
134
|
_a.label = 9;
|
|
137
135
|
case 9:
|
|
138
|
-
outResult =
|
|
136
|
+
outResult = JSON.parse(JSON.stringify(outPutData));
|
|
139
137
|
if (process.env['s-execute-file']) {
|
|
140
|
-
utils_1.logger.error("All projects were not deployed successfully.\n \n" + js_yaml_1.default.dump(JSON.parse(process.env['s-execute-file'])['Error']) + " " + (0, common_1.emoji)('😈') + " If you have questions, please tell us: https://github.com/Serverless-Devs/Serverless-Devs/issues\n");
|
|
138
|
+
utils_1.logger.error("All projects were not deployed successfully.\n \n" + js_yaml_1.default.dump(JSON.parse(process.env['s-execute-file'])['Error']) + " " + (0, common_1.emoji)('😈') + " If you have questions, please tell us: " + colors.underline('https://github.com/Serverless-Devs/Serverless-Devs/issues') + "\n");
|
|
141
139
|
process.exit(-1);
|
|
142
140
|
}
|
|
143
141
|
else {
|
|
144
|
-
|
|
142
|
+
Object.keys(outPutData).length === 0
|
|
143
|
+
? utils_1.logger.success("End of method: " + this.method)
|
|
144
|
+
: utils_1.logger.output(outResult);
|
|
145
145
|
}
|
|
146
146
|
return [3 /*break*/, 11];
|
|
147
147
|
case 10:
|
|
148
|
-
utils_1.logger.error("Failed to execute:\n\n " + (0, common_1.emoji)('❌') + " Message: Cannot find s.yaml / s.yml / template.yaml / template.yml file, please check the directory " + this.templateFile + "\n " + (0, common_1.emoji)('🧭') + " If you want to use Serverless Devs, you should have a s.yaml or use [s cli] command.\n " + (0, common_1.emoji)('1️⃣') + " Yaml document: https://github.com/Serverless-Devs/docs/blob/master/zh/yaml.md\n " + (0, common_1.emoji)('2️⃣') + " Cli document: [s cli -h]\n " + (0, common_1.emoji)('😈') + " If you have questions, please tell us: https://github.com/Serverless-Devs/Serverless-Devs/issues\n");
|
|
148
|
+
utils_1.logger.error("Failed to execute:\n\n " + (0, common_1.emoji)('❌') + " Message: Cannot find s.yaml / s.yml / template.yaml / template.yml file, please check the directory " + this.templateFile + "\n " + (0, common_1.emoji)('🧭') + " If you want to use Serverless Devs, you should have a s.yaml or use [s cli] command.\n " + (0, common_1.emoji)('1️⃣') + " Yaml document: " + colors.underline('https://github.com/Serverless-Devs/docs/blob/master/zh/yaml.md') + "\n " + (0, common_1.emoji)('2️⃣') + " Cli document: [s cli -h]\n " + (0, common_1.emoji)('😈') + " If you have questions, please tell us: " + colors.underline('https://github.com/Serverless-Devs/Serverless-Devs/issues') + "\n");
|
|
149
149
|
process.exit(-1);
|
|
150
150
|
_a.label = 11;
|
|
151
151
|
case 11: return [3 /*break*/, 13];
|
|
152
152
|
case 12:
|
|
153
153
|
e_2 = _a.sent();
|
|
154
|
-
|
|
155
|
-
process.exit(-1);
|
|
154
|
+
(0, error_1.handleError)(e_2, 'Failed to execute:');
|
|
156
155
|
return [3 /*break*/, 13];
|
|
157
156
|
case 13: return [2 /*return*/];
|
|
158
157
|
}
|
|
@@ -162,4 +161,4 @@ var CommandManager = /** @class */ (function () {
|
|
|
162
161
|
return CommandManager;
|
|
163
162
|
}());
|
|
164
163
|
exports.CommandManager = CommandManager;
|
|
165
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
164
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tbWFuZC1tYW5hZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvcmUvY29tbWFuZC9jb21tYW5kLW1hbmFnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLGNBQWM7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUVkLG9EQUEyQjtBQUMzQixxREFBK0Q7QUFDL0QscUNBQXFDO0FBQ3JDLDBDQUtzQjtBQUN0Qiw2Q0FBOEQ7QUFDOUQscUNBQTBDO0FBQzFDLDhEQUF5QztBQUNqQyxJQUFBLE1BQU0sR0FBSyxJQUFBLGdCQUFPLEdBQUUsT0FBZCxDQUFlO0FBQ3JCLElBQUEsZ0JBQWdCLEdBQUssdUJBQU8saUJBQVosQ0FBYTtBQUVyQztJQUdFLHdCQUNZLFlBQW9CLEVBQ3BCLE1BQWMsRUFDZCxtQkFBNEIsRUFDdEMsTUFBWTtRQUhGLGlCQUFZLEdBQVosWUFBWSxDQUFRO1FBQ3BCLFdBQU0sR0FBTixNQUFNLENBQVE7UUFDZCx3QkFBbUIsR0FBbkIsbUJBQW1CLENBQVM7UUFHdEMsSUFBSSxDQUFDLFlBQVksR0FBRyxNQUFNLENBQUM7SUFDN0IsQ0FBQztJQUVLLDhDQUFxQixHQUEzQixVQUE0QixLQUFZLEVBQUUsV0FBbUIsRUFBRSxTQUFjOzs7Ozs0QkFDckQscUJBQU0sS0FBSyxDQUFDLGdCQUFnQixDQUFDLFNBQVMsQ0FBQyxFQUFBOzt3QkFBdkQsYUFBYSxHQUFHLFNBQXVDO3dCQUN2RCxhQUFhLEdBQVEsZ0JBQWdCLENBQUMsYUFBYSxFQUFFLFdBQVcsQ0FBQyxDQUFDO3dCQUN4RSxhQUFhLENBQUMsT0FBTyxHQUFHLGFBQWEsQ0FBQyxJQUFJLENBQUMsQ0FBQyxZQUFZO3dCQUN4RCxhQUFhLENBQUMsV0FBVyxHQUFHLFdBQVcsQ0FBQzt3QkFDeEMsSUFBSSxJQUFJLENBQUMsWUFBWSxFQUFFOzRCQUNyQixhQUFhLENBQUMsTUFBTSxHQUFHLElBQUksQ0FBQyxZQUFZLENBQUM7eUJBQzFDO3dCQUNELHNCQUFPLGFBQWEsRUFBQzs7OztLQUN0QjtJQUVLLDZCQUFJLEdBQVY7Ozs7Ozs7d0JBRUksY0FBTSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQzt3QkFDbkIsWUFBWSxHQUFHLElBQUEsMEJBQWlCLEVBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxDQUFDOzZCQUN0RCxZQUFZLEVBQVoseUJBQVk7d0JBQ1IsVUFBVSxHQUFRLEVBQUUsQ0FBQzt3QkFDckIsS0FBSyxHQUFHLElBQUkscUJBQUssQ0FBQyxZQUFZLENBQUMsQ0FBQzt3QkFDaEMsU0FBUyxHQUFHLEtBQUssQ0FBQyxvQkFBb0IsRUFBRSxDQUFDO3dCQUN6QixxQkFBTSxLQUFLLENBQUMsZ0JBQWdCLENBQUMsU0FBUyxDQUFDLEVBQUE7O3dCQUF2RCxhQUFhLEdBQUcsU0FBdUM7d0JBQ3ZELFFBQVEsR0FBRyxJQUFJLHdCQUFRLENBQUMsYUFBYSxFQUFFLEtBQUssQ0FBQyxlQUFlLENBQUMsQ0FBQzt3QkFDOUQsZ0JBQWdCLEdBQUcsUUFBUSxDQUFDLGVBQWUsRUFBRSxDQUFDOzZCQUNoRCxDQUFBLElBQUksQ0FBQyxtQkFBbUIsSUFBSSxnQkFBZ0IsQ0FBQyxNQUFNLEtBQUssQ0FBQyxDQUFBLEVBQXpELHdCQUF5RDt3QkFDckQsdUJBQXVCLEdBQUcsZ0JBQWdCLENBQUMsQ0FBQyxDQUFDLENBQUM7d0JBQzlCLHFCQUFNLElBQUksQ0FBQyxxQkFBcUIsQ0FDcEQsS0FBSyxFQUNMLElBQUksQ0FBQyxtQkFBbUIsSUFBSSx1QkFBdUIsRUFDbkQsU0FBUyxDQUNWLEVBQUE7O3dCQUpLLGFBQWEsR0FBRyxTQUlyQjt3QkFDRCxJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsNkJBQTZCLENBQUMsRUFBRTs0QkFDOUMsYUFBYSxDQUFDLE1BQU0sR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLDZCQUE2QixDQUFDLENBQUM7NEJBQ2xFLGFBQWEsQ0FBQyxNQUFNLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyw2QkFBNkIsQ0FBQyxDQUFDO3lCQUNuRTt3QkFDSyxnQkFBZ0IsR0FBRyxJQUFJLDRCQUFnQixDQUFDLGFBQWEsRUFBRSxJQUFJLENBQUMsTUFBTSxFQUFFLFNBQVMsQ0FBQyxPQUFPLEVBQUUsWUFBWSxDQUFDLENBQUM7Ozs7d0JBRXRGLHFCQUFNLGdCQUFnQixDQUFDLElBQUksRUFBRSxFQUFBOzt3QkFBMUMsVUFBVSxHQUFHLFNBQTZCO3dCQUNoRCxJQUFJLFVBQVUsRUFBRTs0QkFDZCxVQUFVLENBQUMsYUFBYSxDQUFDLFdBQVcsQ0FBQyxHQUFHLFVBQVUsQ0FBQzt5QkFDcEQ7Ozs7d0JBRUQsSUFBQSxtQkFBVyxFQUFDLEdBQUMsRUFBRSxhQUFXLGFBQWEsQ0FBQyxXQUFXLHdCQUFxQixDQUFDLENBQUM7Ozs7d0JBR3RFLE1BQU0sR0FBRyxJQUFJLENBQUMsWUFBWSxJQUFJLEVBQUUsQ0FBQzt3QkFDdkMsY0FBTSxDQUFDLElBQUksQ0FDVCxtRUFBaUUsZ0JBQWdCLENBQUMsSUFBSSxDQUNwRixHQUFHLENBQ0oscUJBQWtCLENBQ3BCLENBQUM7d0JBRUksYUFBYSxHQUFHLElBQUEsK0NBQW1DLEVBQ3ZELEVBQUUsSUFBSSxFQUFFLGdCQUFnQixFQUFFLEtBQUssT0FBQSxFQUFFLFNBQVMsV0FBQSxFQUFFLE1BQU0sRUFBRSxJQUFJLENBQUMsTUFBTSxFQUFFLE1BQU0sUUFBQSxFQUFFLEVBQ3pFLElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQ3RDLENBQUM7d0JBQ2lCLHFCQUFNLElBQUEsMkNBQStCLEVBQUMsYUFBYSxDQUFDLEVBQUE7O3dCQUFqRSxVQUFVLEdBQUcsU0FBb0Q7d0JBQ3ZFLEtBQVcsSUFBSSxJQUFJLFVBQVUsRUFBRTs0QkFDN0IsSUFBSSxnQkFBZ0IsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLElBQUksVUFBVSxDQUFDLElBQUksQ0FBQyxFQUFFO2dDQUN2RCxVQUFVLENBQUMsSUFBSSxDQUFDLEdBQUcsVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFDOzZCQUNyQzt5QkFDRjs7O3dCQUVHLFNBQVMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQzt3QkFDekQsSUFBSSxPQUFPLENBQUMsR0FBRyxDQUFDLGdCQUFnQixDQUFDLEVBQUU7NEJBQ2pDLGNBQU0sQ0FBQyxLQUFLLENBQUMsdURBRXJCLGlCQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsVUFBSyxJQUFBLGNBQUssRUFDN0QsSUFBSSxDQUNMLGdEQUEyQyxNQUFNLENBQUMsU0FBUyxDQUMxRCwyREFBMkQsQ0FDNUQsT0FDVixDQUFDLENBQUM7NEJBQ08sT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO3lCQUNsQjs2QkFBTTs0QkFDTCxNQUFNLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDLE1BQU0sS0FBSyxDQUFDO2dDQUNsQyxDQUFDLENBQUMsY0FBTSxDQUFDLE9BQU8sQ0FBQyxvQkFBa0IsSUFBSSxDQUFDLE1BQVEsQ0FBQztnQ0FDakQsQ0FBQyxDQUFDLGNBQU0sQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDLENBQUM7eUJBQzlCOzs7d0JBRUQsY0FBTSxDQUFDLEtBQUssQ0FBQyw2QkFDakIsSUFBQSxjQUFLLEVBQUMsR0FBRyxDQUFDLDZHQUNKLElBQUksQ0FBQyxZQUFZLFlBRXZCLElBQUEsY0FBSyxFQUFDLElBQUksQ0FBQyxxR0FDUCxJQUFBLGNBQUssRUFBQyxLQUFLLENBQUMsd0JBQW1CLE1BQU0sQ0FBQyxTQUFTLENBQzdDLGdFQUFnRSxDQUNqRSxnQkFDRCxJQUFBLGNBQUssRUFBQyxLQUFLLENBQUMscUNBQ2hCLElBQUEsY0FBSyxFQUFDLElBQUksQ0FBQyxnREFBMkMsTUFBTSxDQUFDLFNBQVMsQ0FDaEUsMkRBQTJELENBQzVELE9BQUksQ0FBQyxDQUFDO3dCQUNQLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQzs7Ozs7d0JBR25CLElBQUEsbUJBQVcsRUFBQyxHQUFDLEVBQUUsb0JBQW9CLENBQUMsQ0FBQzs7Ozs7O0tBRXhDO0lBQ0gscUJBQUM7QUFBRCxDQUFDLEFBNUdELElBNEdDO0FBNUdZLHdDQUFjIn0=
|
|
@@ -49,7 +49,7 @@ var specification_1 = require("../../specification");
|
|
|
49
49
|
var utils_1 = require("../../utils");
|
|
50
50
|
var hook_1 = require("./hook");
|
|
51
51
|
var js_yaml_1 = __importDefault(require("js-yaml"));
|
|
52
|
-
var
|
|
52
|
+
var error_1 = require("../../error");
|
|
53
53
|
var s_core_1 = __importDefault(require("../../utils/s-core"));
|
|
54
54
|
var _a = (0, s_core_1.default)(), getCredential = _a.getCredential, loadComponent = _a.loadComponent;
|
|
55
55
|
var getServiceConfigDetail = specification_1.version.getServiceConfigDetail, getServiceInputs = specification_1.version.getServiceInputs, getServiceActions = specification_1.version.getServiceActions;
|
|
@@ -124,12 +124,12 @@ function generateSynchronizeComponentExeList(_a, equipment) {
|
|
|
124
124
|
e_1 = _a.sent();
|
|
125
125
|
tempError = JSON.parse(process.env['s-execute-file'] || '{"Error": []}');
|
|
126
126
|
tempErrorAttr = {};
|
|
127
|
-
tempErrorAttr[projectName] = e_1.message.includes('
|
|
127
|
+
tempErrorAttr[projectName] = e_1.message.includes('e[t] is not a function')
|
|
128
128
|
? "Project " + projectName + " does not include [" + method + "] method"
|
|
129
129
|
: e_1.message;
|
|
130
130
|
tempError['Error'].push(tempErrorAttr);
|
|
131
131
|
process.env['s-execute-file'] = JSON.stringify(tempError);
|
|
132
|
-
|
|
132
|
+
(0, error_1.handleError)(e_1, "Project " + projectName + " failed to execute:", false);
|
|
133
133
|
resolve({});
|
|
134
134
|
return [3 /*break*/, 4];
|
|
135
135
|
case 4: return [2 /*return*/];
|
|
@@ -326,4 +326,4 @@ var ComponentExeCute = /** @class */ (function () {
|
|
|
326
326
|
return ComponentExeCute;
|
|
327
327
|
}());
|
|
328
328
|
exports.ComponentExeCute = ComponentExeCute;
|
|
329
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
329
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29yZS9jb21wb25lbnQvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLGNBQWM7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUVkLDBDQUFvQjtBQUNwQiw4Q0FBd0I7QUFDeEIsMENBQW9CO0FBRXBCLG1FQUFvRTtBQUNwRSxxREFBcUQ7QUFDckQscUNBQWdEO0FBQ2hELCtCQUE4QjtBQUM5QixvREFBMkI7QUFDM0IscUNBQTBDO0FBQzFDLDhEQUF5QztBQUNuQyxJQUFBLEtBQW1DLElBQUEsZ0JBQU8sR0FBRSxFQUExQyxhQUFhLG1CQUFBLEVBQUUsYUFBYSxtQkFBYyxDQUFDO0FBRTNDLElBQUEsc0JBQXNCLEdBQTBDLHVCQUFPLHVCQUFqRCxFQUFFLGdCQUFnQixHQUF3Qix1QkFBTyxpQkFBL0IsRUFBRSxpQkFBaUIsR0FBSyx1QkFBTyxrQkFBWixDQUFhO0FBQ2hGLElBQU0scUJBQXFCLEdBQUcsY0FBSSxDQUFDLElBQUksQ0FBQyxZQUFFLENBQUMsT0FBTyxFQUFFLEVBQUUsSUFBSSxFQUFFLFlBQVksQ0FBQyxDQUFDO0FBMkIxRSxTQUFzQiwrQkFBK0IsQ0FBQyxJQUFjLEVBQUUsS0FBYyxFQUFFLFFBQWtCO0lBQWxELHFCQUFBLEVBQUEsU0FBYztJQUFFLHNCQUFBLEVBQUEsU0FBYztJQUFFLHlCQUFBLEVBQUEsYUFBa0I7Ozs7Ozt5QkFDbEcsQ0FBQSxLQUFLLElBQUksQ0FBQyxJQUFJLEtBQUssR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFBLEVBQWpDLHdCQUFpQztvQkFDNUIscUJBQU0sSUFBSSxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLFVBQU8sRUFBbUI7Z0NBQWpCLElBQUksVUFBQSxFQUFFLElBQUksVUFBQTs7Ozs7NENBQ2pELElBQUksSUFBSSxFQUFFO2dEQUNSLFFBQVEsQ0FB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
|
package/lib/error/index.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
/** @format */
|
|
2
1
|
export { CommandError } from './command-error';
|
|
3
2
|
export { ConfigDeleteError } from './config-delete-error';
|
|
4
3
|
export { ConfigError } from './config-error';
|
|
5
4
|
export { ConfigGetError } from './config-get-error';
|
|
6
5
|
export { InitError } from './init-error';
|
|
7
6
|
export { ServerlessError } from './serverless-error';
|
|
7
|
+
export declare function handleError(error: Error, prefix?: string, exit?: boolean): void;
|
package/lib/error/index.js
CHANGED
|
@@ -1,7 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
3
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
-
exports.ServerlessError = exports.InitError = exports.ConfigGetError = exports.ConfigError = exports.ConfigDeleteError = exports.CommandError = void 0;
|
|
6
|
+
exports.handleError = exports.ServerlessError = exports.InitError = exports.ConfigGetError = exports.ConfigError = exports.ConfigDeleteError = exports.CommandError = void 0;
|
|
7
|
+
/** @format */
|
|
8
|
+
var common_1 = require("../utils/common");
|
|
9
|
+
var s_core_1 = __importDefault(require("../utils/s-core"));
|
|
10
|
+
var _a = (0, s_core_1.default)(), colors = _a.colors, report = _a.report, getMAC = _a.getMAC;
|
|
11
|
+
var pkg = require('../../package.json');
|
|
5
12
|
var command_error_1 = require("./command-error");
|
|
6
13
|
Object.defineProperty(exports, "CommandError", { enumerable: true, get: function () { return command_error_1.CommandError; } });
|
|
7
14
|
var config_delete_error_1 = require("./config-delete-error");
|
|
@@ -14,4 +21,30 @@ var init_error_1 = require("./init-error");
|
|
|
14
21
|
Object.defineProperty(exports, "InitError", { enumerable: true, get: function () { return init_error_1.InitError; } });
|
|
15
22
|
var serverless_error_1 = require("./serverless-error");
|
|
16
23
|
Object.defineProperty(exports, "ServerlessError", { enumerable: true, get: function () { return serverless_error_1.ServerlessError; } });
|
|
17
|
-
|
|
24
|
+
var pid = getMAC().replace(/:/g, '');
|
|
25
|
+
function underline(prefix, link) {
|
|
26
|
+
return "" + colors.gray(prefix) + colors.gray.underline(link);
|
|
27
|
+
}
|
|
28
|
+
function handleError(error, prefix, exit) {
|
|
29
|
+
if (prefix === void 0) { prefix = 'Message:'; }
|
|
30
|
+
if (exit === void 0) { exit = true; }
|
|
31
|
+
var traceId = "" + pid + Date.now();
|
|
32
|
+
console.log((0, common_1.red)("\u2716 " + prefix));
|
|
33
|
+
console.log(colors.gray("\nTraceId: " + traceId));
|
|
34
|
+
console.log(colors.gray("Environment: " + pkg.name + ": " + pkg.version + ", " + process.platform + "-" + process.arch + ", node-" + process.version));
|
|
35
|
+
console.log(underline('Documents: ', 'https://www.serverless-devs.com'));
|
|
36
|
+
console.log(underline('Discussions: ', 'https://github.com/Serverless-Devs/Serverless-Devs/discussions'));
|
|
37
|
+
console.log(underline('Issues: ', 'https://github.com/Serverless-Devs/Serverless-Devs/issues\n'));
|
|
38
|
+
console.log((0, common_1.bgRed)('ERROR:'));
|
|
39
|
+
console.log(error);
|
|
40
|
+
console.log(colors.gray("\nPlease copy traceId: " + traceId + " and join Dingding group: 33947367 for consultation."));
|
|
41
|
+
console.log(colors.gray("Run again with the '--debug' option or 's -h' to get more logs."));
|
|
42
|
+
report({
|
|
43
|
+
type: 'jsError',
|
|
44
|
+
content: error,
|
|
45
|
+
traceId: traceId,
|
|
46
|
+
});
|
|
47
|
+
exit && process.exit(-1);
|
|
48
|
+
}
|
|
49
|
+
exports.handleError = handleError;
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZXJyb3IvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsY0FBYztBQUNkLDBDQUE2QztBQUM3QywyREFBc0M7QUFDaEMsSUFBQSxLQUE2QixJQUFBLGdCQUFPLEdBQUUsRUFBcEMsTUFBTSxZQUFBLEVBQUUsTUFBTSxZQUFBLEVBQUUsTUFBTSxZQUFjLENBQUM7QUFDN0MsSUFBTSxHQUFHLEdBQUcsT0FBTyxDQUFDLG9CQUFvQixDQUFDLENBQUM7QUFDMUMsaURBQStDO0FBQXRDLDZHQUFBLFlBQVksT0FBQTtBQUNyQiw2REFBMEQ7QUFBakQsd0hBQUEsaUJBQWlCLE9BQUE7QUFDMUIsK0NBQTZDO0FBQXBDLDJHQUFBLFdBQVcsT0FBQTtBQUNwQix1REFBb0Q7QUFBM0Msa0hBQUEsY0FBYyxPQUFBO0FBQ3ZCLDJDQUF5QztBQUFoQyx1R0FBQSxTQUFTLE9BQUE7QUFDbEIsdURBQXFEO0FBQTVDLG1IQUFBLGVBQWUsT0FBQTtBQUV4QixJQUFNLEdBQUcsR0FBRyxNQUFNLEVBQUUsQ0FBQyxPQUFPLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDO0FBRXZDLFNBQVMsU0FBUyxDQUFDLE1BQWMsRUFBRSxJQUFZO0lBQzdDLE9BQU8sS0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBRyxDQUFDO0FBQ2hFLENBQUM7QUFDRCxTQUFnQixXQUFXLENBQUMsS0FBWSxFQUFFLE1BQW1CLEVBQUUsSUFBVztJQUFoQyx1QkFBQSxFQUFBLG1CQUFtQjtJQUFFLHFCQUFBLEVBQUEsV0FBVztJQUN4RSxJQUFNLE9BQU8sR0FBRyxLQUFHLEdBQUcsR0FBRyxJQUFJLENBQUMsR0FBRyxFQUFJLENBQUM7SUFDdEMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFBLFlBQUcsRUFBQyxZQUFLLE1BQVEsQ0FBQyxDQUFDLENBQUM7SUFDaEMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLG9CQUFrQixPQUFTLENBQUMsQ0FBQyxDQUFDO0lBQ3RELE9BQU8sQ0FBQyxHQUFHLENBQ1QsTUFBTSxDQUFDLElBQUksQ0FDVCxrQkFBZ0IsR0FBRyxDQUFDLElBQUksVUFBSyxHQUFHLENBQUMsT0FBTyxVQUFLLE9BQU8sQ0FBQyxRQUFRLFNBQUksT0FBTyxDQUFDLElBQUksZUFBVSxPQUFPLENBQUMsT0FBUyxDQUN6RyxDQUNGLENBQUM7SUFDRixPQUFPLENBQUMsR0FBRyxDQUFDLFNBQVMsQ0FBQyxlQUFlLEVBQUUsaUNBQWlDLENBQUMsQ0FBQyxDQUFDO0lBQzNFLE9BQU8sQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLGVBQWUsRUFBRSxnRUFBZ0UsQ0FBQyxDQUFDLENBQUM7SUFDMUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxTQUFTLENBQUMsZUFBZSxFQUFFLDZEQUE2RCxDQUFDLENBQUMsQ0FBQztJQUN2RyxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUEsY0FBSyxFQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUM7SUFDN0IsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUNuQixPQUFPLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsNEJBQTBCLE9BQU8seURBQXNELENBQUMsQ0FBQyxDQUFDO0lBQ2xILE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxpRUFBaUUsQ0FBQyxDQUFDLENBQUM7SUFDNUYsTUFBTSxDQUFDO1FBQ0wsSUFBSSxFQUFFLFNBQVM7UUFDZixPQUFPLEVBQUUsS0FBSztRQUNkLE9BQU8sU0FBQTtLQUNSLENBQUMsQ0FBQztJQUNILElBQUksSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFDM0IsQ0FBQztBQXRCRCxrQ0FzQkMifQ==
|