@serverless-devs/s 2.0.95 → 2.0.97-beta.5

package/lib/utils/command-util.js

@@ -1,4 +1,23 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -42,20 +61,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.recordCommandHistory = exports.registerVerbose = exports.registerUniversalCommand = exports.registerCustomerCommand = exports.registerCommandChecker = exports.createCustomerCommand = exports.getCustomerCommandInfo = exports.getParsedTemplateObj = exports.getCommandDetail = exports.createUniversalCommand = exports.setEnvbyDotenv = void 0;
 var os_1 = __importDefault(require("os"));
 var path_1 = __importDefault(require("path"));
-var commander_1 = require("commander");
+var commander_1 = require("@serverless-devs/commander");
 var core_1 = require("../core");
 var specification_1 = require("../specification");
 var static_variable_1 = require("../constants/static-variable");
 var storage_1 = __importDefault(require("./storage"));
 var logger_1 = __importDefault(require("./logger"));
 var common_1 = require("./common");
-var lodash_1 = require("lodash");
+var lodash_1 = __importStar(require("lodash"));
 var core_2 = __importDefault(require("./core"));
-var loadComponent = core_2.default.loadComponent, fs = core_2.default.fse, yaml = core_2.default.jsyaml, getYamlContent = core_2.default.getYamlContent;
+var makeUnderLine = core_2.default.makeUnderLine, loadComponent = core_2.default.loadComponent, fs = core_2.default.fse, getYamlContent = core_2.default.getYamlContent, publishHelp = core_2.default.publishHelp;
 var getSubcommand = specification_1.version.getSubcommand, getServiceConfig = specification_1.version.getServiceConfig;
 function setEnvbyDotenv(templateFile) {
     return __awaiter(this, void 0, void 0, function () {
-        var spath, data, services, codeUri, key, element;
+        var spath, data, services, key, element, codeUri;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -67,15 +86,12 @@ function setEnvbyDotenv(templateFile) {
                     services = data.services;
                     for (key in services) {
                         element = services[key];
-                        if (element.component === 'fc') {
-                            codeUri = (0, lodash_1.get)(element, 'props.function.codeUri');
-                            break;
+                        codeUri = (0, lodash_1.get)(element, 'props.function.codeUri');
+                        if (codeUri) {
+                            codeUri = path_1.default.isAbsolute(codeUri) ? codeUri : path_1.default.join(spath, codeUri);
+                            require('dotenv').config({ path: path_1.default.join(codeUri, '.env') });
                         }
                     }
-                    if (codeUri) {
-                        codeUri = path_1.default.isAbsolute(codeUri) ? codeUri : path_1.default.join(spath, codeUri);
-                        require('dotenv').config({ path: path_1.default.join(codeUri, '.env') });
-                    }
                     return [2 /*return*/];
             }
         });
@@ -145,14 +161,9 @@ function getCustomerCommandInfo(parsedTemplateObj) {
     return getSubcommand(parsedTemplateObj);
 }
 exports.getCustomerCommandInfo = getCustomerCommandInfo;
-function getTempCommandStr(commands, length) {
-    var commandsLength = commands.length;
-    var tempArray = new Array(length - commandsLength).fill(' ');
-    return "" + commands + tempArray.join('') + " : ";
-}
 function createCustomerCommand(templateFile) {
     return __awaiter(this, void 0, void 0, function () {
-        var customerCommands, doc, subCommands, commandListPromise, commandListDetail;
+        var customerCommands, doc, subCommands, commandListPromise, commandListDetail, componentInstance, publishYamlInfor;
         var _this = this;
         return __generator(this, function (_a) {
             switch (_a.label) {
@@ -172,18 +183,18 @@ function createCustomerCommand(templateFile) {
                     return [4 /*yield*/, Promise.all(commandListPromise)];
                 case 2:
                     commandListDetail = _a.sent();
-                    commandListDetail.forEach(function (_a) {
+                    // 只有一个指令的时候
+                    (0, lodash_1.forEach)(commandListDetail, function (_a) {
                         var projectName = _a.projectName, projectDocDetail = _a.projectDocDetail;
                         var customerCommand = new commander_1.Command(projectName);
-                        var customerCommandDescription = (0, common_1.emoji)('👉') + " This is a customer command please use [s " + projectName + " -h]  obtain the documentation";
-                        customerCommand.description(customerCommandDescription);
+                        customerCommand._componentName = (0, lodash_1.get)(projectDocDetail, 'component');
                         var _b = process.argv.slice(2), _customerCommandName = _b[0], methodName = _b[1];
                         if (_customerCommandName === projectName && methodName && methodName.indexOf('-') !== 0) {
                             customerCommand.addCommand(createUniversalCommand(methodName, projectName));
                         }
                         customerCommand.option('-h, --help', 'Print usage document');
                         customerCommand.action(function () { return __awaiter(_this, void 0, void 0, function () {
-                            var component, componentInstance, docResult, componentPathYaml, publishYamlInfor, tempLength, item, item, e_1;
+                            var component, componentInstance, publishYamlInfor, helperLength, e_1;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
                                     case 0:
@@ -191,53 +202,47 @@ function createCustomerCommand(templateFile) {
                                         return [4 /*yield*/, loadComponent(component)];
                                     case 1:
                                         componentInstance = _a.sent();
-                                        if (!componentInstance) return [3 /*break*/, 7];
-                                        if (!(componentInstance.__doc && componentInstance.__doc().length > 1685)) return [3 /*break*/, 2];
-                                        docResult = componentInstance.__doc(projectName);
-                                        logger_1.default.info("\n" + docResult);
-                                        return [3 /*break*/, 6];
+                                        if (!componentInstance) return [3 /*break*/, 6];
+                                        _a.label = 2;
                                     case 2:
-                                        _a.trys.push([2, 5, , 6]);
-                                        componentPathYaml = path_1.default.join(componentInstance.__path, 'publish.yml');
-                                        return [4 /*yield*/, fs.existsSync(componentPathYaml)];
+                                        _a.trys.push([2, 4, , 5]);
+                                        return [4 /*yield*/, getYamlContent(path_1.default.join(componentInstance.__path, 'publish.yml'))];
                                     case 3:
-                                        if (!(_a.sent())) {
-                                            componentPathYaml = path_1.default.join(componentInstance.__path, 'publish.yaml');
-                                        }
-                                        return [4 /*yield*/, yaml.load(fs.readFileSync(componentPathYaml, 'utf8'))];
-                                    case 4:
                                         publishYamlInfor = _a.sent();
-                                        console.log("\n  " + publishYamlInfor['Name'] + "@" + publishYamlInfor['Version'] + ": " + publishYamlInfor['Description'] + "\n");
-                                        tempLength = 0;
+                                        console.log("".concat((0, common_1.emoji)('🚀'), " ").concat(publishYamlInfor['Name'], "@").concat(publishYamlInfor['Version'], ": ").concat(publishYamlInfor['Description'], "\n"));
                                         if (publishYamlInfor['Commands']) {
-                                            for (item in publishYamlInfor['Commands']) {
-                                                if (item.length > tempLength) {
-                                                    tempLength = item.length;
-                                                }
-                                            }
-                                            for (item in publishYamlInfor['Commands']) {
-                                                console.log("    " + getTempCommandStr(item, tempLength) + " " + publishYamlInfor['Commands'][item]);
-                                            }
-                                            console.log("\n  " + (publishYamlInfor['HomePage']
-                                                ? (0, common_1.emoji)('🧭') + " More information: " + publishYamlInfor['HomePage'] + '\n'
+                                            helperLength = publishHelp.maxLen(publishYamlInfor['Commands']);
+                                            console.log(publishHelp.helpInfo(publishYamlInfor['Commands'], 'Commands', helperLength));
+                                            console.log("".concat(publishYamlInfor['HomePage']
+                                                ? "".concat((0, common_1.emoji)('🧭'), " ").concat(makeUnderLine('More information: ' + publishYamlInfor['HomePage']), " ") + '\n'
                                                 : ''));
                                         }
-                                        return [3 /*break*/, 6];
-                                    case 5:
+                                        return [3 /*break*/, 5];
+                                    case 4:
                                         e_1 = _a.sent();
                                         logger_1.default.error('Help information could not be found');
-                                        return [3 /*break*/, 6];
-                                    case 6: return [3 /*break*/, 8];
-                                    case 7:
+                                        return [3 /*break*/, 5];
+                                    case 5: return [3 /*break*/, 7];
+                                    case 6:
                                         logger_1.default.error('Help information could not be found');
-                                        _a.label = 8;
-                                    case 8: return [2 /*return*/];
+                                        _a.label = 7;
+                                    case 7: return [2 /*return*/];
                                 }
                             });
                         }); });
                         customerCommands.push(customerCommand);
                     });
-                    return [2 /*return*/, customerCommands];
+                    if (!((0, lodash_1.size)(commandListDetail) === 1)) return [3 /*break*/, 5];
+                    return [4 /*yield*/, loadComponent((0, lodash_1.get)(lodash_1.default.first(commandListDetail), 'projectDocDetail.component'))];
+                case 3:
+                    componentInstance = _a.sent();
+                    return [4 /*yield*/, getYamlContent(path_1.default.join(componentInstance.__path, 'publish.yml'))];
+                case 4:
+                    publishYamlInfor = _a.sent();
+                    // @ts-ignore
+                    lodash_1.default.set(lodash_1.default.first(customerCommands), '_componentPublish', publishYamlInfor);
+                    _a.label = 5;
+                case 5: return [2 /*return*/, customerCommands];
             }
         });
     });
@@ -247,7 +252,7 @@ function registerCommandChecker(program) {
     program.on('command:*', function (cmds) {
         var commands = program.commands.map(function (command) { return command.name(); });
         if (!commands.includes(cmds[0])) {
-            logger_1.default.error("  error: unknown command " + cmds[0]);
+            logger_1.default.error("  error: unknown command ".concat(cmds[0]));
             program.help();
         }
     });
@@ -263,9 +268,21 @@ function registerCustomerCommand(system_command, templateFile) {
                     return [4 /*yield*/, createCustomerCommand(templateFile)];
                 case 1:
                     customerCommands = _a.sent();
-                    customerCommands.forEach(function (command) {
+                    (0, lodash_1.forEach)(customerCommands, function (command) {
                         system_command.addCommand(command);
                     });
+                    if ((0, lodash_1.size)(customerCommands) === 1) {
+                        // @ts-ignore
+                        return [2 /*return*/, lodash_1.default.get(lodash_1.default.get(lodash_1.default.first(customerCommands), '_componentPublish'), 'Commands', [])];
+                    }
+                    else {
+                        return [2 /*return*/, lodash_1.default.map(customerCommands, function (item) {
+                                var _a;
+                                return (_a = {},
+                                    _a["".concat(item._name, " [options]")] = "Please use [s ".concat(item._name, " -h]  obtain the documentation"),
+                                    _a);
+                            })];
+                    }
                     _a.label = 2;
                 case 2: return [2 /*return*/];
             }
@@ -311,4 +328,4 @@ exports.default = {
     registerCustomerCommand: registerCustomerCommand,
     registerUniversalCommand: registerUniversalCommand,
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"command-util.js","sourceRoot":"","sources":["../../src/utils/command-util.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"command-util.js","sourceRoot":"","sources":["../../src/utils/command-util.ts"],"names":[],"mappings":"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"}

package/lib/utils/common.js

@@ -59,23 +59,47 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.emoji = exports.mark = exports.replaceTemplate = exports.getTemplatekey = exports.replaceFun = exports.getLang = exports.printn = exports.checkTemplateFile = exports.checkAndReturnTemplateFile = exports.yamlLoad = exports.getFolderSize = exports.getVersion = exports.bgRed = exports.red = void 0;
+exports.emoji = exports.mark = exports.replaceTemplate = exports.getTemplatekey = exports.replaceFun = exports.getLang = exports.printn = exports.checkTemplateFile = exports.checkAndReturnTemplateFile = exports.yamlLoad = exports.getFolderSize = exports.getVersion = exports.getErrorMessage = exports.bgRed = exports.yellow = exports.red = void 0;
 var path_1 = __importDefault(require("path"));
 var fs_1 = __importDefault(require("fs"));
 var lodash_1 = __importDefault(require("lodash"));
-// import { getConfig } from './handler-set-config';
 var os_1 = __importDefault(require("os"));
-// import osLocale from 'os-locale';
 var error_1 = require("../error");
 var core_1 = __importStar(require("./core"));
-var colors = core_1.default.colors, yaml = core_1.default.jsyaml;
+var colors = core_1.default.colors, yaml = core_1.default.jsyaml, makeUnderLine = core_1.default.makeUnderLine, isDebugMode = core_1.default.isDebugMode;
 var pkg = require('../../package.json');
 exports.red = colors.hex('#fd5750');
+exports.yellow = colors.hex('#F3F99D');
 exports.bgRed = colors.hex('#000').bgHex('#fd5750');
+var getErrorMessage = function (error) {
+    var isDebug = isDebugMode ? isDebugMode() : undefined;
+    if (isDebug) {
+        console.log(error);
+        return;
+    }
+    var message = error.message ? error.message : '';
+    try {
+        var jsonMsg = JSON.parse(message);
+        console.log("".concat((0, exports.bgRed)('ERROR:'), "\n").concat(jsonMsg.message, "\n"));
+        if (jsonMsg.tips) {
+            console.log("".concat((0, exports.yellow)(makeUnderLine(jsonMsg.tips)), "\n"));
+        }
+    }
+    catch (error) {
+        console.log("".concat((0, exports.bgRed)('ERROR:'), "\n").concat(message, "\n"));
+    }
+};
+exports.getErrorMessage = getErrorMessage;
 function getVersion() {
-    return (0, core_1.getCoreVersion)()
-        ? pkg.name + ": " + pkg.version + ", @serverless-devs/core: " + (0, core_1.getCoreVersion)() + ", " + process.platform + "-" + process.arch + ", node-" + process.version
-        : pkg.name + ": " + pkg.version + ", " + process.platform + "-" + process.arch + ", node-" + process.version;
+    var coreVersion = (0, core_1.getCoreVersion)();
+    var platform = "".concat(process.platform, "-").concat(process.arch);
+    var nodeVersion = "node-".concat(process.version);
+    var coreVersionStr = "core: ".concat(coreVersion);
+    var homeWork = "s-home: ".concat(core_1.default.getRootHome());
+    var pkgVersion = "".concat(pkg.name, ": ").concat(pkg.version);
+    return coreVersion
+        ? "".concat(pkgVersion, ", ").concat(coreVersionStr, ", ").concat(homeWork, ", ").concat(platform, ", ").concat(nodeVersion)
+        : "".concat(pkgVersion, ", ").concat(homeWork, ", ").concat(platform, ", ").concat(nodeVersion);
 }
 exports.getVersion = getVersion;
 function getFolderSize(rootItemPath) {
@@ -128,8 +152,8 @@ function yamlLoad(filePath) {
             return;
         var filename = path_1.default.basename(filePath);
         new error_1.HumanError({
-            errorMessage: filename + " format is incorrect",
-            tips: "Please check the configuration of " + filename + ", Serverless Devs' Yaml specification document can refer to\uFF1A" + colors.underline('https://github.com/Serverless-Devs/Serverless-Devs/blob/master/docs/zh/yaml.md'),
+            errorMessage: "".concat(filename, " format is incorrect"),
+            tips: "Please check the configuration of ".concat(filename, ", Serverless Devs' Yaml specification document can refer to\uFF1A").concat(colors.underline('https://github.com/Serverless-Devs/Serverless-Devs/blob/master/docs/zh/yaml.md')),
         });
         process.exit(1);
     }
@@ -281,11 +305,14 @@ function mark(source) {
         return source;
     }
     var subStr = source.slice(-4);
-    return "***********" + subStr;
+    return "***********".concat(subStr);
 }
 exports.mark = mark;
-function emoji(emoji) {
-    return os_1.default.platform() === 'win32' ? '' : emoji;
+function emoji(text, fallback) {
+    if (os_1.default.platform() === 'win32') {
+        return fallback || '◆';
+    }
+    return "".concat(text, " ");
 }
 exports.emoji = emoji;
 exports.default = {
@@ -298,4 +325,4 @@ exports.default = {
     replaceFun: replaceFun,
     getTemplatekey: getTemplatekey,
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/utils/common.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/utils/common.ts"],"names":[],"mappings":"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"}

package/lib/utils/index.js

@@ -23,10 +23,10 @@ Object.defineProperty(exports, "logger", { enumerable: true, get: function () {
 var i18n_1 = require("./i18n");
 Object.defineProperty(exports, "i18n", { enumerable: true, get: function () { return __importDefault(i18n_1).default; } });
 var getYamlPath = function (prePath, name) {
-    var S_PATH1 = path_1.default.join(prePath, name + ".yaml");
-    var S_PATH2 = path_1.default.join(prePath, name + ".yml");
+    var S_PATH1 = path_1.default.join(prePath, "".concat(name, ".yaml"));
+    var S_PATH2 = path_1.default.join(prePath, "".concat(name, ".yml"));
     var S_PATH = fs.existsSync(S_PATH1) ? S_PATH1 : fs.existsSync(S_PATH2) ? S_PATH2 : undefined;
     return S_PATH;
 };
 exports.getYamlPath = getYamlPath;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLGNBQWM7Ozs7OztBQUVkLDhDQUF3QjtBQUN4QixnREFBMEI7QUFDbEIsSUFBSyxFQUFFLEdBQUssY0FBSSxJQUFULENBQVU7QUFDekIsbUNBQTZDO0FBQXBDLGlIQUFBLE9BQU8sT0FBVTtBQUMxQiwyREFBNEQ7QUFBbkQsZ0lBQUEsT0FBTyxPQUFhO0FBQzdCLHFDQUErQztBQUF0QyxtSEFBQSxPQUFPLE9BQVc7QUFDM0IsMkNBQW9EO0FBQTNDLHdIQUFBLE9BQU8sT0FBYTtBQUM3QiwrQ0FBMkQ7QUFBbEQsK0hBQUEsT0FBTyxPQUFrQjtBQUNsQyxtQ0FBNkM7QUFBcEMsaUhBQUEsT0FBTyxPQUFVO0FBQzFCLCtCQUF5QztBQUFoQyw2R0FBQSxPQUFPLE9BQVE7QUFFakIsSUFBTSxXQUFXLEdBQUcsVUFBQyxPQUFlLEVBQUUsSUFBWTtJQUN2RCxJQUFNLE9BQU8sR0FBRyxjQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBSyxJQUFJLFVBQU8sQ0FBQyxDQUFDO0lBQ25ELElBQU0sT0FBTyxHQUFHLGNBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFLLElBQUksU0FBTSxDQUFDLENBQUM7SUFFbEQsSUFBTSxNQUFNLEdBQUcsRUFBRSxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQztJQUMvRixPQUFPLE1BQU0sQ0FBQztBQUNoQixDQUFDLENBQUM7QUFOVyxRQUFBLFdBQVcsZUFNdEIifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLGNBQWM7Ozs7OztBQUVkLDhDQUF3QjtBQUN4QixnREFBMEI7QUFDbEIsSUFBSyxFQUFFLEdBQUssY0FBSSxJQUFULENBQVU7QUFDekIsbUNBQTZDO0FBQXBDLGlIQUFBLE9BQU8sT0FBVTtBQUMxQiwyREFBNEQ7QUFBbkQsZ0lBQUEsT0FBTyxPQUFhO0FBQzdCLHFDQUErQztBQUF0QyxtSEFBQSxPQUFPLE9BQVc7QUFDM0IsMkNBQW9EO0FBQTNDLHdIQUFBLE9BQU8sT0FBYTtBQUM3QiwrQ0FBMkQ7QUFBbEQsK0hBQUEsT0FBTyxPQUFrQjtBQUNsQyxtQ0FBNkM7QUFBcEMsaUhBQUEsT0FBTyxPQUFVO0FBQzFCLCtCQUF5QztBQUFoQyw2R0FBQSxPQUFPLE9BQVE7QUFFakIsSUFBTSxXQUFXLEdBQUcsVUFBQyxPQUFlLEVBQUUsSUFBWTtJQUN2RCxJQUFNLE9BQU8sR0FBRyxjQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxVQUFHLElBQUksVUFBTyxDQUFDLENBQUM7SUFDbkQsSUFBTSxPQUFPLEdBQUcsY0FBSSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsVUFBRyxJQUFJLFNBQU0sQ0FBQyxDQUFDO0lBRWxELElBQU0sTUFBTSxHQUFHLEVBQUUsQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUM7SUFDL0YsT0FBTyxNQUFNLENBQUM7QUFDaEIsQ0FBQyxDQUFDO0FBTlcsUUFBQSxXQUFXLGVBTXRCIn0=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serverless-devs/s",
-  "version": "2.0.95",
+  "version": "2.0.97-beta.5",
   "description": "Serverless devs tool, serverless developer tool, supports Alibaba cloud, AWS, azure, baidu cloud, Huawei cloud, Google cloud and Tencent cloud.",
   "homepage": "https://www.serverless-devs.com",
   "keywords": [
@@ -28,6 +28,7 @@
     "url": "https://github.com/Serverless-Devs/Serverless-Devs/issues"
   },
   "scripts": {
+    "start": "npm run watch",
     "prewatch": "rm -rf lib/* && cp -r ./src/daemon ./lib",
     "watch": "tsc -w",
     "test": "npx jest",
@@ -46,6 +47,7 @@
     "s": "bin/s"
   },
   "devDependencies": {
+    "@serverless-devs/commander": "^6.0.0",
     "@types/jest": "^27.0.1",
     "@types/lodash": "^4.14.168",
     "@types/node": "^14.0.23",
@@ -53,9 +55,8 @@
     "@typescript-eslint/parser": "^4.14.1",
     "babel-eslint": "^10.1.0",
     "boxen": "^5.0.0",
-    "commander": "^6.0.0",
     "dotenv": "^10.0.0",
-    "esbuild": "^0.13.6",
+    "esbuild": "^0.14.0",
     "eslint": "^7.7.0",
     "eslint-config-prettier": "^7.2.0",
     "eslint-plugin-import": "^2.20.1",

package/readme.md

@@ -51,8 +51,7 @@ $ npm install @serverless-devs/s -g
 
 > 如果您想为 Serverless Devs 贡献 Package（包括组件和应用），您可以参考 [Package开发文档](./docs/zh/package_dev.md)   
 
-> Serverless Devs 天然支持 Yaml 模式与 Cli 模式，关于两者的区别和试用场景，可以参考文档[ Yaml 模式 Cli 模式对比](./docs/zh/yaml_and_cli.md)
-
+> Serverless Devs 天然支持 Yaml 模式与 Cli 模式，关于两者的区别和试用场景，可以参考文档[ **Yaml 模式 Cli 模式对比**](./docs/zh/yaml_and_cli.md)；关于[**Exit Code 定义**](./docs/zh/tool.md#exit-code-定义)、[**Yaml 文件优先级规范**](./docs/zh/tool.md#yaml-文件优先级规范)、[**密钥使用顺序与规范**](./docs/zh/tool.md#密钥使用顺序与规范)、[**通过环境变量设置密钥**](./docs/zh/tool.md#通过环境变量设置密钥)更多关于项目设计的一些细节可以参考[**开发者工具设计文档**](./docs/zh/tool.md) 
 
 # 相关资源
 
@@ -68,6 +67,12 @@ $ npm install @serverless-devs/s -g
 
 > 🚀 除此之外 Serverless Devs 项目还拥有很多优秀的组件和应用，可以参考[Awesome](./docs/zh/awesome.md)
 
+# 项目期望
+
+- Serverless Devs 希望可以为 Serverless 开发者们提供一款可以无厂商锁定的，可以在 Serverless 应用全生命周期发挥作用的 Serverless 开发者工具；
+- Serverless Registry 希望可以为 Serverless 生态提供一套完整的包管理规范，与 Python 中的 pypi， Nodejs 中的 npm 等类似，将以此来开放和分享 Serverless Package，建设 Serverless 生态；
+- Serverless Developer Meetup 希望可以打造最符合 Serverless 开发者的社区活动，通过这个活动，我们希望更多人可以一起和我们交流、学习 Serverless 相关的产品；
+
 # 项目贡献
 
 我们非常希望您可以和我们一起贡献这个项目。贡献内容包括不限于代码的维护、应用/组件的贡献、文档的完善等，更多详情可以参考[ 🏆 贡献指南](./CONTRIBUTING.md)。
@@ -94,4 +99,4 @@ Serverless Devs 遵循 [MIT License](./LICENSE) 开源许可。
 
 -----------
 
-> Serverless Devs 开发者工具遵循 [Serverless Devs Model](./spec/readme.md)，更多模型/规范信息可以参考 [Serverless Registry Model](./spec/zh/0.0.1/serverless_registry_model/readme.md)，[Serverless User Model](./spec/zh/0.0.1/serverless_user_model/readme.md) 以及 [Serverless Package Model](./spec/zh/0.0.1/serverless_pacakge_model/readme.md)；另外，关于项目设计的一些细节可以参考[开发者工具设计文档](./docs/zh/tool.md)
+> Serverless Devs 开发者工具遵循 [Serverless Devs Model](./spec/readme.md)，更多模型/规范信息可以参考 [Serverless Registry Model](./spec/zh/0.0.1/serverless_registry_model/readme.md)，[Serverless User Model](./spec/zh/0.0.1/serverless_user_model/readme.md) 以及 [Serverless Package Model](./spec/zh/0.0.1/serverless_pacakge_model/readme.md)；

package/.eslintrc.json

@@ -1,112 +0,0 @@
-{
-  "parser": "@typescript-eslint/parser",
-  "extends": [
-    "plugin:@typescript-eslint/recommended",
-    "prettier/@typescript-eslint",
-    "plugin:prettier/recommended"
-  ],
-  "plugins": [
-    "@typescript-eslint"
-  ],
-  "rules": {
-    "linebreak-style": [
-      "error",
-      "unix"
-    ],
-    "indent": [
-      "error",
-      2
-    ],
-    "quotes": [
-      2,
-      "single",
-      {
-        "allowTemplateLiterals": true
-      }
-    ],
-    "semi": [
-      2,
-      "always"
-    ],
-    "strict": "off",
-    "curly": 2,
-    "eqeqeq": 2,
-    "no-eval": 2,
-    "guard-for-in": 2,
-    "no-caller": 2,
-    "no-else-return": 2,
-    "no-eq-null": 2,
-    "no-extend-native": 2,
-    "no-extra-bind": 2,
-    "no-floating-decimal": 2,
-    "no-implied-eval": 2,
-    "no-labels": 2,
-    "no-with": 2,
-    "no-loop-func": 1,
-    "no-native-reassign": 2,
-    "no-redeclare": [
-      2,
-      {
-        "builtinGlobals": true
-      }
-    ],
-    "no-delete-var": 2,
-    "no-shadow-restricted-names": 2,
-    "no-undef-init": 2,
-    "no-use-before-define": 0,
-    "no-undef": 2,
-    "callback-return": [
-      1,
-      [
-        "callback",
-        "cb",
-        "next"
-      ]
-    ],
-    "global-require": 0,
-    "no-console": 0,
-    "require-yield": 0,
-    "no-multi-spaces": 2,
-    "block-spacing": 2,
-    "keyword-spacing": 2,
-    "space-before-blocks": 2,
-    "no-process-exit": "off",
-    "comma-spacing": 2,
-    "key-spacing": 2,
-    "comma-dangle": 0,
-    "space-infix-ops": 2,
-    "prefer-const": "off",
-    "no-var": "off",
-    "prefer-rest-params": "off",
-    "@typescript-eslint/no-var-requires": "off",
-    "@typescript-eslint/camelcase": "off",
-    "@typescript-eslint/no-empty-function": "off",
-    "@typescript-eslint/no-use-before-define": "off",
-    "@typescript-eslint/no-this-alias": "off",
-    "@typescript-eslint/explicit-function-return-type": "off",
-    "@typescript-eslint/no-unused-vars": [
-      2,
-      {
-        "args": "none"
-      }
-    ]
-  },
-  "env": {
-    "es6": true,
-    "node": true,
-    "browser": true,
-    "jest": true
-  },
-  "globals": {
-    "describe": true,
-    "it": true,
-    "before": true,
-    "after": true,
-    "beforeEach": true,
-    "afterEach": true
-  },
-  "parserOptions": {
-    "ecmaVersion": 8,
-    "sourceType": "module"
-  }
-}

package/.prettierrc.json

@@ -1,11 +0,0 @@
-{
-  "printWidth": 120,
-  "semi": true,
-  "singleQuote": true,
-  "trailingComma": "all",
-  "bracketSpacing": true,
-  "jsxBracketSameLine": true,
-  "arrowParens": "avoid",
-  "tabWidth": 2,
-  "useTabs": false
-}

package/CODE_OF_CONDUCT.md

@@ -1,5 +0,0 @@
-# Serverless Devs Community Code of Conduct
-
-Serverless Devs follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).
-
-In cases of abusive, harassing, or any unacceptable behaviors, please don't hesitate to contact the project team at service@serverlessfans.com.