@serverless-devs/s 2.0.84-alpha.1 → 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.
- package/bin/s-set-analysis +2 -0
- package/lib/cli/index.js +2 -2
- 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 +6 -5
- package/lib/error/index.js +22 -9
- package/lib/index.js +2 -2
- package/lib/init/index.js +2 -2
- package/lib/init/init-config.d.ts +3 -6
- package/lib/init/init-config.js +47 -14
- package/lib/init/init-manager.js +17 -14
- package/lib/onboarding/index.js +6 -6
- package/lib/set/analysis/index.d.ts +1 -0
- package/lib/set/analysis/index.js +17 -0
- package/lib/set/index.js +2 -2
- package/lib/set/locale/index.js +2 -2
- package/lib/set/registry/index.js +3 -3
- package/lib/utils/common.d.ts +2 -0
- package/lib/utils/common.js +10 -24
- package/lib/utils/i18n/en.d.ts +1 -0
- package/lib/utils/i18n/en.js +9 -8
- package/lib/utils/i18n/zh.d.ts +1 -0
- package/lib/utils/i18n/zh.js +16 -15
- package/lib/utils/logger.d.ts +1 -0
- package/lib/utils/logger.js +4 -1
- package/lib/utils/s-core.js +12 -9
- package/package.json +3 -2
- package/post-publish.sh +2 -1
|
@@ -49,7 +49,6 @@ var common_1 = require("../../utils/common");
|
|
|
49
49
|
var error_1 = require("../../error");
|
|
50
50
|
var s_core_1 = __importDefault(require("../../utils/s-core"));
|
|
51
51
|
var colors = (0, s_core_1.default)().colors;
|
|
52
|
-
var checkTemplateFile = utils_1.common.checkTemplateFile;
|
|
53
52
|
var getServiceConfig = specification_1.version.getServiceConfig;
|
|
54
53
|
var CommandManager = /** @class */ (function () {
|
|
55
54
|
function CommandManager(templateFile, method, customerCommandName, params) {
|
|
@@ -85,7 +84,7 @@ var CommandManager = /** @class */ (function () {
|
|
|
85
84
|
case 0:
|
|
86
85
|
_a.trys.push([0, 12, , 13]);
|
|
87
86
|
utils_1.logger.info('Start ...');
|
|
88
|
-
templateFile = checkTemplateFile(this.templateFile);
|
|
87
|
+
templateFile = (0, common_1.checkTemplateFile)(this.templateFile);
|
|
89
88
|
if (!templateFile) return [3 /*break*/, 10];
|
|
90
89
|
outPutData = {};
|
|
91
90
|
parse = new specification_1.Parse(templateFile);
|
|
@@ -134,13 +133,15 @@ var CommandManager = /** @class */ (function () {
|
|
|
134
133
|
}
|
|
135
134
|
_a.label = 9;
|
|
136
135
|
case 9:
|
|
137
|
-
outResult =
|
|
136
|
+
outResult = JSON.parse(JSON.stringify(outPutData));
|
|
138
137
|
if (process.env['s-execute-file']) {
|
|
139
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");
|
|
140
139
|
process.exit(-1);
|
|
141
140
|
}
|
|
142
141
|
else {
|
|
143
|
-
|
|
142
|
+
Object.keys(outPutData).length === 0
|
|
143
|
+
? utils_1.logger.success("End of method: " + this.method)
|
|
144
|
+
: utils_1.logger.output(outResult);
|
|
144
145
|
}
|
|
145
146
|
return [3 /*break*/, 11];
|
|
146
147
|
case 10:
|
|
@@ -160,4 +161,4 @@ var CommandManager = /** @class */ (function () {
|
|
|
160
161
|
return CommandManager;
|
|
161
162
|
}());
|
|
162
163
|
exports.CommandManager = CommandManager;
|
|
163
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
164
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tbWFuZC1tYW5hZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvcmUvY29tbWFuZC9jb21tYW5kLW1hbmFnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLGNBQWM7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUVkLG9EQUEyQjtBQUMzQixxREFBK0Q7QUFDL0QscUNBQXFDO0FBQ3JDLDBDQUtzQjtBQUN0Qiw2Q0FBOEQ7QUFDOUQscUNBQTBDO0FBQzFDLDhEQUF5QztBQUNqQyxJQUFBLE1BQU0sR0FBSyxJQUFBLGdCQUFPLEdBQUUsT0FBZCxDQUFlO0FBQ3JCLElBQUEsZ0JBQWdCLEdBQUssdUJBQU8saUJBQVosQ0FBYTtBQUVyQztJQUdFLHdCQUNZLFlBQW9CLEVBQ3BCLE1BQWMsRUFDZCxtQkFBNEIsRUFDdEMsTUFBWTtRQUhGLGlCQUFZLEdBQVosWUFBWSxDQUFRO1FBQ3BCLFdBQU0sR0FBTixNQUFNLENBQVE7UUFDZCx3QkFBbUIsR0FBbkIsbUJBQW1CLENBQVM7UUFHdEMsSUFBSSxDQUFDLFlBQVksR0FBRyxNQUFNLENBQUM7SUFDN0IsQ0FBQztJQUVLLDhDQUFxQixHQUEzQixVQUE0QixLQUFZLEVBQUUsV0FBbUIsRUFBRSxTQUFjOzs7Ozs0QkFDckQscUJBQU0sS0FBSyxDQUFDLGdCQUFnQixDQUFDLFNBQVMsQ0FBQyxFQUFBOzt3QkFBdkQsYUFBYSxHQUFHLFNBQXVDO3dCQUN2RCxhQUFhLEdBQVEsZ0JBQWdCLENBQUMsYUFBYSxFQUFFLFdBQVcsQ0FBQyxDQUFDO3dCQUN4RSxhQUFhLENBQUMsT0FBTyxHQUFHLGFBQWEsQ0FBQyxJQUFJLENBQUMsQ0FBQyxZQUFZO3dCQUN4RCxhQUFhLENBQUMsV0FBVyxHQUFHLFdBQVcsQ0FBQzt3QkFDeEMsSUFBSSxJQUFJLENBQUMsWUFBWSxFQUFFOzRCQUNyQixhQUFhLENBQUMsTUFBTSxHQUFHLElBQUksQ0FBQyxZ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
|
package/lib/error/index.js
CHANGED
|
@@ -5,8 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.handleError = exports.ServerlessError = exports.InitError = exports.ConfigGetError = exports.ConfigError = exports.ConfigDeleteError = exports.CommandError = void 0;
|
|
7
7
|
/** @format */
|
|
8
|
+
var common_1 = require("../utils/common");
|
|
9
|
+
var handler_set_config_1 = require("../utils/handler-set-config");
|
|
8
10
|
var s_core_1 = __importDefault(require("../utils/s-core"));
|
|
9
|
-
var _a = (0, s_core_1.default)(), colors = _a.colors,
|
|
11
|
+
var _a = (0, s_core_1.default)(), colors = _a.colors, report = _a.report, getMAC = _a.getMAC;
|
|
12
|
+
var pkg = require('../../package.json');
|
|
10
13
|
var command_error_1 = require("./command-error");
|
|
11
14
|
Object.defineProperty(exports, "CommandError", { enumerable: true, get: function () { return command_error_1.CommandError; } });
|
|
12
15
|
var config_delete_error_1 = require("./config-delete-error");
|
|
@@ -19,25 +22,35 @@ var init_error_1 = require("./init-error");
|
|
|
19
22
|
Object.defineProperty(exports, "InitError", { enumerable: true, get: function () { return init_error_1.InitError; } });
|
|
20
23
|
var serverless_error_1 = require("./serverless-error");
|
|
21
24
|
Object.defineProperty(exports, "ServerlessError", { enumerable: true, get: function () { return serverless_error_1.ServerlessError; } });
|
|
25
|
+
var pid = getMAC().replace(/:/g, '');
|
|
22
26
|
function underline(prefix, link) {
|
|
23
27
|
return "" + colors.gray(prefix) + colors.gray.underline(link);
|
|
24
28
|
}
|
|
25
29
|
function handleError(error, prefix, exit) {
|
|
26
30
|
if (prefix === void 0) { prefix = 'Message:'; }
|
|
27
31
|
if (exit === void 0) { exit = true; }
|
|
28
|
-
|
|
29
|
-
console.log(
|
|
32
|
+
var traceId = "" + pid + Date.now();
|
|
33
|
+
console.log((0, common_1.red)("\u2716 " + prefix + "\n"));
|
|
34
|
+
var analysis = (0, handler_set_config_1.getConfig)('analysis');
|
|
35
|
+
if (analysis !== 'disable') {
|
|
36
|
+
console.log(colors.gray("TraceId: " + traceId));
|
|
37
|
+
}
|
|
38
|
+
console.log(colors.gray("Environment: " + pkg.name + ": " + pkg.version + ", " + process.platform + "-" + process.arch + ", node-" + process.version));
|
|
30
39
|
console.log(underline('Documents: ', 'https://www.serverless-devs.com'));
|
|
31
40
|
console.log(underline('Discussions: ', 'https://github.com/Serverless-Devs/Serverless-Devs/discussions'));
|
|
32
41
|
console.log(underline('Issues: ', 'https://github.com/Serverless-Devs/Serverless-Devs/issues\n'));
|
|
33
|
-
console.log(
|
|
42
|
+
console.log((0, common_1.bgRed)('ERROR:'));
|
|
34
43
|
console.log(error);
|
|
35
|
-
console.log(
|
|
44
|
+
console.log('');
|
|
45
|
+
if (analysis !== 'disable') {
|
|
46
|
+
console.log(colors.gray("Please copy traceId: " + traceId + " and join Dingding group: 33947367 for consultation."));
|
|
47
|
+
}
|
|
48
|
+
console.log(colors.gray("Run again with the '--debug' option or 's -h' to get more logs."));
|
|
36
49
|
report({
|
|
37
|
-
type: '
|
|
50
|
+
type: 'jsError',
|
|
38
51
|
content: error,
|
|
39
|
-
|
|
40
|
-
exit && process.exit(-1);
|
|
52
|
+
traceId: traceId,
|
|
53
|
+
}).then(function () { return exit && process.exit(-1); });
|
|
41
54
|
}
|
|
42
55
|
exports.handleError = handleError;
|
|
43
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
56
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZXJyb3IvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsY0FBYztBQUNkLDBDQUE2QztBQUM3QyxrRUFBd0Q7QUFDeEQsMkRBQXNDO0FBQ2hDLElBQUEsS0FBNkIsSUFBQSxnQkFBTyxHQUFFLEVBQXBDLE1BQU0sWUFBQSxFQUFFLE1BQU0sWUFBQSxFQUFFLE1BQU0sWUFBYyxDQUFDO0FBQzdDLElBQU0sR0FBRyxHQUFHLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO0FBQzFDLGlEQUErQztBQUF0Qyw2R0FBQSxZQUFZLE9BQUE7QUFDckIsNkRBQTBEO0FBQWpELHdIQUFBLGlCQUFpQixPQUFBO0FBQzFCLCtDQUE2QztBQUFwQywyR0FBQSxXQUFXLE9BQUE7QUFDcEIsdURBQW9EO0FBQTNDLGtIQUFBLGNBQWMsT0FBQTtBQUN2QiwyQ0FBeUM7QUFBaEMsdUdBQUEsU0FBUyxPQUFBO0FBQ2xCLHVEQUFxRDtBQUE1QyxtSEFBQSxlQUFlLE9BQUE7QUFFeEIsSUFBTSxHQUFHLEdBQUcsTUFBTSxFQUFFLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsQ0FBQztBQUV2QyxTQUFTLFNBQVMsQ0FBQyxNQUFjLEVBQUUsSUFBWTtJQUM3QyxPQUFPLEtBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUcsQ0FBQztBQUNoRSxDQUFDO0FBQ0QsU0FBZ0IsV0FBVyxDQUFDLEtBQVksRUFBRSxNQUFtQixFQUFFLElBQVc7SUFBaEMsdUJBQUEsRUFBQSxtQkFBbUI7SUFBRSxxQkFBQSxFQUFBLFdBQVc7SUFDeEUsSUFBTSxPQUFPLEdBQUcsS0FBRyxHQUFHLEdBQUcsSUFBSSxDQUFDLEdBQUcsRUFBSSxDQUFDO0lBQ3RDLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBQSxZQUFHLEVBQUMsWUFBSyxNQUFNLE9BQUksQ0FBQyxDQUFDLENBQUM7SUFDbEMsSUFBTSxRQUFRLEdBQUcsSUFBQSw4QkFBUyxFQUFDLFVBQVUsQ0FBQyxDQUFDO0lBQ3ZDLElBQUksUUFBUSxLQUFLLFNBQVMsRUFBRTtRQUMxQixPQUFPLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsa0JBQWdCLE9BQVMsQ0FBQyxDQUFDLENBQUM7S0FDckQ7SUFDRCxPQUFPLENBQUMsR0FBRyxDQUNULE1BQU0sQ0FBQyxJQUFJLENBQ1Qsa0JBQWdCLEdBQUcsQ0FBQyxJQUFJLFVBQUssR0FBRyxDQUFDLE9BQU8sVUFBSyxPQUFPLENBQUMsUUFBUSxTQUFJLE9BQU8sQ0FBQyxJQUFJLGVBQVUsT0FBTyxDQUFDLE9BQVMsQ0FDekcsQ0FDRixDQUFDO0lBQ0YsT0FBTyxDQUFDLEdBQUcsQ0FBQyxTQUFTLENBQUMsZUFBZSxFQUFFLGlDQUFpQyxDQUFDLENBQUMsQ0FBQztJQUMzRSxPQUFPLENBQUMsR0FBRyxDQUFDLFNBQVMsQ0FBQyxlQUFlLEVBQUUsZ0VBQWdFLENBQUMsQ0FBQyxDQUFDO0lBQzFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLGVBQWUsRUFBRSw2REFBNkQsQ0FBQyxDQUFDLENBQUM7SUFDdkcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFBLGNBQUssRUFBQyxRQUFRLENBQUMsQ0FBQyxDQUFDO0lBQzdCLE9BQU8sQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUM7SUFDbkIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUNoQixJQUFJLFFBQVEsS0FBSyxTQUFTLEVBQUU7UUFDMUIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLDBCQUF3QixPQUFPLHlEQUFzRCxDQUFDLENBQUMsQ0FBQztLQUNqSDtJQUNELE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxpRUFBaUUsQ0FBQyxDQUFDLENBQUM7SUFDNUYsTUFBTSxDQUFDO1FBQ0wsSUFBSSxFQUFFLFNBQVM7UUFDZixPQUFPLEVBQUUsS0FBSztRQUNkLE9BQU8sU0FBQTtLQUNSLENBQUMsQ0FBQyxJQUFJLENBQUMsY0FBTSxPQUFBLElBQUksSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQXhCLENBQXdCLENBQUMsQ0FBQztBQUMxQyxDQUFDO0FBM0JELGtDQTJCQyJ9
|