@serverless-devs/s 3.0.0-beta.2 → 3.0.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serverless-devs/s",
-  "version": "3.0.0-beta.2",
+  "version": "3.0.0-beta.4",
   "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": [
@@ -30,31 +30,37 @@
   "scripts": {
     "start": "npm run watch",
     "format": "prettier --write src/",
-    "prewatch": "rm -rf lib/* && cp -r ./src/daemon ./lib",
-    "watch": "tsc --skipLibCheck -w",
-    "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",
+    "prewatch": "rm -rf lib && mkdir lib && cp -r ./src/daemon ./lib",
+    "watch": "npm run build -- --watch",
+    "prebuild": "npm run prewatch",
+    "build": "esbuild src/index.ts --bundle --log-level=error --minify --platform=node --format=cjs --target=node12 --outfile=lib/index.js",
+    "postbuild": "esbuild src/update-notifier/index.ts --bundle --log-level=error --minify --platform=node --format=cjs --target=node12 --outfile=lib/update-notifier.js",
     "beta": "npm publish --tag=beta",
-    "pkg": "tsc && pkg bin/s"
+    "prepkg": "npm run build",
+    "pkg": "pkg bin/s",
+    "prepublishOnly": "npm run build"
   },
   "main": "./lib/index.js",
   "bin": {
     "s": "bin/s"
   },
   "devDependencies": {
+    "@serverless-devs/core": "^0.1.62",
     "@serverless-devs/credential": "beta",
-    "@serverless-devs/engine": "^0.0.1-beta.2",
-    "@serverless-devs/load-application": "beta",
-    "@serverless-devs/logger": "beta",
-    "@serverless-devs/parse-spec": "beta",
-    "@serverless-devs/registry": "beta",
-    "@serverless-devs/utils": "beta",
+    "@serverless-devs/engine": "^0.0.1-beta.21",
+    "@serverless-devs/load-application": "^0.0.2",
+    "@serverless-devs/logger": "^0.0.2-beta.6",
+    "@serverless-devs/parse-spec": "^0.0.1-beta.9",
+    "@serverless-devs/registry": "^0.0.2-beta.5",
+    "@serverless-devs/utils": "^0.0.8-beta.6",
     "@types/fs-extra": "^11.0.1",
+    "@types/inquirer": "^9.0.3",
     "@types/js-yaml": "^4.0.5",
     "@types/lodash": "^4.14.195",
     "@types/node": "^18.16.1",
-    "chalk": "^4.1.0",
+    "@types/semver": "^7.5.0",
+    "boxen": "^7.1.1",
+    "chalk": "^5.3.0",
     "commander": "^11.0.0",
     "esbuild": "^0.18.11",
     "fs-extra": "^11.1.1",
@@ -62,17 +68,18 @@
     "inquirer": "8.2.5",
     "inquirer-autocomplete-prompt": "^1.3.0",
     "js-yaml": "^4.1.0",
+    "latest-version": "^7.0.0",
     "lodash": "^4.17.21",
+    "pkg": "^5.8.1",
     "prettier": "^2.8.8",
     "rimraf": "^5.0.1",
+    "semver": "^7.5.4",
+    "semver-diff": "^4.0.0",
     "table-layout": "^3.0.2",
     "ts-node": "^9.1.1",
     "typescript": "^5.0.4"
   },
   "lint-staged": {
     "**/*.{js,jsx,ts}": "f2elint exec eslint"
-  },
-  "dependencies": {
-    "@serverless-devs/core": "^0.1.60"
   }
 }

package/replace-committers.sh

@@ -0,0 +1,69 @@
+#!/bin/bash
+
+CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+BK_CURRENT_BRANCH=${CURRENT_BRANCH}"_replace_committers"
+git checkout -b $BK_CURRENT_BRANCH
+
+# Set the old and new email and name values
+OLD_EMAIL_WSS=wssgryx@163.com
+CORRECT_NAME_WSS=王守帅
+CORRECT_EMAIL_WSS=wb-wss447188@alibaba-inc.com
+
+OLD_EMAIL_SHL=xsahxl@126.com
+CORRECT_NAME_SHL=史华力
+CORRECT_EMAIL_SHL=wb-shl391697@alibaba-inc.com
+
+OLD_EMAIL_LS=ls_huster@163.com
+CORRECT_NAME_LS=ls147258
+CORRECT_EMAIL_LS=ls147258@alibaba-inc.com
+
+# Find the commit hash of the commit from two months ago
+TWO_MONTHS_AGO=$(git log --branches --remotes --since="3 months ago" --pretty=format:"%H" | tail -1)
+
+# Filter the current branch from two months ago to HEAD
+git filter-branch --env-filter "
+    if [ \$GIT_COMMITTER_EMAIL = '$OLD_EMAIL_WSS' ]
+    then
+        export GIT_COMMITTER_NAME='$CORRECT_NAME_WSS'
+        export GIT_COMMITTER_EMAIL='$CORRECT_EMAIL_WSS'
+    fi
+    if [ \$GIT_AUTHOR_EMAIL = '$OLD_EMAIL_WSS' ]
+    then
+        export GIT_AUTHOR_NAME='$CORRECT_NAME_WSS'
+        export GIT_AUTHOR_EMAIL='$CORRECT_EMAIL_WSS'
+    fi
+
+    if [ \$GIT_COMMITTER_EMAIL = '$OLD_EMAIL_SHL' ]
+    then
+        export GIT_COMMITTER_NAME='$CORRECT_NAME_SHL'
+        export GIT_COMMITTER_EMAIL='$CORRECT_EMAIL_SHL'
+    fi
+    if [ \$GIT_AUTHOR_EMAIL = '$OLD_EMAIL_SHL' ]
+    then
+        export GIT_AUTHOR_NAME='$CORRECT_NAME_SHL'
+        export GIT_AUTHOR_EMAIL='$CORRECT_EMAIL_SHL'
+    fi
+
+    if [ \$GIT_COMMITTER_EMAIL = '$OLD_EMAIL_LS' ]
+    then
+        export GIT_COMMITTER_NAME='$CORRECT_NAME_LS'
+        export GIT_COMMITTER_EMAIL='$CORRECT_EMAIL_LS'
+    fi
+    if [ \$GIT_AUTHOR_EMAIL = '$OLD_EMAIL_LS' ]
+    then
+        export GIT_AUTHOR_NAME='$CORRECT_NAME_LS'
+        export GIT_AUTHOR_EMAIL='$CORRECT_EMAIL_LS'
+    fi
+" --tag-name-filter cat $TWO_MONTHS_AGO..HEAD
+
+# Delete the original refs after the filter is done
+git for-each-ref --format='%(refname)' refs/original/ | xargs -n 1 git update-ref -d
+
+# Force push the changes to the remote repository
+git remote add bk http://gitlab.alibaba-inc.com/serverless-devs-backup/serverless-devs.git
+git push bk $BK_CURRENT_BRANCH --force --no-verify
+
+# Clear
+git remote remove bk
+git checkout $CURRENT_BRANCH
+git branch -D $BK_CURRENT_BRANCH

package/lib/command/clean/index.js

@@ -1,125 +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 };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var fs_1 = __importDefault(require("fs"));
-var chalk_1 = require("chalk");
-var utils_1 = require("../../utils");
-var utils_2 = require("@serverless-devs/utils");
-var path_1 = __importDefault(require("path"));
-var logger_1 = __importDefault(require("../../logger"));
-var rimraf = require('rimraf');
-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, utils_1.emoji)('📖'), " Document: ").concat((0, chalk_1.underline)('https://serverless.help/s/clean'));
-function cleanLogs() {
-    var sPath = (0, utils_2.getRootHome)();
-    var p = path_1.default.join(sPath, 'logs');
-    rimraf.sync(p);
-    logger_1.default.info('Logs cleaned up successfully.');
-}
-function cleanCache(cache) {
-    var sPath = (0, utils_2.getRootHome)();
-    var cachePath = path_1.default.join(sPath, 'cache');
-    // cache 无参数
-    if (cache === true) {
-        rimraf.sync(cachePath);
-        logger_1.default.info('Cache cleaned up successfully.');
-        return;
-    }
-    // cache 有参数
-    rimraf.sync(path_1.default.join(cachePath, cache));
-    logger_1.default.info("Cache [".concat(cache, "] has been cleaned up successfully."));
-}
-function cleanComponent(component) {
-    var sPath = (0, utils_2.getRootHome)();
-    var componentsPath = path_1.default.join(sPath, 'components');
-    if (component === true) {
-        rimraf.sync(componentsPath);
-        logger_1.default.info('Component cleaned up successfully.');
-        return;
-    }
-    var registryPath = [path_1.default.join(componentsPath, 'github.com'), path_1.default.join(componentsPath, 'devsapp.cn')];
-    for (var _i = 0, registryPath_1 = registryPath; _i < registryPath_1.length; _i++) {
-        var registry = registryPath_1[_i];
-        var p = path_1.default.join(registry, component);
-        if (fs_1.default.existsSync(p)) {
-            rimraf.sync(p);
-        }
-    }
-    logger_1.default.info("Component [".concat(component, "] has been cleaned up successfully."));
-}
-exports.default = (function (program) {
-    program
-        .command('clean')
-        .usage('[options]')
-        .description(description)
-        .summary("".concat((0, utils_1.emoji)('💥'), " Clean up the environment."))
-        .option('--all', 'Clean up the environment')
-        .option('--logs', 'Clean logs')
-        .option('--cache [dirName]', 'Delete the <dirName> file in the cache')
-        .option('--component [componentName]', 'Remove component (like: fc, fc@0.0.1)')
-        .helpOption('-h, --help', 'Display help for command')
-        .action(function (options) { return __awaiter(void 0, void 0, void 0, function () {
-        var all, cache, component, logs;
-        return __generator(this, function (_a) {
-            all = options.all, cache = options.cache, component = options.component, logs = options.logs;
-            if (all) {
-                cleanComponent(true);
-                cleanCache(true);
-                cleanLogs();
-                logger_1.default.info('The environment of Serverless Devs has been cleaned up successfully.');
-                return [2 /*return*/];
-            }
-            if (logs) {
-                cleanLogs();
-            }
-            if (component) {
-                cleanComponent(component);
-                return [2 /*return*/];
-            }
-            if (cache) {
-                cleanCache(cache);
-                return [2 /*return*/];
-            }
-            logger_1.default.error("There are no specified parameters. If you need to clear all caches, please specify 's clean --all'. For more information, please use 's clean --help' to view");
-            return [2 /*return*/];
-        });
-    }); });
-});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29tbWFuZC9jbGVhbi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLDBDQUFvQjtBQUVwQiwrQkFBa0M7QUFDbEMscUNBQW9DO0FBQ3BDLGdEQUFxRDtBQUNyRCw4Q0FBd0I7QUFDeEIsd0RBQWtDO0FBRWxDLElBQU0sTUFBTSxHQUFHLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQztBQUVqQyxJQUFNLFdBQVcsR0FBRyx1VEFTbEIsSUFBQSxhQUFLLEVBQUMsSUFBSSxDQUFDLHdCQUFjLElBQUEsaUJBQVMsRUFBQyxpQ0FBaUMsQ0FBQyxDQUFFLENBQUM7QUFFMUUsU0FBUyxTQUFTO0lBQ2hCLElBQU0sS0FBSyxHQUFHLElBQUEsbUJBQVcsR0FBRSxDQUFDO0lBQzVCLElBQU0sQ0FBQyxHQUFHLGNBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBQ25DLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDZixnQkFBTSxDQUFDLElBQUksQ0FBQywrQkFBK0IsQ0FBQyxDQUFDO0FBQy9DLENBQUM7QUFFRCxTQUFTLFVBQVUsQ0FBQyxLQUF1QjtJQUN6QyxJQUFNLEtBQUssR0FBRyxJQUFBLG1CQUFXLEdBQUUsQ0FBQztJQUM1QixJQUFNLFNBQVMsR0FBRyxjQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssRUFBRSxPQUFPLENBQUMsQ0FBQztJQUU1QyxZQUFZO0lBQ1osSUFBSSxLQUFLLEtBQUssSUFBSSxFQUFFO1FBQ2xCLE1BQU0sQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDdkIsZ0JBQU0sQ0FBQyxJQUFJLENBQUMsZ0NBQWdDLENBQUMsQ0FBQztRQUM5QyxPQUFPO0tBQ1I7SUFDRCxZQUFZO0lBQ1osTUFBTSxDQUFD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

package/lib/command/config/command/add.js

@@ -1,100 +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 };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var credential_1 = __importDefault(require("@serverless-devs/credential"));
-var chalk_1 = require("chalk");
-var utils_1 = require("../../../utils");
-var error_1 = require("../../../error");
-var utils_2 = require("../utils");
-var logger_1 = __importDefault(require("../../../logger"));
-var description = "You can add an account\n\n    Example:\n        $ s config add\n        $ s config add --AccessKey ****** --SecretKey ******\n        $ s config add --AccessKeyID ****** --AccessKeySecret ****** --AccountID ****** --SecurityToken ******\n        $ s config add --keyList key1,key2,key3 --valueList value1,value2,value3\n\n    Configuration parameters template for vendors:\n        alibaba: AccessKeyID, AccessKeySecret\n        aws: AccessKeyID, SecretAccessKey\n        baidu: AccessKeyID, SecretAccessKey\n        huawei: AccessKey, SecretKey\n        google: PrivateKeyData\n        tencent: AccountID, SecretID, SecretKey\n\n".concat((0, utils_1.emoji)('🧭'), " How to get the key: ").concat((0, chalk_1.underline)('https://github.com/Serverless-Devs/docs/tree/master/zh/others/provider-config'));
-exports.default = (function (program) {
-    var command = program.command('add');
-    command
-        .usage('[options]')
-        .description(description)
-        .summary("".concat((0, utils_1.emoji)((0, chalk_1.bold)('+')), " Add an account"))
-        .option('--AccountID <AccountID>', 'AccountID of key information')
-        .option('--AccessKeyID <AccessKeyID>', 'AccessKeyID of key information')
-        .option('--AccessKeySecret <AccessKeySecret>', 'AccessKeySecret of key information')
-        .option('--SecurityToken <SecurityToken>', 'SecurityToken of key information')
-        .option('--SecretAccessKey <SecretAccessKey>', 'SecretAccessKey of key information')
-        .option('--AccessKey <AccessKey>', 'AccessKey of key information')
-        .option('--SecretKey <SecretKey>', 'SecretKey of key information')
-        .option('--SecretID <SecretID>', 'SecretID of key information')
-        .option('--PrivateKeyData <PrivateKeyData>', 'PrivateKeyData of key information')
-        .option('--kl, --keyList <keyList>', 'Keys of key information, like: --kl key1,key2,key3')
-        .option('--il, --infoList <infoList>', 'Values of key information, like: --il info1,info2,info3')
-        .option('-a, --access <aliasName>', 'Specify the access alias name.')
-        .option('-b, --bbb <aliasName>', 'Specify the access alias name.')
-        .option('-f', 'Mandatory overwrite key information')
-        .helpOption('-h, --help', 'Display help for command')
-        // .allowUnknownOption()
-        .action(function (options) { return __awaiter(void 0, void 0, void 0, function () {
-        var credential, result, err_1;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    _a.trys.push([0, 2, , 4]);
-                    console.log('???', command.optsWithGlobals());
-                    credential = new credential_1.default({ logger: logger_1.default });
-                    return [4 /*yield*/, credential.set(options)];
-                case 1:
-                    result = _a.sent();
-                    if (result) {
-                        logger_1.default.output({
-                            Alias: result.access,
-                            Credential: (0, utils_2.handleSecret)(result.credential),
-                        });
-                    }
-                    return [3 /*break*/, 4];
-                case 2:
-                    err_1 = _a.sent();
-                    return [4 /*yield*/, (0, error_1.HandleError)(err_1)];
-                case 3:
-                    _a.sent();
-                    return [3 /*break*/, 4];
-                case 4: return [2 /*return*/];
-            }
-        });
-    }); });
-});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWRkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2NvbW1hbmQvY29uZmlnL2NvbW1hbmQvYWRkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsMkVBQXFEO0FBRXJELCtCQUF3QztBQUN4Qyx3Q0FBdUM7QUFDdkMsd0NBQTZDO0FBQzdDLGtDQUF3QztBQUN4QywyREFBcUM7QUFFckMsSUFBTSxXQUFXLEdBQUcsZ29CQWdCbEIsSUFBQSxhQUFLLEVBQUMsSUFBSSxDQUFDLGtDQUF3QixJQUFBLGlCQUFTLEVBQzVDLCtFQUErRSxDQUNoRixDQUFFLENBQUM7QUFFSixtQkFBZSxVQUFDLE9BQWdCO0lBQzlCLElBQU0sT0FBTyxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUM7SUFFdkMsT0FBTztTQUNKLEtBQUssQ0FBQyxXQUFXLENBQUM7U0FDbEIsV0FBVyxDQUFDLFdBQVcsQ0FBQztTQUN4QixPQUFPLENBQUMsVUFBRyxJQUFBLGFBQUssRUFBQyxJQUFBLFlBQUksRUFBQyxHQUFHLENBQUMsQ0FBQyxvQkFBaUIsQ0FBQztTQUM3QyxNQUFNLENBQUMseUJBQXlCLEVBQUUsOEJBQThCLENBQUM7U0FDakUsTUFBTSxDQUFDLDZCQUE2QixFQUFFLGdDQUFnQyxDQUFDO1NBQ3ZFLE1BQU0sQ0FBQyxxQ0FBcUMsRUFBRSxvQ0FBb0MsQ0FBQztTQUNuRixNQUFNLENBQUMsaUNBQWlDLEVBQUUsa0NBQWtDLENBQUM7U0FDN0UsTUFBTSxDQUFDLHFDQUFxQyxFQUFFLG9DQUFvQyxDQUFDO1NBQ25GLE1BQU0sQ0FBQyx5QkFBeUIsRUFBRSw4QkFBOEIsQ0FBQztTQUNqRSxNQUFNLENBQUMseUJBQXlCLEVBQUUsOEJBQThCLENBQUM7U0FDakUsTUFBTSxDQUFDLHVCQUF1QixFQUFFLDZCQUE2QixDQUFDO1NBQzlELE1BQU0sQ0FBQyxtQ0FBbUMsRUFBRSxtQ0FBbUMsQ0FBQztTQUNoRixNQUFNLENBQUMsMkJBQTJCLEVBQUUsb0RBQW9ELENBQUM7U0FDekYsTUFBTSxDQUFDLDZCQUE2QixFQUFFLHlEQUF5RCxDQUFDO1NBQ2hHLE1BQU0sQ0FBQywwQkFBMEIsRUFBRSxnQ0FBZ0MsQ0FBQztTQUNwRSxNQUFNLENBQUMsdUJBQXVCLEVBQUUsZ0NBQWdDLENBQUM7U0FDakUsTUFBTSxDQUFDLElBQUksRUFBRSxxQ0FBcUMsQ0FBQztTQUNuRCxVQUFVLENBQUMsWUFBWSxFQUFFLDBCQUEwQixDQUFDO1FBQ3JELHdCQUF3QjtTQUN2QixNQUFNLENBQUMsVUFBTSxPQUFPOzs7Ozs7b0JBRWpCLE9BQU8sQ0FBQyxHQUFHLENBQUMsS0FBSyxFQUFFLE9BQU8sQ0FBQyxlQUFlLEVBQUUsQ0FBQyxDQUFDO29CQUN4QyxVQUFVLEdBQUcsSUFBSSxvQkFBVSxDQUFDLEVBQUUsTUFBTSxrQkFBQSxFQUFFLENBQUMsQ0FBQztvQkFDL0IscUJBQU0sVUFBVSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsRUFBQTs7b0JBQXRDLE1BQU0sR0FBRyxTQUE2QjtvQkFDNUMsSUFBSSxNQUFNLEVBQUU7d0JBQ1YsZ0JBQU0sQ0FBQyxNQUFNLENBQUM7NEJBQ1osS0FBSyxFQUFFLE1BQU0sQ0FBQyxNQUFNOzRCQUNwQixVQUFVLEVBQUUsSUFBQSxvQkFBWSxFQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUM7eUJBQzVDLENBQUMsQ0FBQztxQkFDSjs7OztvQkFFRCxxQkFBTSxJQUFBLG1CQUFXLEVBQUMsS0FBRyxDQUFDLEVBQUE7O29CQUF0QixTQUFzQixDQUFDOzs7OztTQUUxQixDQUFDLENBQUM7QUFDUCxDQUFDLEVBQUMifQ==

package/lib/command/config/command/default.js

@@ -1,78 +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 };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var credential_1 = __importDefault(require("@serverless-devs/credential"));
-var chalk_1 = require("chalk");
-var utils_1 = require("../../../utils");
-var error_1 = require("../../../error");
-var logger_1 = __importDefault(require("../../../logger"));
-var description = "Specify an access as the default.\n  \n  Example:\n    $ s config default\n    $ s config default -a demo\n    \n".concat((0, utils_1.emoji)('📖'), " Document: ").concat((0, chalk_1.underline)('https://github.com/Serverless-Devs/Serverless-Devs/tree/master/docs/zh/command/config.md'));
-exports.default = (function (program) {
-    var command = program.command('default', { hidden: true });
-    command
-        .usage('[options]')
-        .description(description)
-        .summary("".concat((0, utils_1.emoji)((0, chalk_1.bold)('-')), " Set default accounts"))
-        .option('-a, --access <aliasName>', 'Specify the access alias name.')
-        .helpOption('-h, --help', 'Display help for command')
-        .action(function (options) { return __awaiter(void 0, void 0, void 0, function () {
-        var credential, error_2;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    _a.trys.push([0, 2, , 4]);
-                    credential = new credential_1.default({ logger: logger_1.default });
-                    return [4 /*yield*/, credential.default(options.access)];
-                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*/];
-            }
-        });
-    }); });
-});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVmYXVsdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9jb21tYW5kL2NvbmZpZy9jb21tYW5kL2RlZmF1bHQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSwyRUFBcUQ7QUFFckQsK0JBQXdDO0FBQ3hDLHdDQUF1QztBQUN2Qyx3Q0FBNkM7QUFDN0MsMkRBQXFDO0FBRXJDLElBQU0sV0FBVyxHQUFHLDJIQU1sQixJQUFBLGFBQUssRUFBQyxJQUFJLENBQUMsd0JBQWMsSUFBQSxpQkFBUyxFQUNsQywwRkFBMEYsQ0FDM0YsQ0FBRSxDQUFDO0FBRUosbUJBQWUsVUFBQyxPQUFnQjtJQUM5QixJQUFNLE9BQU8sR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLFNBQVMsRUFBRSxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO0lBRTdELE9BQU87U0FDSixLQUFLLENBQUMsV0FBVyxDQUFDO1NBQ2xCLFdBQVcsQ0FBQyxXQUFXLENBQUM7U0FDeEIsT0FBTyxDQUFDLFVBQUcsSUFBQSxhQUFLLEVBQUMsSUFBQSxZQUFJLEVBQUMsR0FBRyxDQUFDLENBQUMsMEJBQXVCLENBQUM7U0FDbkQsTUFBTSxDQUFDLDBCQUEwQixFQUFFLGdDQUFnQyxDQUFDO1NBQ3BFLFVBQVUsQ0FBQyxZQUFZLEVBQUUsMEJBQTBCLENBQUM7U0FDcEQsTUFBTSxDQUFDLFVBQU0sT0FBTzs7Ozs7O29CQUVYLFVBQVUsR0FBRyxJQUFJLG9CQUFVLENBQUMsRUFBRSxNQUFNLGtCQUFBLEVBQUUsQ0FBQyxDQUFDO29CQUM5QyxxQkFBTSxVQUFVLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsRUFBQTs7b0JBQXhDLFNBQXdDLENBQUM7Ozs7b0JBRXpDLHFCQUFNLElBQUEsbUJBQVcsRUFBQyxPQUFLLENBQUMsRUFBQTs7b0JBQXhCLFNBQXdCLENBQUM7Ozs7O1NBRTVCLENBQUMsQ0FBQztBQUNQLENBQUMsRUFBQyJ9

package/lib/command/config/command/get.js

@@ -1,100 +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 };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var credential_1 = __importDefault(require("@serverless-devs/credential"));
-var chalk_1 = require("chalk");
-var utils_1 = require("../../../utils");
-var error_1 = require("../../../error");
-var utils_2 = require("../utils");
-var logger_1 = __importDefault(require("../../../logger"));
-var description = "You can get accounts.\n \n  Example:\n    $ s config get\n    $ s config get -a demo\n    \n".concat((0, utils_1.emoji)('📖'), " Document: ").concat((0, chalk_1.underline)('https://github.com/Serverless-Devs/Serverless-Devs/tree/master/docs/zh/command/config.md'));
-exports.default = (function (program) {
-    var command = program.command('get');
-    command
-        .usage('[options]')
-        .description(description)
-        .summary("".concat((0, utils_1.emoji)((0, chalk_1.bold)('√')), " Get accounts"))
-        .option('-a, --access <aliasName>', 'Specify the access alias name.')
-        .helpOption('-h, --help', 'Display help for command')
-        .action(function (options) { return __awaiter(void 0, void 0, void 0, function () {
-        var credential, result, result, show, alias, value, error_2, msg;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    _a.trys.push([0, 5, , 7]);
-                    credential = new credential_1.default({ logger: logger_1.default });
-                    if (!options.access) return [3 /*break*/, 2];
-                    return [4 /*yield*/, credential.get(options.access)];
-                case 1:
-                    result = _a.sent();
-                    logger_1.default.output({
-                        Alias: result.access,
-                        Credential: (0, utils_2.handleSecret)(result.credential),
-                    });
-                    return [3 /*break*/, 4];
-                case 2: return [4 /*yield*/, credential.getAll()];
-                case 3:
-                    result = _a.sent();
-                    show = {};
-                    for (alias in result) {
-                        value = result[alias];
-                        show[alias] = (0, utils_2.handleSecret)(value);
-                    }
-                    logger_1.default.output(show);
-                    _a.label = 4;
-                case 4: return [3 /*break*/, 7];
-                case 5:
-                    error_2 = _a.sent();
-                    if (error_2.message.includes('Not found access')) {
-                        msg = "\n  ".concat((0, utils_1.emoji)('🤔'), " You have not yet been found to have configured key information.\n  ").concat((0, utils_1.emoji)('🧭'), " You can use [s config add] for key configuration, or use [s config add -h] to view configuration help.\n  ").concat((0, utils_1.emoji)('😈'), " If you have questions, please tell us: ").concat((0, chalk_1.underline)('https://github.com/Serverless-Devs/Serverless-Devs/issues'));
-                        logger_1.default.write(msg);
-                        return [2 /*return*/];
-                    }
-                    return [4 /*yield*/, (0, error_1.HandleError)(error_2)];
-                case 6:
-                    _a.sent();
-                    return [3 /*break*/, 7];
-                case 7: return [2 /*return*/];
-            }
-        });
-    }); });
-});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2NvbW1hbmQvY29uZmlnL2NvbW1hbmQvZ2V0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsMkVBQXFEO0FBRXJELCtCQUF3QztBQUN4Qyx3Q0FBdUM7QUFDdkMsd0NBQTZDO0FBQzdDLGtDQUF3QztBQUN4QywyREFBcUM7QUFFckMsSUFBTSxXQUFXLEdBQUcsc0dBTWxCLElBQUEsYUFBSyxFQUFDLElBQUksQ0FBQyx3QkFBYyxJQUFBLGlCQUFTLEVBQ2xDLDBGQUEwRixDQUMzRixDQUFFLENBQUM7QUFFSixtQkFBZSxVQUFDLE9BQWdCO0lBQzlCLElBQU0sT0FBTyxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUM7SUFFdkMsT0FBTztTQUNKLEtBQUssQ0FBQyxXQUFXLENBQUM7U0FDbEIsV0FBVyxDQUFDLFdBQVcsQ0FBQztTQUN4QixPQUFPLENBQUMsVUFBRyxJQUFBLGFBQUssRUFBQyxJQUFBLFlBQUksRUFBQyxHQUFHLENBQUMsQ0FBQyxrQkFBZSxDQUFDO1NBQzNDLE1BQU0sQ0FBQywwQkFBMEIsRUFBRSxnQ0FBZ0MsQ0FBQztTQUNwRSxVQUFVLENBQUMsWUFBWSxFQUFFLDBCQUEwQixDQUFDO1NBQ3BELE1BQU0sQ0FBQyxVQUFNLE9BQU87Ozs7OztvQkFFWCxVQUFVLEdBQUcsSUFBSSxvQkFBVSxDQUFDLEVBQUUsTUFBTSxrQkFBQSxFQUFFLENBQUMsQ0FBQzt5QkFDMUMsT0FBTyxDQUFDLE1BQU0sRUFBZCx3QkFBYztvQkFDRCxxQkFBTSxVQUFVLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsRUFBQTs7b0JBQTdDLE1BQU0sR0FBRyxTQUFvQztvQkFFbkQsZ0JBQU0sQ0FBQyxNQUFNLENBQUM7d0JBQ1osS0FBSyxFQUFFLE1BQU0sQ0FBQyxNQUFNO3dCQUNwQixVQUFVLEVBQUUsSUFBQSxvQkFBWSxFQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUM7cUJBQzVDLENBQUMsQ0FBQzs7d0JBRVkscUJBQU0sVUFBVSxDQUFDLE1BQU0sRUFBRSxFQUFBOztvQkFBbEMsTUFBTSxHQUFHLFNBQXlCO29CQUNsQyxJQUFJLEdBQUcsRUFBRSxDQUFDO29CQUNoQixLQUFXLEtBQUssSUFBSSxNQUFNLEVBQUU7d0JBQ3BCLEtBQUssR0FBRyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUM7d0JBQzVCLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxJQUFBLG9CQUFZLEVBQUMsS0FBSyxDQUFDLENBQUM7cUJBQ25DO29CQUNELGdCQUFNLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDOzs7OztvQkFHdEIsSUFBSSxPQUFLLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxrQkFBa0IsQ0FBQyxFQUFFO3dCQUN4QyxHQUFHLEdBQUcsY0FDbEIsSUFBQSxhQUFLLEVBQUMsSUFBSSxDQUFDLGlGQUNYLElBQUEsYUFBSyxFQUFDLElBQUksQ0FBQyx3SEFDWCxJQUFBLGFBQUssRUFBQyxJQUFJLENBQUMscURBQTJDLElBQUEsaUJBQVMsRUFDdkQsMkRBQTJELENBQzVELENBQUUsQ0FBQzt3QkFDSixnQkFBTSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQzt3QkFDbEIsc0JBQU87cUJBQ1I7b0JBQ0QscUJBQU0sSUFBQSxtQkFBVyxFQUFDLE9BQUssQ0FBQyxFQUFBOztvQkFBeEIsU0FBd0IsQ0FBQzs7Ozs7U0FFNUIsQ0FBQyxDQUFDO0FBQ1AsQ0FBQyxFQUFDIn0=