@serverless-devs/s 2.2.2 → 3.0.0-85afd68d

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serverless-devs/s",
-  "version": "2.2.2",
+  "version": "3.0.0-85afd68d",
   "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": [
@@ -29,62 +29,76 @@
   },
   "scripts": {
     "start": "npm run watch",
-    "prewatch": "rm -rf lib/* && cp -r ./src/daemon ./lib",
-    "watch": "tsc -w",
-    "test": "jest test/special-command.test",
-    "prebuild": "rm -rf lib/*",
-    "build": "tsc && cp -r ./src/daemon ./lib",
-    "postbuild": "esbuild lib/index.js --bundle --log-level=error --minify --external:@serverless-devs/core --external:@serverless-devs/ui --platform=node --format=cjs --target=node10.4 --allow-overwrite --outfile=lib/index.js",
-    "test:cov": "jest --coverage",
-    "lint": "npm run typecheck && f2elint scan -i src",
-    "fix": "f2elint fix",
-    "typecheck": "npx tsc -p tsconfig.json --noEmit",
-    "update": "rm -rf yarn.lock && rm -rf package-lock.json && rm -rf node_modules && yarn",
+    "test": "jest --testTimeout 10000",
+    "test:watch": "jest --testTimeout 10000 --watchAll",
+    "format": "prettier --write src/ __tests__/**/*.test.ts",
+    "watch": "npm run build -- --watch",
+    "prebuild": "rm -rf node_modules && npm install --production false",
+    "build": "node ./scripts/build.js",
+    "pkg": "pkg . --out-path releases",
+    "prepublishOnly": "npm run build",
     "beta": "npm publish --tag=beta",
-    "pkg": "tsc && pkg bin/s"
+    "pub": "npm publish"
+  },
+  "pkg": {
+    "scripts": [
+      "./lib/daemon/**/*.js"
+    ]
   },
   "main": "./lib/index.js",
   "bin": {
     "s": "bin/s"
   },
+  "engines": {
+    "node": ">=14.14.0"
+  },
   "devDependencies": {
-    "@serverless-devs/commander": "^6.2.6",
-    "@serverless-devs/utils": "^0.0.4",
-    "@types/jest": "^27.4.0",
-    "@types/node": "^18.16.1",
-    "@typescript-eslint/eslint-plugin": "^4.14.1",
-    "@typescript-eslint/parser": "^4.14.1",
-    "ajv": "^8.10.0",
-    "babel-eslint": "^10.1.0",
-    "boxen": "^5.0.0",
-    "dotenv": "^10.0.0",
-    "esbuild": "^0.14.0",
-    "eslint": "^7.7.0",
-    "eslint-config-prettier": "^7.2.0",
-    "eslint-plugin-import": "^2.20.1",
-    "eslint-plugin-prettier": "^3.1.2",
+    "@serverless-devs/core": "^0.1.66",
+    "@serverless-devs/credential": "^0.0.3",
+    "@serverless-devs/engine": "^0.0.25",
+    "@serverless-devs/load-application": "^0.0.10",
+    "@serverless-devs/load-component": "^0.0.6",
+    "@serverless-devs/logger": "^0.0.4",
+    "@serverless-devs/parse-spec": "^0.0.21",
+    "@serverless-devs/registry": "^0.0.4",
+    "@serverless-devs/utils": "^0.0.14",
+    "@types/fs-extra": "^11.0.4",
+    "@types/inquirer": "^9.0.7",
+    "@types/jest": "^29.5.8",
+    "@types/js-yaml": "^4.0.9",
+    "@types/lodash": "^4.14.201",
+    "@types/node": "^20.9.1",
+    "@types/semver": "^7.5.5",
+    "ajv": "^8.12.0",
+    "axios": "^1.6.2",
+    "boxen": "^7.1.1",
+    "chalk": "^5.3.0",
+    "commander": "^11.1.0",
+    "dotenv": "^16.3.1",
+    "dotenv-expand": "^10.0.0",
+    "esbuild": "^0.19.5",
+    "fs-extra": "^11.1.1",
     "global-agent": "^3.0.0",
-    "husky": "^4.2.3",
-    "inquirer": "8.2.0",
-    "inquirer-autocomplete-prompt": "^1.3.0",
-    "jest": "^29.5.0",
-    "latest-version": "^5.1.0",
-    "lint-staged": "^10.0.8",
-    "open": "^8.4.0",
-    "os-locale": "5.0.0",
-    "pkg": "^5.8.0",
-    "prettier": "^2.2.1",
-    "semver": "^7.3.5",
-    "semver-diff": "^3.1.1",
-    "ts-jest": "^29.1.0",
-    "ts-node": "^9.1.1",
-    "typescript": "^5.0.4"
+    "inquirer": "^9.2.12",
+    "inquirer-autocomplete-prompt": "^3.0.1",
+    "jest": "^29.7.0",
+    "js-yaml": "^4.1.0",
+    "latest-version": "^7.0.0",
+    "leven": "^4.0.0",
+    "lodash": "^4.17.21",
+    "pkg": "^5.8.1",
+    "prettier": "^3.1.0",
+    "prettyjson": "^1.2.5",
+    "rimraf": "^5.0.5",
+    "semver": "^7.5.4",
+    "semver-diff": "^4.0.0",
+    "table-layout": "^3.0.2",
+    "ts-jest": "^29.1.1",
+    "ts-node": "^10.9.1",
+    "typescript": "^5.2.2",
+    "strip-ansi": "^7.1.0"
   },
   "lint-staged": {
     "**/*.{js,jsx,ts}": "f2elint exec eslint"
-  },
-  "dependencies": {
-    "@serverless-devs/core": "^0.1.65",
-    "@serverless-devs/ui": "latest"
   }
-}
+}

package/readme.md

@@ -46,11 +46,11 @@ $ npm install @serverless-devs/s -g
 ```
 ❸ 在命令行中执行命令`s`，并按回车，开启你的 Serverless 之旅；   
 
-> 更多详细信息可以参考[Serverless Devs 安装文档](./docs/zh/install.md)和[快速入门指南](./docs/zh/quick_start.md)
+> 更多详细信息可以参考[Serverless Devs 安装文档](./docs/zh/quick_start.md)和[快速入门指南](./docs/zh/quick_start.md)
 
 # 帮助文档
 
-- [安装文档](./docs/zh/install.md)
+- [安装文档](./docs/zh/quick_start.md)
 - [命令行操作](./docs/zh/command/readme.md)
 - [Yaml规范](./docs/zh/yaml.md)
 - [配置继承/多环境](./docs/zh/extend.md)

package/lib/check-node-version/index.js

@@ -1,15 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var error_1 = require("../error");
-function checkNodeVersion() {
-    var nodeVersion = Number(process.version.split('.')[0].slice(1));
-    if (nodeVersion < 12) {
-        new error_1.HumanError({
-            errorMessage: 'Node.js version must be greater than or equal to 12.0.0',
-            tips: "Your current Node.js version is ".concat(process.version, ", please upgrade your Node.js version at https://nodejs.org/en/."),
-        });
-        process.exit(1);
-    }
-}
-exports.default = checkNodeVersion;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2hlY2stbm9kZS12ZXJzaW9uL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsa0NBQXNDO0FBRXRDLFNBQVMsZ0JBQWdCO0lBQ3ZCLElBQU0sV0FBVyxHQUFHLE1BQU0sQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNuRSxJQUFJLFdBQVcsR0FBRyxFQUFFLEVBQUU7UUFDcEIsSUFBSSxrQkFBVSxDQUFDO1lBQ2IsWUFBWSxFQUFFLHlEQUF5RDtZQUN2RSxJQUFJLEVBQUUsMENBQW1DLE9BQU8sQ0FBQyxPQUFPLHFFQUFrRTtTQUMzSCxDQUFDLENBQUM7UUFDSCxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0tBQ2pCO0FBQ0gsQ0FBQztBQUVELGtCQUFlLGdCQUFnQixDQUFDIn0=

package/lib/clean/index.js

@@ -1,166 +0,0 @@
-"use strict";
-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) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-var core_1 = __importDefault(require("../utils/core"));
-var i18n_1 = __importDefault(require("../utils/i18n"));
-var path_1 = __importDefault(require("path"));
-var logger_1 = __importDefault(require("../utils/logger"));
-var handler_set_config_1 = require("../utils/handler-set-config");
-var common_1 = require("../utils/common");
-var error_1 = require("../error");
-var rimraf = core_1.default.rimraf, fs = core_1.default.fse, colors = core_1.default.colors, getRootHome = core_1.default.getRootHome;
-var description = "Clean up the cache related functions of serverless devs. You can clean up the environment, unused dependent packages and related cache contents through this command.\n    \n    Example:\n        $ s clean --component fc-api\n        $ s clean --all\n\n    Tips:\n        Get all installed component: s component\n\n".concat((0, common_1.emoji)('📖'), " Document: ").concat(colors.underline('https://github.com/Serverless-Devs/Serverless-Devs/tree/master/docs/zh/command/clean.md'));
-function run(program) {
-    return __awaiter(this, void 0, void 0, function () {
-        var command, doAction;
-        var _this = this;
-        return __generator(this, function (_a) {
-            command = program
-                .command('clean')
-                .usage('[options]')
-                .option('--all', (0, i18n_1.default)('clean_up_the_environment'))
-                .option('--cache [dirName]', (0, i18n_1.default)('delete_the_file_under_the_cache'))
-                .option('--component [componentName]', (0, i18n_1.default)('remove_components'))
-                .helpOption('-h, --help', (0, i18n_1.default)('display_help_for_command'))
-                .description(description)
-                .addHelpCommand(false)
-                .action(function (options) { return __awaiter(_this, void 0, void 0, function () {
-                var error_2;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            _a.trys.push([0, 2, , 4]);
-                            return [4 /*yield*/, doAction(options)];
-                        case 1:
-                            _a.sent();
-                            return [3 /*break*/, 4];
-                        case 2:
-                            error_2 = _a.sent();
-                            return [4 /*yield*/, (0, error_1.HandleError)(error_2)];
-                        case 3:
-                            _a.sent();
-                            return [3 /*break*/, 4];
-                        case 4: return [2 /*return*/];
-                    }
-                });
-            }); });
-            doAction = function (args) { return __awaiter(_this, void 0, void 0, function () {
-                var sPath, cachePath, componentsPath, githubPath, devsappPath, files, spath, sdir, error_3, registry, filePath, filePath;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            sPath = getRootHome();
-                            cachePath = path_1.default.join(sPath, 'cache');
-                            componentsPath = path_1.default.join(sPath, 'components');
-                            githubPath = path_1.default.join(componentsPath, 'github.com');
-                            devsappPath = path_1.default.join(componentsPath, 'devsapp.cn');
-                            if (!args.all) return [3 /*break*/, 5];
-                            files = ['cache', 'components'];
-                            files.forEach(function (file) {
-                                rimraf.sync(path_1.default.join(sPath, file));
-                            });
-                            _a.label = 1;
-                        case 1:
-                            _a.trys.push([1, 3, , 4]);
-                            return [4 /*yield*/, core_1.default.getTemplatePath()];
-                        case 2:
-                            spath = _a.sent();
-                            sdir = path_1.default.join(path_1.default.dirname(spath), '.s');
-                            rimraf.sync(sdir);
-                            return [3 /*break*/, 4];
-                        case 3:
-                            error_3 = _a.sent();
-                            return [3 /*break*/, 4];
-                        case 4:
-                            logger_1.default.log('The environment of Serverless Devs has been cleaned up successfully.', 'green');
-                            return [2 /*return*/];
-                        case 5:
-                            if (args.cache) {
-                                // cache 无参数
-                                if (typeof args.cache === 'boolean') {
-                                    rimraf.sync(path_1.default.join(cachePath));
-                                    logger_1.default.log('Cache has been cleaned up successfully.', 'green');
-                                }
-                                // cache 有参数
-                                if (typeof args.cache === 'string') {
-                                    rimraf.sync(path_1.default.join(cachePath, args.cache));
-                                    logger_1.default.log("Cache [".concat(args.cache, "] has been cleaned up successfully."), 'green');
-                                }
-                                return [2 /*return*/];
-                            }
-                            if (args.component) {
-                                // component 无参数
-                                if (typeof args.component === 'boolean') {
-                                    rimraf.sync(componentsPath);
-                                    logger_1.default.log('Component has been cleaned up successfully.', 'green');
-                                }
-                                // component 有参数
-                                if (typeof args.component === 'string') {
-                                    registry = (0, handler_set_config_1.getConfig)('registry');
-                                    // s 源
-                                    if (registry === 'http://registry.devsapp.cn/simple') {
-                                        filePath = path_1.default.join(devsappPath, args.component);
-                                        if (fs.existsSync(filePath)) {
-                                            rimraf.sync(filePath);
-                                            logger_1.default.log("Component [".concat(args.component, "] has been cleaned up successfully."), 'green');
-                                        }
-                                    }
-                                    // git 源
-                                    if (registry === 'https://api.github.com/repos') {
-                                        filePath = path_1.default.join(githubPath, args.component);
-                                        if (fs.existsSync(filePath)) {
-                                            rimraf.sync(filePath);
-                                            logger_1.default.log("Component [".concat(args.component, "] has been cleaned up successfully."), 'green');
-                                        }
-                                    }
-                                }
-                                return [2 /*return*/];
-                            }
-                            command.help();
-                            return [2 /*return*/];
-                    }
-                });
-            }); };
-            return [2 /*return*/];
-        });
-    });
-}
-module.exports = run;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2xlYW4vaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHVEQUFpQztBQUNqQyx1REFBaUM7QUFDakMsOENBQXdCO0FBQ3hCLDJEQUFxQztBQUNyQyxrRUFBd0Q7QUFDeEQsMENBQXdDO0FBQ3hDLGtDQUF1QztBQUUvQixJQUFBLE1BQU0sR0FBbUMsY0FBSSxPQUF2QyxFQUFPLEVBQUUsR0FBMEIsY0FBSSxJQUE5QixFQUFFLE1BQU0sR0FBa0IsY0FBSSxPQUF0QixFQUFFLFdBQVcsR0FBSyxjQUFJLFlBQVQsQ0FBVTtBQUV0RCxJQUFNLFdBQVcsR0FBRyxxVUFTbEIsSUFBQSxjQUFLLEVBQUMsSUFBSSxDQUFDLHdCQUFjLE1BQU0sQ0FBQyxTQUFTLENBQ3pDLHlGQUF5RixDQUMxRixDQUFFLENBQUM7QUFFSixTQUFlLEdBQUcsQ0FBQyxPQUFPOzs7OztZQUNsQixPQUFPLEdBQUcsT0FBTztpQkFDcEIsT0FBTyxDQUFDLE9BQU8sQ0FBQztpQkFDaEIsS0FBSyxDQUFDLFdBQVcsQ0FBQztpQkFDbEIsTUFBTSxDQUFDLE9BQU8sRUFBRSxJQUFBLGNBQUksRUFBQywwQkFBMEIsQ0FBQyxDQUFDO2lCQUNqRCxNQUFNLENBQUMsbUJBQW1CLEVBQUUsSUFBQSxjQUFJLEVBQUMsaUNBQWlDLENBQUMsQ0FBQztpQkFDcEUsTUFBTSxDQUFDLDZCQUE2QixFQUFFLElBQUEsY0FBSSxFQUFDLG1CQUFtQixDQUFDLENBQUM7aUJBQ2hFLFVBQVUsQ0FBQyxZQUFZLEVBQUUsSUFBQSxjQUFJLEVBQUMsMEJBQTBCLENBQUMsQ0FBQztpQkFDMUQsV0FBVyxDQUFDLFdBQVcsQ0FBQztpQkFDeEIsY0FBYyxDQUFDLEtBQUssQ0FBQztpQkFDckIsTUFBTSxDQUFDLFVBQU0sT0FBTzs7Ozs7OzRCQUVqQixxQkFBTSxRQUFRLENBQUMsT0FBTyxDQUFDLEVBQUE7OzRCQUF2QixTQUF1QixDQUFDOzs7OzRCQUV4QixxQkFBTSxJQUFBLG1CQUFXLEVBQUMsT0FBSyxDQUFDLEVBQUE7OzRCQUF4QixTQUF3QixDQUFDOzs7OztpQkFFNUIsQ0FBQyxDQUFDO1lBRUMsUUFBUSxHQUFHLFVBQU0sSUFBSTs7Ozs7NEJBQ25CLEtBQUssR0FBRyxXQUFXLEVBQUUsQ0FBQzs0QkFDdEIsU0FBUyxHQUFHLGNBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxFQUFFLE9BQU8sQ0FBQyxDQUFDOzRCQUN0QyxjQUFjLEdBQUcsY0FBSSxDQUFDLElBQUksQ0FBQyxLQUFLLEVBQUUsWUFBWSxDQUFDLENBQUM7NEJBQ2hELFVBQVUsR0FBRyxjQUFJLENBQUMsSUFBSSxDQUFDLGNBQWMsRUFBRSxZQUFZLENBQUMsQ0FBQzs0QkFDckQsV0FBVyxHQUFHLGNBQUksQ0FBQyxJQUFJLENBQUMsY0FBYyxFQUFFLFlBQVksQ0FBQyxDQUFDO2lDQUN4RCxJQUFJLENBQUMsR0FBRyxFQUFSLHdCQUFROzRCQUNKLEtBQUssR0FBRyxDQUFDLE9BQU8sRUFBRSxZQUFZLENBQUMsQ0FBQzs0QkFDdEMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxVQUFDLElBQVk7Z0NBQ3pCLE1BQU0sQ0FBQyxJQUFJLENBQUMsY0FBSSxDQUFDLElBQUksQ0FBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQzs0QkFDdEMsQ0FBQyxDQUFDLENBQUM7Ozs7NEJBRWEscUJBQU0sY0FBSSxDQUFDLGVBQWUsRUFBRSxFQUFBOzs0QkFBcEMsS0FBSyxHQUFHLFNBQTRCOzRCQUNwQyxJQUFJLEdBQUcsY0FBSSxDQUFDLElBQUksQ0FBQyxjQUFJLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxFQUFFLElBQUksQ0FBQyxDQUFDOzRCQUNsRCxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDOzs7Ozs7NEJBRXBCLGdCQUFNLENBQUMsR0FBRyxDQUFDLHNFQUFzRSxFQUFFLE9BQU8sQ0FBQyxDQUFDOzRCQUM1RixzQkFBTzs7NEJBRVQsSUFBSSxJQUFJLENBQUMsS0FBSyxFQUFFO2dDQUNkLFlBQVk7Z0NBQ1osSUFBSSxPQUFPLElBQUksQ0FBQyxLQUFLLEtBQUssU0FBUyxFQUFFO29DQUNuQyxNQUFNLENBQUMsSUFBSSxDQUFDLGNBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQztvQ0FDbEMsZ0JBQU0sQ0FBQyxHQUFHLENBQUMseUNBQXlDLEVBQUUsT0FBTyxDQUFDLENBQUM7aUNBQ2hFO2dDQUNELFlBQVk7Z0NBQ1osSUFBSSxPQUFPLElBQUksQ0FBQyxLQUFLLEtBQUssUUFBUSxFQUFFO29DQUNsQyxNQUFNLENBQUMsSUFBSSxDQUFDLGNBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO29DQUM5QyxnQkFBTSxDQUFDLEdBQUcsQ0FBQyxpQkFBVSxJQUFJLENBQUMsS0FBSyx3Q0FBcUMsRUFBRSxPQUFPLENBQUMsQ0FBQztpQ0FDaEY7Z0NBQ0Qsc0JBQU87NkJBQ1I7NEJBQ0QsSUFBSSxJQUFJLENBQUMsU0FBUyxFQUFFO2dDQUNsQixnQkFBZ0I7Z0NBQ2hCLElBQUksT0FBTyxJQUFJLENBQUMsU0FBUyxLQUFLLFNBQVMsRUFBRTtvQ0FDdkMsTUFBTSxDQUFDLElBQUksQ0FBQyxjQUFjLENBQUMsQ0FBQztvQ0FDNUIsZ0JBQU0sQ0FBQyxHQUFHLENBQUMsNkNBQTZDLEVBQUUsT0FBTyxDQUFDLENBQUM7aUNBQ3BFO2dDQUNELGdCQUFnQjtnQ0FDaEIsSUFBSSxPQUFPLElBQUksQ0FBQyxTQUFTLEtBQUssUUFBUSxFQUFFO29DQUNoQyxRQUFRLEdBQUcsSUFBQSw4QkFBUyxFQUFDLFVBQVUsQ0FBQyxDQUFDO29DQUN2QyxNQUFNO29DQUNOLElBQUksUUFBUSxLQUFLLG1DQUFtQyxFQUFFO3dDQUM5QyxRQUFRLEdBQUcsY0FBSSxDQUFDLElBQUksQ0FBQyxXQUFXLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDO3dDQUN4RCxJQUFJLEVBQUUsQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLEVBQUU7NENBQzNCLE1BQU0sQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUM7NENBQ3RCLGdCQUFNLENBQUMsR0FBRyxDQUFDLHFCQUFjLElBQUksQ0FBQyxTQUFTLHdDQUFxQyxFQUFFLE9BQU8sQ0FBQyxDQUFDO3lDQUN4RjtxQ0FDRjtvQ0FDRCxRQUFRO29DQUNSLElBQUksUUFBUSxLQUFLLDhCQUE4QixFQUFFO3dDQUN6QyxRQUFRLEdBQUcsY0FBSSxDQUFDLElBQUksQ0FBQyxVQUFVLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDO3dDQUN2RCxJQUFJLEVBQUUsQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLEVBQUU7NENBQzNCLE1BQU0sQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUM7NENBQ3RCLGdCQUFNLENBQUMsR0FBRyxDQUFDLHFCQUFjLElBQUksQ0FBQyxTQUFTLHdDQUFxQyxFQUFFLE9BQU8sQ0FBQyxDQUFDO3lDQUN4RjtxQ0FDRjtpQ0FDRjtnQ0FDRCxzQkFBTzs2QkFDUjs0QkFDRCxPQUFPLENBQUMsSUFBSSxFQUFFLENBQUM7Ozs7aUJBQ2hCLENBQUM7Ozs7Q0FDSDtBQUVELGlCQUFTLEdBQUcsQ0FBQyJ9

package/lib/cli/index.js

@@ -1,223 +0,0 @@
-"use strict";
-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) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-var core_1 = __importDefault(require("../utils/core"));
-var path_1 = __importDefault(require("path"));
-var error_1 = require("../error");
-var utils_1 = require("../utils");
-var chalk = core_1.default.chalk, loadComponent = core_1.default.loadComponent, lodash = core_1.default.lodash;
-var underline = chalk.underline;
-var isEmpty = lodash.isEmpty, isString = lodash.isString, includes = lodash.includes;
-var description = "Directly use serverless devs to use components, develop and manage applications without yaml configuration.\n    \n    Example:\n        $ s cli fc-api listServices\n        $ s cli fc-api listFunctions --service-name my-service\n        $ s cli fc-api deploy -p \"{/\"function/\": /\"function-name/\"}\"\n\n".concat((0, utils_1.emoji)('📖'), " Document: ").concat(underline('https://github.com/Serverless-Devs/Serverless-Devs/tree/master/docs/zh/command/cli.md'));
-var throwError = function (error) {
-    var jsonMsg;
-    try {
-        jsonMsg = JSON.parse(error.message);
-    }
-    catch (error) { }
-    if (jsonMsg && jsonMsg.tips) {
-        throw new Error(JSON.stringify({
-            code: 101,
-            message: jsonMsg.message,
-            tips: jsonMsg.tips,
-        }));
-    }
-    else {
-        throw new Error(JSON.stringify({
-            code: 101,
-            message: error.message,
-            stack: error.stack,
-        }));
-    }
-};
-function run(program) {
-    return __awaiter(this, void 0, void 0, function () {
-        var command, doAction;
-        var _this = this;
-        return __generator(this, function (_a) {
-            command = program
-                .command('cli')
-                .usage('[component] [method] [options]')
-                .option('-a, --access <aliasName>', 'Specify the access alias name.')
-                .option('-p, --props <jsonString>', 'The json string of props')
-                .helpOption('-h, --help', 'Display help for command')
-                .allowUnknownOption()
-                .description(description)
-                .addHelpCommand(false)
-                .action(function (options) { return __awaiter(_this, void 0, void 0, function () {
-                var error_2;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            _a.trys.push([0, 2, , 4]);
-                            return [4 /*yield*/, doAction(options)];
-                        case 1:
-                            _a.sent();
-                            return [3 /*break*/, 4];
-                        case 2:
-                            error_2 = _a.sent();
-                            return [4 /*yield*/, (0, error_1.HandleError)(error_2)];
-                        case 3:
-                            _a.sent();
-                            return [3 /*break*/, 4];
-                        case 4: return [2 /*return*/];
-                    }
-                });
-            }); });
-            doAction = function (options) { return __awaiter(_this, void 0, void 0, function () {
-                function getCurentCredential(access) {
-                    return __awaiter(this, void 0, void 0, function () {
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0:
-                                    if (!(access === core_1.default.ALIYUN_CLI)) return [3 /*break*/, 2];
-                                    return [4 /*yield*/, core_1.default.getCredential(access)];
-                                case 1: return [2 /*return*/, _a.sent()];
-                                case 2: return [4 /*yield*/, (0, utils_1.getCredentialWithExisted)(access)];
-                                case 3: return [2 /*return*/, _a.sent()];
-                            }
-                        });
-                    });
-                }
-                function execComponent(_method) {
-                    return __awaiter(this, void 0, void 0, function () {
-                        var credentials, tempProp, p, argsObj, inputs, res, error_3;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0: return [4 /*yield*/, getCurentCredential(access)];
-                                case 1:
-                                    credentials = _a.sent();
-                                    tempProp = {};
-                                    try {
-                                        p = argvData.props || argvData.p;
-                                        tempProp = p ? JSON.parse(p) : {};
-                                    }
-                                    catch (e) {
-                                        throw new Error('-p/--props parameter format error');
-                                    }
-                                    argsObj = rawData
-                                        .slice(3)
-                                        .filter(function (o) { return !includes(argvData._argsObj, o); })
-                                        .concat(argvData._argsObj);
-                                    inputs = {
-                                        props: tempProp,
-                                        credentials: credentials || {},
-                                        appName: 'default',
-                                        project: {
-                                            component: componentName,
-                                            access: access,
-                                            projectName: 'default',
-                                            provider: undefined,
-                                        },
-                                        command: _method,
-                                        args: argsObj.join(' '),
-                                        argsObj: argsObj,
-                                        path: {
-                                            configPath: process.cwd(),
-                                        },
-                                    };
-                                    _a.label = 2;
-                                case 2:
-                                    _a.trys.push([2, 4, , 5]);
-                                    return [4 /*yield*/, instance[_method](inputs)];
-                                case 3:
-                                    res = _a.sent();
-                                    if (isEmpty(res)) {
-                                        return [2 /*return*/, utils_1.logger.success("End of method: ".concat(_method))];
-                                    }
-                                    isString(res) ? utils_1.logger.success(res) : utils_1.logger.output(res);
-                                    return [3 /*break*/, 5];
-                                case 4:
-                                    error_3 = _a.sent();
-                                    throwError(error_3);
-                                    return [3 /*break*/, 5];
-                                case 5: return [2 /*return*/];
-                            }
-                        });
-                    });
-                }
-                var argvData, rawData, _a, access, help, _b, componentName, method, instance, docResult, publishPath;
-                return __generator(this, function (_c) {
-                    switch (_c.label) {
-                        case 0:
-                            argvData = core_1.default.getGlobalArgs(process.argv.slice(2));
-                            rawData = argvData._, _a = argvData.access, access = _a === void 0 ? 'default' : _a, help = argvData.help;
-                            // s cli
-                            if (rawData.length === 1 || (rawData.length === 1 && help)) {
-                                command.help();
-                            }
-                            _b = rawData.slice(1), componentName = _b[0], method = _b[1];
-                            return [4 /*yield*/, loadComponent(componentName)];
-                        case 1:
-                            instance = _c.sent();
-                            if (!(rawData.length === 2)) return [3 /*break*/, 5];
-                            if (!instance['index']) return [3 /*break*/, 3];
-                            return [4 /*yield*/, execComponent('index')];
-                        case 2: return [2 /*return*/, _c.sent()];
-                        case 3:
-                            if (instance.__doc && instance.__doc().length > 1685) {
-                                docResult = instance.__doc();
-                                return [2 /*return*/, utils_1.logger.log(docResult)];
-                            }
-                            publishPath = path_1.default.join(instance.__path, 'publish.yml');
-                            return [4 /*yield*/, (0, utils_1.specifyServiceHelp)(publishPath)];
-                        case 4:
-                            _c.sent();
-                            return [2 /*return*/];
-                        case 5:
-                            if (!(rawData.length >= 3)) return [3 /*break*/, 8];
-                            if (!instance[method]) return [3 /*break*/, 7];
-                            return [4 /*yield*/, execComponent(method)];
-                        case 6: return [2 /*return*/, _c.sent()];
-                        case 7: throw new Error(JSON.stringify({
-                            code: 100,
-                            message: 'The specified command cannot be found.',
-                            tips: 'Please refer to the help document of [-h/--help] command.',
-                        }));
-                        case 8: return [2 /*return*/];
-                    }
-                });
-            }); };
-            return [2 /*return*/];
-        });
-    });
-}
-module.exports = run;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2xpL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSx1REFBaUM7QUFDakMsOENBQXdCO0FBQ3hCLGtDQUF1QztBQUN2QyxrQ0FBdUY7QUFDL0UsSUFBQSxLQUFLLEdBQTRCLGNBQUksTUFBaEMsRUFBRSxhQUFhLEdBQWEsY0FBSSxjQUFqQixFQUFFLE1BQU0sR0FBSyxjQUFJLE9BQVQsQ0FBVTtBQUN0QyxJQUFBLFNBQVMsR0FBSyxLQUFLLFVBQVYsQ0FBVztBQUNwQixJQUFBLE9BQU8sR0FBeUIsTUFBTSxRQUEvQixFQUFFLFFBQVEsR0FBZSxNQUFNLFNBQXJCLEVBQUUsUUFBUSxHQUFLLE1BQU0sU0FBWCxDQUFZO0FBRS9DLElBQU0sV0FBVyxHQUFHLDhUQU9sQixJQUFBLGFBQUssRUFBQyxJQUFJLENBQUMsd0JBQWMsU0FBUyxDQUNsQyx1RkFBdUYsQ0FDeEYsQ0FBRSxDQUFDO0FBRUosSUFBTSxVQUFVLEdBQUcsVUFBQSxLQUFLO0lBQ3RCLElBQUksT0FBTyxDQUFDO0lBQ1osSUFBSTtRQUNGLE9BQU8sR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQztLQUNyQztJQUFDLE9BQU8sS0FBSyxFQUFFLEdBQUc7SUFDbkIsSUFBSSxPQUFPLElBQUksT0FBTyxDQUFDLElBQUksRUFBRTtRQUMzQixNQUFNLElBQUksS0FBSyxDQUNiLElBQUksQ0FBQyxTQUFTLENBQUM7WUFDYixJQUFJLEVBQUUsR0FBRztZQUNULE9BQU8sRUFBRSxPQUFPLENBQUMsT0FBTztZQUN4QixJQUFJLEVBQUUsT0FBTyxDQUFDLElBQUk7U0FDbkIsQ0FBQyxDQUNILENBQUM7S0FDSDtTQUFNO1FBQ0wsTUFBTSxJQUFJLEtBQUssQ0FDYixJQUFJLENBQUMsU0FBUyxDQUFD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