@serverless-devs/s 2.0.97-beta.2 → 2.0.97-beta.9
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/Makefile +23 -0
- package/lib/clean/index.js +33 -31
- package/lib/cli/cli-manager.js +10 -10
- package/lib/cli/index.js +52 -52
- package/lib/component/index.js +49 -144
- package/lib/config/add/index.js +40 -38
- package/lib/config/delete/index.js +47 -47
- package/lib/config/get/index.js +39 -37
- package/lib/config/index.js +34 -32
- package/lib/core/command/command-manager.js +8 -7
- package/lib/core/component/hook.js +4 -4
- package/lib/core/component/index.js +9 -9
- package/lib/error/human-error.js +5 -5
- package/lib/error/human-warning.js +4 -4
- package/lib/error/index.js +35 -34
- package/lib/index.js +106 -135
- package/lib/init/index.js +90 -103
- package/lib/init/init-manager.js +66 -19
- package/lib/onboarding/index.js +5 -5
- package/lib/set/analysis/index.js +36 -34
- package/lib/set/index.js +34 -32
- package/lib/set/locale/index.js +50 -50
- package/lib/set/registry/index.js +49 -49
- package/lib/set/workspace/index.js +37 -35
- package/lib/specification/parse.js +10 -10
- package/lib/update-notifier/index.js +19 -19
- package/lib/utils/command-util.js +74 -57
- package/lib/utils/common.js +61 -13
- package/lib/utils/index.js +3 -3
- package/package.json +5 -4
- package/.eslintrc.json +0 -112
- package/.prettierrc.json +0 -11
- package/lib/clean/index.d.ts +0 -1
- package/lib/cli/cli-manager.d.ts +0 -13
- package/lib/cli/index.d.ts +0 -2
- package/lib/component/index.d.ts +0 -1
- package/lib/config/add/index.d.ts +0 -1
- package/lib/config/common/common.d.ts +0 -46
- package/lib/config/delete/index.d.ts +0 -2
- package/lib/config/get/index.d.ts +0 -1
- package/lib/config/index.d.ts +0 -2
- package/lib/constants/index.d.ts +0 -0
- package/lib/constants/static-variable.d.ts +0 -4
- package/lib/core/command/command-manager.d.ts +0 -12
- package/lib/core/component/hook.d.ts +0 -17
- package/lib/core/component/index.d.ts +0 -53
- package/lib/core/index.d.ts +0 -2
- package/lib/core/plugin/index.d.ts +0 -13
- package/lib/entiry/cli.d.ts +0 -27
- package/lib/entiry/index.d.ts +0 -2
- package/lib/error/command-error.d.ts +0 -5
- package/lib/error/config-delete-error.d.ts +0 -5
- package/lib/error/config-error.d.ts +0 -5
- package/lib/error/config-get-error.d.ts +0 -5
- package/lib/error/human-error.d.ts +0 -13
- package/lib/error/human-warning.d.ts +0 -8
- package/lib/error/index.d.ts +0 -17
- package/lib/error/init-error.d.ts +0 -5
- package/lib/error/serverless-error.d.ts +0 -4
- package/lib/execDaemon.d.ts +0 -6
- package/lib/index.d.ts +0 -2
- package/lib/init/index.d.ts +0 -2
- package/lib/init/init-config.d.ts +0 -43
- package/lib/init/init-manager.d.ts +0 -17
- package/lib/onboarding/index.d.ts +0 -2
- package/lib/set/analysis/index.d.ts +0 -1
- package/lib/set/index.d.ts +0 -1
- package/lib/set/locale/index.d.ts +0 -1
- package/lib/set/registry/index.d.ts +0 -10
- package/lib/set/workspace/index.d.ts +0 -1
- package/lib/specification/analysis.d.ts +0 -12
- package/lib/specification/index.d.ts +0 -4
- package/lib/specification/parse.d.ts +0 -24
- package/lib/specification/version.d.ts +0 -35
- package/lib/update-notifier/index.d.ts +0 -10
- package/lib/utils/command-util.d.ts +0 -18
- package/lib/utils/common.d.ts +0 -28
- package/lib/utils/core.d.ts +0 -3
- package/lib/utils/handler-set-config.d.ts +0 -19
- package/lib/utils/i18n/en.d.ts +0 -44
- package/lib/utils/i18n/index.d.ts +0 -2
- package/lib/utils/i18n/zh.d.ts +0 -44
- package/lib/utils/index.d.ts +0 -9
- package/lib/utils/logger.d.ts +0 -11
- package/lib/utils/storage.d.ts +0 -8
- package/lib/utils/url-parser.d.ts +0 -15
|
@@ -46,7 +46,7 @@ var utils_1 = require("../../utils");
|
|
|
46
46
|
var component_1 = require("../component");
|
|
47
47
|
var common_1 = require("../../utils/common");
|
|
48
48
|
var core_1 = __importDefault(require("../../utils/core"));
|
|
49
|
-
var colors = core_1.default.colors;
|
|
49
|
+
var colors = core_1.default.colors, ansiEscapes = core_1.default.ansiEscapes;
|
|
50
50
|
var error_1 = require("../../error");
|
|
51
51
|
var lodash_1 = require("lodash");
|
|
52
52
|
var CommandManager = /** @class */ (function () {
|
|
@@ -93,7 +93,7 @@ var CommandManager = /** @class */ (function () {
|
|
|
93
93
|
keys.push(key);
|
|
94
94
|
}
|
|
95
95
|
}
|
|
96
|
-
keys.length > 0 && utils_1.logger.warning("The value of environment variable ["
|
|
96
|
+
keys.length > 0 && utils_1.logger.warning("The value of environment variable [".concat(keys.join(', '), "] is undefined."));
|
|
97
97
|
return [2 /*return*/];
|
|
98
98
|
});
|
|
99
99
|
});
|
|
@@ -105,7 +105,7 @@ var CommandManager = /** @class */ (function () {
|
|
|
105
105
|
switch (_a.label) {
|
|
106
106
|
case 0:
|
|
107
107
|
_a.trys.push([0, 10, , 12]);
|
|
108
|
-
|
|
108
|
+
process.stdout.write('Starting ...\n');
|
|
109
109
|
templateFile = (0, common_1.checkTemplateFile)(this.templateFile);
|
|
110
110
|
if (!templateFile) return [3 /*break*/, 8];
|
|
111
111
|
outPutData = {};
|
|
@@ -134,6 +134,7 @@ var CommandManager = /** @class */ (function () {
|
|
|
134
134
|
version: parsedObj.edition,
|
|
135
135
|
customerCommandName: this.customerCommandName,
|
|
136
136
|
});
|
|
137
|
+
process.stdout.write(ansiEscapes.eraseLines(2));
|
|
137
138
|
return [4 /*yield*/, componentExecute.init()];
|
|
138
139
|
case 4:
|
|
139
140
|
tempResult = _a.sent();
|
|
@@ -143,7 +144,7 @@ var CommandManager = /** @class */ (function () {
|
|
|
143
144
|
return [3 /*break*/, 7];
|
|
144
145
|
case 5:
|
|
145
146
|
params = this.deployParams || '';
|
|
146
|
-
utils_1.logger.info("It is detected that your project has the following projects < "
|
|
147
|
+
utils_1.logger.info("It is detected that your project has the following projects < ".concat(executeOrderList.join(','), " > to be execute"));
|
|
147
148
|
componentList = (0, component_1.generateSynchronizeComponentExeList)({ list: executeOrderList, parse: parse, parsedObj: parsedObj, method: this.method, params: params }, this.assemblyProjectConfig.bind(this));
|
|
148
149
|
return [4 /*yield*/, (0, component_1.synchronizeExecuteComponentList)(componentList)];
|
|
149
150
|
case 6:
|
|
@@ -157,11 +158,11 @@ var CommandManager = /** @class */ (function () {
|
|
|
157
158
|
case 7:
|
|
158
159
|
outResult = JSON.parse(JSON.stringify(outPutData));
|
|
159
160
|
Object.keys(outPutData).length === 0
|
|
160
|
-
? utils_1.logger.success("End of method: "
|
|
161
|
+
? utils_1.logger.success("End of method: ".concat(this.method))
|
|
161
162
|
: utils_1.logger.output(outResult);
|
|
162
163
|
return [3 /*break*/, 9];
|
|
163
164
|
case 8:
|
|
164
|
-
utils_1.logger.error("Failed to execute:\n\n "
|
|
165
|
+
utils_1.logger.error("Failed to execute:\n\n ".concat((0, common_1.emoji)('❌'), " Message: Cannot find s.yaml / s.yml / template.yaml / template.yml file, please check the directory ").concat(this.templateFile, "\n ").concat((0, common_1.emoji)('🧭'), " If you want to use Serverless Devs, you should have a s.yaml or use [s cli] command.\n ").concat((0, common_1.emoji)('1️⃣'), " Yaml document: ").concat(colors.underline('https://github.com/Serverless-Devs/docs/blob/master/zh/yaml.md'), "\n ").concat((0, common_1.emoji)('2️⃣'), " Cli document: [s cli -h]\n ").concat((0, common_1.emoji)('😈'), " If you have questions, please tell us: ").concat(colors.underline('https://github.com/Serverless-Devs/Serverless-Devs/issues'), "\n"));
|
|
165
166
|
process.exit(1);
|
|
166
167
|
_a.label = 9;
|
|
167
168
|
case 9: return [3 /*break*/, 12];
|
|
@@ -183,4 +184,4 @@ var CommandManager = /** @class */ (function () {
|
|
|
183
184
|
return CommandManager;
|
|
184
185
|
}());
|
|
185
186
|
exports.CommandManager = CommandManager;
|
|
186
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
187
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tbWFuZC1tYW5hZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvcmUvY29tbWFuZC9jb21tYW5kLW1hbmFnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEscURBQXNEO0FBQ3RELHVEQUErRDtBQUMvRCxxQ0FBcUM7QUFDckMsMENBS3NCO0FBQ3RCLDZDQUE4RDtBQUM5RCwwREFBb0M7QUFDNUIsSUFBQSxNQUFNLEdBQWtCLGNBQUksT0FBdEIsRUFBRSxXQUFXLEdBQUssY0FBSSxZQUFULENBQVU7QUFDckMscUNBQTBDO0FBQzFDLGlDQUE2QztBQUU3QztJQUdFLHdCQUNZLFlBQW9CLEVBQ3BCLE1BQWMsRUFDZCxtQkFBNEIsRUFDdEMsTUFBWTtRQUhGLGlCQUFZLEdBQVosWUFBWSxDQUFRO1FBQ3BCLFdBQU0sR0FBTixNQUFNLENBQVE7UUFDZCx3QkFBbUIsR0FBbkIsbUJBQW1CLENBQVM7UUFHdEMsSUFBSSxDQUFDLFlBQVksR0FBRyxNQUFNLENBQUM7SUFDN0IsQ0FBQztJQUVLLDhDQUFxQixHQUEzQixVQUE0QixLQUFZLEVBQUUsV0FBbUIsRUFBRSxTQUFjOzs7Ozs0QkFDckQscUJBQU0sS0FBSyxDQUFDLGdCQUFnQixDQUFDLFNBQVMsQ0FBQyxFQUFBOzt3QkFBdkQsYUFBYSxHQUFHLFNBQXVDO3dCQUN2RCxhQUFhLEdBQVEsSUFBQSwwQkFBZ0IsRUFBQyxhQUFhLEVBQUUsV0FBVyxDQUFDLENBQUM7d0JBQ3hFLGFBQWEsQ0FBQyxPQUFPLEdBQUcsYUFBYSxDQUFDLElBQUksQ0FBQyxDQUFDLFlBQVk7d0JBQ3hELGFBQWEsQ0FBQyxXQUFXLEdBQUcsV0FBVyxDQUFDO3dCQUN4QyxJQUFJLElBQUksQ0FBQyxZQUFZLEVBQUU7NEJBQ3JCLGFBQWEsQ0FBQyxNQUFNLEdBQUcsSUFBSSxDQUFDLFlBQVksQ0FBQzt5QkFDMUM7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
|
|
@@ -74,7 +74,7 @@ var Hook = /** @class */ (function () {
|
|
|
74
74
|
case 1:
|
|
75
75
|
if (!(i < this.preHooks.length)) return [3 /*break*/, 4];
|
|
76
76
|
hookIndex = i;
|
|
77
|
-
utils_1.logger.info("Action: "
|
|
77
|
+
utils_1.logger.info("Action: ".concat(this.preHooks[hookIndex].Hook || this.preHooks[hookIndex].Plugin));
|
|
78
78
|
return [4 /*yield*/, this.executeByConfig(this.preHooks[hookIndex])];
|
|
79
79
|
case 2:
|
|
80
80
|
_a.sent();
|
|
@@ -103,7 +103,7 @@ var Hook = /** @class */ (function () {
|
|
|
103
103
|
case 1:
|
|
104
104
|
if (!(i < this.afterHooks.length)) return [3 /*break*/, 4];
|
|
105
105
|
hookIndex = i;
|
|
106
|
-
utils_1.logger.info("Action: "
|
|
106
|
+
utils_1.logger.info("Action: ".concat(this.afterHooks[hookIndex].Hook || this.afterHooks[hookIndex].Plugin));
|
|
107
107
|
return [4 /*yield*/, this.executeByConfig(this.afterHooks[hookIndex])];
|
|
108
108
|
case 2:
|
|
109
109
|
_a.sent();
|
|
@@ -129,7 +129,7 @@ var Hook = /** @class */ (function () {
|
|
|
129
129
|
process.env['next-command-execute-flag'] = 'true';
|
|
130
130
|
result = spawnSync(command, [], { cwd: cwdPath, stdio: 'inherit', shell: true });
|
|
131
131
|
if (result && result.status !== 0) {
|
|
132
|
-
throw new Error("Action ["
|
|
132
|
+
throw new Error("Action [".concat(command, "] run error."));
|
|
133
133
|
}
|
|
134
134
|
}
|
|
135
135
|
return [2 /*return*/];
|
|
@@ -179,4 +179,4 @@ var Hook = /** @class */ (function () {
|
|
|
179
179
|
return Hook;
|
|
180
180
|
}());
|
|
181
181
|
exports.Hook = Hook;
|
|
182
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
182
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaG9vay5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb3JlL2NvbXBvbmVudC9ob29rLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxjQUFjOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFZCwwQ0FBb0I7QUFDcEIsOENBQXdCO0FBQ3hCLHFDQUFxQztBQUNyQyxvQ0FBMEM7QUFFMUMsSUFBTSxTQUFTLEdBQUcsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUFDLFNBQVMsQ0FBQztBQVNyRDtJQUlFLGNBQVksYUFBZ0M7UUFBNUMsaUJBUUM7UUFSVyw4QkFBQSxFQUFBLGtCQUFnQztRQUg1QyxhQUFRLEdBQWlCLEVBQUUsQ0FBQztRQUM1QixlQUFVLEdBQWlCLEVBQUUsQ0FBQztRQUc1QixhQUFhLENBQUMsT0FBTyxDQUFDLFVBQUMsT0FBbUI7WUFDeEMsSUFBSSxPQUFPLENBQUMsR0FBRyxFQUFFO2dCQUNmLEtBQUksQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO2FBQzdCO2lCQUFNO2dCQUNMLEtBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO2FBQy9CO1FBQ0gsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUssNkJBQWMsR0FBcEI7Ozs7Ozs2QkFDTSxDQUFBLElBQUksQ0FBQyxRQUFRLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQSxFQUF4Qix3QkFBd0I7d0JBQzFCLGNBQU0sQ0FBQyxJQUFJLENBQUMsc0JBQXNCLENBQUMsQ0FBQzt3QkFDM0IsQ0FBQyxHQUFHLENBQUM7Ozs2QkFBRSxDQUFBLENBQUMsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQTt3QkFDbEMsU0FBUyxHQUFHLENBQUMsQ0FBQzt3QkFDbEIsY0FBTSxDQUFDLElBQUksQ0FBQyxrQkFBVyxJQUFJLENBQUMsUUFBUSxDQUFDLFNBQVMsQ0FB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
|
|
@@ -95,7 +95,7 @@ function generateSynchronizeComponentExeList(_a, equipment) {
|
|
|
95
95
|
switch (_a.label) {
|
|
96
96
|
case 0:
|
|
97
97
|
parsedObj.Params = params || '';
|
|
98
|
-
utils_1.logger.info("Start executing project "
|
|
98
|
+
utils_1.logger.info("Start executing project ".concat(projectName));
|
|
99
99
|
return [4 /*yield*/, equipment(parse, projectName, parsedObj)];
|
|
100
100
|
case 1:
|
|
101
101
|
projectConfig = _a.sent();
|
|
@@ -118,7 +118,7 @@ function generateSynchronizeComponentExeList(_a, equipment) {
|
|
|
118
118
|
else {
|
|
119
119
|
parsedObj[projectName].Output = Output;
|
|
120
120
|
}
|
|
121
|
-
utils_1.logger.info("Project "
|
|
121
|
+
utils_1.logger.info("Project ".concat(projectName, " successfully to execute \n\t"));
|
|
122
122
|
resolve({ name: projectName, data: Output });
|
|
123
123
|
return [2 /*return*/];
|
|
124
124
|
}
|
|
@@ -247,7 +247,7 @@ var ComponentExeCute = /** @class */ (function () {
|
|
|
247
247
|
error_2 = _a.sent();
|
|
248
248
|
return [4 /*yield*/, new error_1.HandleError({
|
|
249
249
|
error: error_2,
|
|
250
|
-
prefix: "Project "
|
|
250
|
+
prefix: "Project ".concat(this.componentConfig.ProjectName, " failed to execute:"),
|
|
251
251
|
}).report(error_2)];
|
|
252
252
|
case 4:
|
|
253
253
|
_a.sent();
|
|
@@ -256,8 +256,8 @@ var ComponentExeCute = /** @class */ (function () {
|
|
|
256
256
|
case 5:
|
|
257
257
|
// 方法不存在,此时系统将会认为是未找到组件方法,系统的exit code为100;
|
|
258
258
|
new error_1.HumanError({
|
|
259
|
-
errorMessage: "The ["
|
|
260
|
-
tips: "Please check the component "
|
|
259
|
+
errorMessage: "The [".concat(this.method, "] command was not found."),
|
|
260
|
+
tips: "Please check the component ".concat(this.componentConfig.component, " has the ").concat(this.method, " method. Serverless Devs documents\uFF1A").concat(colors.underline('https://github.com/Serverless-Devs/Serverless-Devs/blob/master/docs/zh/command')),
|
|
261
261
|
});
|
|
262
262
|
process.exit(100);
|
|
263
263
|
_a.label = 6;
|
|
@@ -274,7 +274,7 @@ var ComponentExeCute = /** @class */ (function () {
|
|
|
274
274
|
error_3 = _a.sent();
|
|
275
275
|
return [4 /*yield*/, new error_1.HandleError({
|
|
276
276
|
error: error_3,
|
|
277
|
-
prefix: "Project "
|
|
277
|
+
prefix: "Project ".concat(this.componentConfig.ProjectName, " failed to execute:"),
|
|
278
278
|
}).report(error_3)];
|
|
279
279
|
case 10:
|
|
280
280
|
_a.sent();
|
|
@@ -284,8 +284,8 @@ var ComponentExeCute = /** @class */ (function () {
|
|
|
284
284
|
case 12:
|
|
285
285
|
// 方法不存在,进行警告,但是并不会报错,最终的exit code为0;
|
|
286
286
|
new error_1.HumanWarning({
|
|
287
|
-
warningMessage: "The ["
|
|
288
|
-
tips: "Please check the component "
|
|
287
|
+
warningMessage: "The [".concat(this.method, "] command was not found."),
|
|
288
|
+
tips: "Please check the component ".concat(this.componentConfig.component, " has the ").concat(this.method, " method, Serverless Devs documents\uFF1A").concat(colors.underline('https://github.com/Serverless-Devs/Serverless-Devs/blob/master/docs/zh/command')),
|
|
289
289
|
});
|
|
290
290
|
_a.label = 13;
|
|
291
291
|
case 13: return [2 /*return*/];
|
|
@@ -351,4 +351,4 @@ var ComponentExeCute = /** @class */ (function () {
|
|
|
351
351
|
return ComponentExeCute;
|
|
352
352
|
}());
|
|
353
353
|
exports.ComponentExeCute = ComponentExeCute;
|
|
354
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
354
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/component/index.ts"],"names":[],"mappings":"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"}
|
package/lib/error/human-error.js
CHANGED
|
@@ -47,9 +47,9 @@ var HumanError = /** @class */ (function () {
|
|
|
47
47
|
function HumanError(configs) {
|
|
48
48
|
var errorMessage = configs.errorMessage, tips = configs.tips;
|
|
49
49
|
this.errorMessage = errorMessage;
|
|
50
|
-
console.log("\n"
|
|
51
|
-
console.log("TypeError: "
|
|
52
|
-
console.log(colors.gray(tips)
|
|
50
|
+
console.log("\n".concat((0, common_1.bgRed)('ERROR:')));
|
|
51
|
+
console.log("TypeError: ".concat(errorMessage, "\n"));
|
|
52
|
+
tips && console.log("".concat(colors.gray(tips), "\n"));
|
|
53
53
|
}
|
|
54
54
|
HumanError.prototype.report = function (configs) {
|
|
55
55
|
return __awaiter(this, void 0, void 0, function () {
|
|
@@ -60,7 +60,7 @@ var HumanError = /** @class */ (function () {
|
|
|
60
60
|
error = configs.error;
|
|
61
61
|
return [4 /*yield*/, core_1.default.report({
|
|
62
62
|
type: 'jsError',
|
|
63
|
-
content: this.errorMessage
|
|
63
|
+
content: "".concat(this.errorMessage, "||").concat(error.stack),
|
|
64
64
|
})];
|
|
65
65
|
case 1:
|
|
66
66
|
_a.sent();
|
|
@@ -72,4 +72,4 @@ var HumanError = /** @class */ (function () {
|
|
|
72
72
|
return HumanError;
|
|
73
73
|
}());
|
|
74
74
|
exports.HumanError = HumanError;
|
|
75
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
75
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHVtYW4tZXJyb3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZXJyb3IvaHVtYW4tZXJyb3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsdURBQWlDO0FBQ2pDLDBDQUF3QztBQUVoQyxJQUFBLE1BQU0sR0FBSyxjQUFJLE9BQVQsQ0FBVTtBQVV4QjtJQUVFLG9CQUFZLE9BQWlCO1FBQ25CLElBQUEsWUFBWSxHQUFXLE9BQU8sYUFBbEIsRUFBRSxJQUFJLEdBQUssT0FBTyxLQUFaLENBQWE7UUFDdkMsSUFBSSxDQUFDLFlBQVksR0FBRyxZQUFZLENBQUM7UUFDakMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxZQUFLLElBQUEsY0FBSyxFQUFDLFFBQVEsQ0FBQyxDQUFFLENBQUMsQ0FBQztRQUNwQyxPQUFPLENBQUMsR0FBRyxDQUFDLHFCQUFjLFlBQVksT0FBSSxDQUFDLENBQUM7UUFDNUMsSUFBSSxJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBRyxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFJLENBQUMsQ0FBQztJQUNoRCxDQUFDO0lBRUssMkJBQU0sR0FBWixVQUFhLE9BQWdCOzs7Ozs7d0JBQ25CLEtBQUssR0FBSyxPQUFPLE1BQVosQ0FBYTt3QkFDMUIscUJBQU0sY0FBSSxDQUFDLE1BQU0sQ0FBQztnQ0FDaEIsSUFBSSxFQUFFLFNBQVM7Z0NBQ2YsT0FBTyxFQUFFLFVBQUcsSUFBSSxDQUFDLFlBQVksZUFBSyxLQUFLLENBQUMsS0FBSyxDQUFFOzZCQUNoRCxDQUFDLEVBQUE7O3dCQUhGLFNBR0UsQ0FBQzs7Ozs7S0FDSjtJQUNILGlCQUFDO0FBQUQsQ0FBQyxBQWpCRCxJQWlCQztBQWpCWSxnQ0FBVSJ9
|
|
@@ -9,11 +9,11 @@ var colors = core_1.default.colors;
|
|
|
9
9
|
var HumanWarning = /** @class */ (function () {
|
|
10
10
|
function HumanWarning(configs) {
|
|
11
11
|
var warningMessage = configs.warningMessage, tips = configs.tips;
|
|
12
|
-
console.log("\n"
|
|
13
|
-
console.log(warningMessage
|
|
14
|
-
tips && console.log(colors.gray(tips)
|
|
12
|
+
console.log("\n".concat(colors.hex('#000').bgYellow('WARNING:')));
|
|
13
|
+
console.log("".concat(warningMessage, "\n"));
|
|
14
|
+
tips && console.log("".concat(colors.gray(tips), "\n"));
|
|
15
15
|
}
|
|
16
16
|
return HumanWarning;
|
|
17
17
|
}());
|
|
18
18
|
exports.HumanWarning = HumanWarning;
|
|
19
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
19
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHVtYW4td2FybmluZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lcnJvci9odW1hbi13YXJuaW5nLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLHVEQUFpQztBQUV6QixJQUFBLE1BQU0sR0FBSyxjQUFJLE9BQVQsQ0FBVTtBQU94QjtJQUNFLHNCQUFZLE9BQWlCO1FBQ25CLElBQUEsY0FBYyxHQUFXLE9BQU8sZUFBbEIsRUFBRSxJQUFJLEdBQUssT0FBTyxLQUFaLENBQWE7UUFDekMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxZQUFLLE1BQU0sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUMsUUFBUSxDQUFDLFVBQVUsQ0FBQyxDQUFFLENBQUMsQ0FBQztRQUM1RCxPQUFPLENBQUMsR0FBRyxDQUFDLFVBQUcsY0FBYyxPQUFJLENBQUMsQ0FBQztRQUNuQyxJQUFJLElBQUksT0FBTyxDQUFDLEdBQUcsQ0FBQyxVQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQUksQ0FBQyxDQUFDO0lBQ2hELENBQUM7SUFDSCxtQkFBQztBQUFELENBQUMsQUFQRCxJQU9DO0FBUFksb0NBQVkifQ==
|
package/lib/error/index.js
CHANGED
|
@@ -42,9 +42,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
42
42
|
exports.HandleError = exports.HumanWarning = exports.HumanError = exports.ServerlessError = exports.InitError = exports.ConfigGetError = exports.ConfigError = exports.ConfigDeleteError = exports.CommandError = void 0;
|
|
43
43
|
/** @format */
|
|
44
44
|
var common_1 = require("../utils/common");
|
|
45
|
-
var handler_set_config_1 = require("../utils/handler-set-config");
|
|
46
45
|
var core_1 = __importDefault(require("../utils/core"));
|
|
47
|
-
var
|
|
46
|
+
var common_2 = require("../utils/common");
|
|
47
|
+
var colors = core_1.default.colors, report = core_1.default.report;
|
|
48
48
|
var command_error_1 = require("./command-error");
|
|
49
49
|
Object.defineProperty(exports, "CommandError", { enumerable: true, get: function () { return command_error_1.CommandError; } });
|
|
50
50
|
var config_delete_error_1 = require("./config-delete-error");
|
|
@@ -61,50 +61,51 @@ var human_error_1 = require("./human-error");
|
|
|
61
61
|
Object.defineProperty(exports, "HumanError", { enumerable: true, get: function () { return human_error_1.HumanError; } });
|
|
62
62
|
var human_warning_1 = require("./human-warning");
|
|
63
63
|
Object.defineProperty(exports, "HumanWarning", { enumerable: true, get: function () { return human_warning_1.HumanWarning; } });
|
|
64
|
-
function getPid() {
|
|
65
|
-
try {
|
|
66
|
-
return getMAC().replace(/:/g, '');
|
|
67
|
-
}
|
|
68
|
-
catch (error) {
|
|
69
|
-
return 'unknown';
|
|
70
|
-
}
|
|
71
|
-
}
|
|
72
64
|
function underline(prefix, link) {
|
|
73
|
-
return ""
|
|
65
|
+
return "".concat(colors.gray(prefix)).concat(colors.gray.underline(link));
|
|
74
66
|
}
|
|
75
67
|
var HandleError = /** @class */ (function () {
|
|
76
68
|
function HandleError(configs) {
|
|
77
69
|
var error = configs.error, _a = configs.prefix, prefix = _a === void 0 ? 'Message:' : _a;
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
if (
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
70
|
+
console.log((0, common_1.red)("\u2716 ".concat(prefix, "\n")));
|
|
71
|
+
var configOption = (0, common_2.getErrorMessage)(error);
|
|
72
|
+
this.configOption = configOption;
|
|
73
|
+
if (!configOption.catchableError) {
|
|
74
|
+
if (configOption.traceId) {
|
|
75
|
+
console.log(colors.gray("TraceId: ".concat(configOption.traceId)));
|
|
76
|
+
}
|
|
77
|
+
console.log(colors.gray("Environment: ".concat((0, common_1.getVersion)())));
|
|
78
|
+
console.log(underline('Documents: ', 'https://www.serverless-devs.com'));
|
|
79
|
+
console.log(underline('Discussions: ', 'https://github.com/Serverless-Devs/Serverless-Devs/discussions'));
|
|
80
|
+
console.log(underline('Issues: ', 'https://github.com/Serverless-Devs/Serverless-Devs/issues\n'));
|
|
81
|
+
if (configOption.traceId) {
|
|
82
|
+
console.log(colors.gray("Please copy traceId: ".concat(configOption.traceId, " and join Dingding group: 33947367 for consultation.")));
|
|
83
|
+
}
|
|
91
84
|
}
|
|
92
|
-
console.log(colors.gray("You can run 's clean --
|
|
93
|
-
console.log(colors.gray("And run again with the '--debug' option or 's -h' to get more logs.\n"));
|
|
85
|
+
console.log(colors.gray("You can run 's clean --all' to clean Serverless devs."));
|
|
94
86
|
}
|
|
95
87
|
HandleError.prototype.report = function (error) {
|
|
96
88
|
return __awaiter(this, void 0, void 0, function () {
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
89
|
+
var _a, traceId, catchableError;
|
|
90
|
+
return __generator(this, function (_b) {
|
|
91
|
+
switch (_b.label) {
|
|
92
|
+
case 0:
|
|
93
|
+
_a = this.configOption, traceId = _a.traceId, catchableError = _a.catchableError;
|
|
94
|
+
if (!(traceId && catchableError)) return [3 /*break*/, 2];
|
|
95
|
+
return [4 /*yield*/, report({
|
|
96
|
+
type: 'jsError',
|
|
97
|
+
content: "".concat(error.message, "||").concat(error.stack),
|
|
98
|
+
traceId: traceId,
|
|
99
|
+
})];
|
|
100
|
+
case 1:
|
|
101
|
+
_b.sent();
|
|
102
|
+
_b.label = 2;
|
|
103
|
+
case 2: return [2 /*return*/];
|
|
104
|
+
}
|
|
104
105
|
});
|
|
105
106
|
});
|
|
106
107
|
};
|
|
107
108
|
return HandleError;
|
|
108
109
|
}());
|
|
109
110
|
exports.HandleError = HandleError;
|
|
110
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
111
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZXJyb3IvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsY0FBYztBQUNkLDBDQUFrRDtBQUNsRCx1REFBaUM7QUFDakMsMENBQWtEO0FBRTFDLElBQUEsTUFBTSxHQUFhLGNBQUksT0FBakIsRUFBRSxNQUFNLEdBQUssY0FBSSxPQUFULENBQVU7QUFDaEMsaURBQStDO0FBQXRDLDZHQUFBLFlBQVksT0FBQTtBQUNyQiw2REFBMEQ7QUFBakQsd0hBQUEsaUJBQWlCLE9BQUE7QUFDMUIsK0NBQTZDO0FBQXBDLDJHQUFBLFdBQVcsT0FBQTtBQUNwQix1REFBb0Q7QUFBM0Msa0hBQUEsY0FBYyxPQUFBO0FBQ3ZCLDJDQUF5QztBQUFoQyx1R0FBQSxTQUFTLE9BQUE7QUFDbEIsdURBQXFEO0FBQTVDLG1IQUFBLGVBQWUsT0FBQTtBQUN4Qiw2Q0FBMkM7QUFBbEMseUdBQUEsVUFBVSxPQUFBO0FBQ25CLGlEQUErQztBQUF0Qyw2R0FBQSxZQUFZLE9BQUE7QUFFckIsU0FBUyxTQUFTLENBQUMsTUFBYyxFQUFFLElBQVk7SUFDN0MsT0FBTyxVQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLFNBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUUsQ0FBQztBQUNoRSxDQUFDO0FBS0Q7SUFFRSxxQkFBWSxPQUFpQjtRQUNuQixJQUFBLEtBQUssR0FBMEIsT0FBTyxNQUFqQyxFQUFFLEtBQXdCLE9BQU8sT0FBWixFQUFuQixNQUFNLG1CQUFHLFVBQVUsS0FBQSxDQUFhO1FBQy9DLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBQSxZQUFHLEVBQUMsaUJBQUssTUFBTSxPQUFJLENBQUMsQ0FBQyxDQUFDO1FBQ2xDLElBQU0sWUFBWSxHQUFHLElBQUEsd0JBQWUsRUFBQyxLQUFLLENBQUMsQ0FBQztRQUM1QyxJQUFJLENBQUMsWUFBWSxHQUFHLFlBQVksQ0FBQztRQUVqQyxJQUFHLENBQUMsWUFBWSxDQUFDLGNBQWMsRUFBRTtZQUMvQixJQUFJLFlBQVksQ0FBQyxPQUFPLEVBQUU7Z0JBQ3hCLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyx1QkFBZ0IsWUFBWSxDQUFDLE9BQU8sQ0FBRSxDQUFDLENBQUMsQ0FBQzthQUNsRTtZQUNELE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyx1QkFBZ0IsSUFBQSxtQkFBVSxHQUFFLENBQUUsQ0FBQyxDQUFDLENBQUM7WUFDekQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxTQUFTLENBQUMsZUFBZSxFQUFFLGlDQUFpQyxDQUFDLENBQUMsQ0FBQztZQUMzRSxPQUFPLENBQUMsR0FBRyxDQUFDLFNBQVMsQ0FBQyxlQUFlLEVBQUUsZ0VBQWdFLENBQUMsQ0FBQyxDQUFDO1lBQzFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLGVBQWUsRUFBRSw2REFBNkQsQ0FBQyxDQUFDLENBQUM7WUFFdkcsSUFBSSxZQUFZLENBQUMsT0FBTyxFQUFFO2dCQUN4QixPQUFPLENBQUMsR0FBRyxDQUNULE1BQU0sQ0FBQyxJQUFJLENBQUMsK0JBQXdCLFlBQVksQ0FBQyxPQUFPLHlEQUFzRCxDQUFDLENBQ2hILENBQUM7YUFDSDtTQUNGO1FBQ0QsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLHVEQUF1RCxDQUFDLENBQUMsQ0FBQztJQUNwRixDQUFDO0lBQ0ssNEJBQU0sR0FBWixVQUFhLEtBQVk7Ozs7Ozt3QkFDakIsS0FBOEIsSUFBSSxDQUFDLFlBQVksRUFBN0MsT0FBTyxhQUFBLEVBQUUsY0FBYyxvQkFBQSxDQUF1Qjs2QkFDbkQsQ0FBQSxPQUFPLElBQUksY0FBYyxDQUFBLEVBQXpCLHdCQUF5Qjt3QkFDMUIscUJBQU0sTUFBTSxDQUFDO2dDQUNYLElBQUksRUFBRSxTQUFTO2dDQUNmLE9BQU8sRUFBRSxVQUFHLEtBQUssQ0FBQyxPQUFPLGVBQUssS0FBSyxDQUFDLEtBQUssQ0FBRTtnQ0FDM0MsT0FBTyxFQUFFLE9BQU87NkJBQ2pCLENBQUMsRUFBQTs7d0JBSkYsU0FJRSxDQUFDOzs7Ozs7S0FFTjtJQUNILGtCQUFDO0FBQUQsQ0FBQyxBQW5DRCxJQW1DQztBQW5DWSxrQ0FBVyJ9
|