@serverless-devs/s 2.0.99 → 2.0.100-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serverless-devs/s",
-  "version": "2.0.99",
+  "version": "2.0.100-beta.2",
   "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": [
@@ -31,7 +31,7 @@
     "start": "npm run watch",
     "prewatch": "rm -rf lib/* && cp -r ./src/daemon ./lib",
     "watch": "tsc -w",
-    "test": "npx jest",
+    "test": "jest test/help.test.ts",
     "prebuild": "rm -rf lib/*",
     "build": "tsc && cp -r ./src/daemon ./lib",
     "postbuild": "./shell/postbuild.sh",
@@ -48,7 +48,7 @@
   },
   "devDependencies": {
     "@serverless-devs/commander": "^6.0.0",
-    "@types/jest": "^27.0.1",
+    "@types/jest": "^27.4.0",
     "@types/lodash": "^4.14.168",
     "@types/node": "^14.0.23",
     "@typescript-eslint/eslint-plugin": "^4.14.1",
@@ -64,7 +64,7 @@
     "husky": "^4.2.3",
     "inquirer": "^8.2.0",
     "inquirer-autocomplete-prompt": "^1.3.0",
-    "jest": "^27.1.0",
+    "jest": "^27.4.7",
     "latest-version": "^5.1.0",
     "lint-staged": "^10.0.8",
     "lodash": "^4.17.20",
@@ -72,7 +72,7 @@
     "prettier": "^2.2.1",
     "semver": "^7.3.5",
     "semver-diff": "^3.1.1",
-    "ts-jest": "^27.0.1",
+    "ts-jest": "^27.1.3",
     "ts-node": "^9.1.1",
     "tty-table": "^4.1.5",
     "typescript": "^4.1.3"
@@ -80,19 +80,7 @@
   "lint-staged": {
     "**/*.{js,jsx,ts}": "f2elint exec eslint"
   },
-  "jest": {
-    "coverageDirectory": "coverage",
-    "testEnvironment": "node",
-    "coverageProvider": "v8",
-    "preset": "ts-jest",
-    "testMatch": [
-      "**/test/**/*test.[jt]s"
-    ],
-    "setupFilesAfterEnv": [
-      "./jest.setup.ts"
-    ]
-  },
   "dependencies": {
-    "@serverless-devs/core": "latest"
+    "@serverless-devs/core": "beta"
   }
 }

package/s.yaml

@@ -0,0 +1,38 @@
+edition: 1.0.0 #  命令行YAML规范版本，遵循语义化版本（Semantic Versioning）规范
+name: fcDeployApp #  项目名称
+access: 'sub' #  秘钥别名
+
+services:
+  fc-deploy-test: #  服务名称
+    component: devsapp/fc # 组件名称
+    props: #  组件的属性值
+      region: cn-hangzhou
+      service:
+        name: fc-deploy-service
+        description: 'demo for fc-deploy component'
+        internetAccess: true
+      function:
+        name: http-trigger-nodejs12
+        description: this is a test
+        runtime: nodejs12
+        codeUri: ./test/start-fc-http-nodejs12/code
+        # ossBucket:
+        # ossKey:  # conflict with codeUri
+        handler: index.handler
+        memorySize: 128
+        timeout: 60
+      triggers:
+        - name: httpTrigger
+          type: http
+          config:
+            authType: anonymous
+            methods:
+              - GET
+      customDomains:
+        - domainName: auto
+          protocol: HTTP
+          routeConfigs:
+            - path: /*
+              methods:
+                - GET
+# 函数计算FC组件文档参考地址：https://github.com/devsapp/fc

package/shell/postbuild.sh

@@ -1,17 +1,17 @@
 #!/bin/bash
-esbuild lib/index.js --bundle --log-level=error --minify --external:@serverless-devs/core  --platform=node --format=cjs --target=node10.4 --allow-overwrite --outfile=lib/index.js
-esbuild lib/init/index.js --bundle --log-level=error --minify --external:@serverless-devs/core  --platform=node --format=cjs --target=node10.4 --allow-overwrite --outfile=lib/init/index.js
-esbuild lib/cli/index.js --bundle --log-level=error --minify --external:@serverless-devs/core  --platform=node --format=cjs --target=node10.4 --allow-overwrite --outfile=lib/cli/index.js
-esbuild lib/config/index.js --bundle --log-level=error --minify --external:@serverless-devs/core  --platform=node --format=cjs --target=node10.4 --allow-overwrite --outfile=lib/config/index.js
-esbuild lib/config/add/index.js --bundle --log-level=error --minify --external:@serverless-devs/core  --platform=node --format=cjs --target=node10.4 --allow-overwrite --outfile=lib/config/add/index.js
-esbuild lib/config/delete/index.js --bundle --log-level=error --minify --external:@serverless-devs/core  --platform=node --format=cjs --target=node10.4 --allow-overwrite --outfile=lib/config/delete/index.js
-esbuild lib/config/get/index.js --bundle --log-level=error --minify --external:@serverless-devs/core  --platform=node --format=cjs --target=node10.4 --allow-overwrite --outfile=lib/config/get/index.js
-esbuild lib/set/index.js --bundle --log-level=error --minify --external:@serverless-devs/core  --platform=node --format=cjs --target=node10.4 --allow-overwrite --outfile=lib/set/index.js
-esbuild lib/set/registry/index.js --bundle --log-level=error --minify --external:@serverless-devs/core  --platform=node --format=cjs --target=node10.4 --allow-overwrite --outfile=lib/set/registry/index.js
-esbuild lib/set/locale/index.js --bundle --log-level=error --minify --external:@serverless-devs/core  --platform=node --format=cjs --target=node10.4 --allow-overwrite --outfile=lib/set/locale/index.js
-esbuild lib/set/analysis/index.js --bundle --log-level=error --minify --external:@serverless-devs/core  --platform=node --format=cjs --target=node10.4 --allow-overwrite --outfile=lib/set/analysis/index.js
-esbuild lib/set/workspace/index.js --bundle --log-level=error --minify --external:@serverless-devs/core  --platform=node --format=cjs --target=node10.4 --allow-overwrite --outfile=lib/set/workspace/index.js
-esbuild lib/clean/index.js --bundle --log-level=error --minify --external:@serverless-devs/core  --platform=node --format=cjs --target=node10.4 --allow-overwrite --outfile=lib/clean/index.js
-esbuild lib/component/index.js --bundle --log-level=error --minify --external:@serverless-devs/core  --platform=node --format=cjs --target=node10.4 --allow-overwrite --outfile=lib/component/index.js
-esbuild lib/update-notifier/index.js --bundle --log-level=error --minify --external:@serverless-devs/core  --platform=node --format=cjs --target=node10.4 --allow-overwrite --outfile=lib/update-notifier/index.js
+esbuild lib/index.js --bundle --log-level=error --minify --external:@serverless-devs/core --external:electron  --platform=node --format=cjs --target=node10.4 --allow-overwrite --outfile=lib/index.js
+esbuild lib/init/index.js --bundle --log-level=error --minify --external:@serverless-devs/core --external:electron  --platform=node --format=cjs --target=node10.4 --allow-overwrite --outfile=lib/init/index.js
+esbuild lib/cli/index.js --bundle --log-level=error --minify --external:@serverless-devs/core --external:electron  --platform=node --format=cjs --target=node10.4 --allow-overwrite --outfile=lib/cli/index.js
+esbuild lib/config/index.js --bundle --log-level=error --minify --external:@serverless-devs/core --external:electron  --platform=node --format=cjs --target=node10.4 --allow-overwrite --outfile=lib/config/index.js
+esbuild lib/config/add/index.js --bundle --log-level=error --minify --external:@serverless-devs/core --external:electron  --platform=node --format=cjs --target=node10.4 --allow-overwrite --outfile=lib/config/add/index.js
+esbuild lib/config/delete/index.js --bundle --log-level=error --minify --external:@serverless-devs/core --external:electron  --platform=node --format=cjs --target=node10.4 --allow-overwrite --outfile=lib/config/delete/index.js
+esbuild lib/config/get/index.js --bundle --log-level=error --minify --external:@serverless-devs/core --external:electron  --platform=node --format=cjs --target=node10.4 --allow-overwrite --outfile=lib/config/get/index.js
+esbuild lib/set/index.js --bundle --log-level=error --minify --external:@serverless-devs/core --external:electron  --platform=node --format=cjs --target=node10.4 --allow-overwrite --outfile=lib/set/index.js
+esbuild lib/set/registry/index.js --bundle --log-level=error --minify --external:@serverless-devs/core --external:electron  --platform=node --format=cjs --target=node10.4 --allow-overwrite --outfile=lib/set/registry/index.js
+esbuild lib/set/locale/index.js --bundle --log-level=error --minify --external:@serverless-devs/core --external:electron  --platform=node --format=cjs --target=node10.4 --allow-overwrite --outfile=lib/set/locale/index.js
+esbuild lib/set/analysis/index.js --bundle --log-level=error --minify --external:@serverless-devs/core --external:electron  --platform=node --format=cjs --target=node10.4 --allow-overwrite --outfile=lib/set/analysis/index.js
+esbuild lib/set/workspace/index.js --bundle --log-level=error --minify --external:@serverless-devs/core --external:electron  --platform=node --format=cjs --target=node10.4 --allow-overwrite --outfile=lib/set/workspace/index.js
+esbuild lib/clean/index.js --bundle --log-level=error --minify --external:@serverless-devs/core --external:electron  --platform=node --format=cjs --target=node10.4 --allow-overwrite --outfile=lib/clean/index.js
+esbuild lib/component/index.js --bundle --log-level=error --minify --external:@serverless-devs/core --external:electron  --platform=node --format=cjs --target=node10.4 --allow-overwrite --outfile=lib/component/index.js
+esbuild lib/update-notifier/index.js --bundle --log-level=error --minify --external:@serverless-devs/core --external:electron  --platform=node --format=cjs --target=node10.4 --allow-overwrite --outfile=lib/update-notifier/index.js
 

package/lib/cli/cli-manager.js

@@ -1,215 +0,0 @@
-"use strict";
-/** @format */
-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 (_) 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 utils_1 = require("../utils");
-var path_1 = __importDefault(require("path"));
-var fs_1 = __importDefault(require("fs"));
-var common_1 = require("../utils/common");
-var error_1 = require("../error");
-var core_1 = __importDefault(require("../utils/core"));
-var makeUnderLine = core_1.default.makeUnderLine, getCredential = core_1.default.getCredential, loadComponent = core_1.default.loadComponent, colors = core_1.default.colors, yaml = core_1.default.jsyaml, getRootHome = core_1.default.getRootHome;
-var CliManager = /** @class */ (function () {
-    function CliManager(inputs) {
-        this.inputs = inputs;
-    }
-    CliManager.prototype.getTempCommandStr = function (commands, length) {
-        var commandsLength = commands.length;
-        var tempArray = new Array(length - commandsLength).fill(' ');
-        return "".concat(commands).concat(tempArray.join(''), " : ");
-    };
-    CliManager.prototype.init = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var result, _a, component, command, access, props, credentials, accessFile, accessFileInfo, e_1, componentInstance, docResult, componentPathYaml, publishYamlInfor, tempLength, item, item, e_2, tempProp, outResult, error_2, error_3;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        result = '';
-                        _b.label = 1;
-                    case 1:
-                        _b.trys.push([1, 21, , 23]);
-                        _a = this.inputs, component = _a.component, command = _a.command, access = _a.access, props = _a.props;
-                        credentials = {};
-                        _b.label = 2;
-                    case 2:
-                        _b.trys.push([2, 5, , 6]);
-                        accessFile = path_1.default.join(getRootHome(), 'access.yaml');
-                        accessFileInfo = yaml.load(fs_1.default.readFileSync(accessFile, 'utf8') || '{}');
-                        if (!accessFileInfo[access]) return [3 /*break*/, 4];
-                        return [4 /*yield*/, getCredential(access)];
-                    case 3:
-                        credentials = _b.sent();
-                        _b.label = 4;
-                    case 4: return [3 /*break*/, 6];
-                    case 5:
-                        e_1 = _b.sent();
-                        credentials = {};
-                        return [3 /*break*/, 6];
-                    case 6: return [4 /*yield*/, loadComponent(component, null, { access: access })];
-                    case 7:
-                        componentInstance = _b.sent();
-                        if (!componentInstance) return [3 /*break*/, 20];
-                        if (!command) {
-                            if (componentInstance['index']) {
-                                command = 'index';
-                            }
-                            else {
-                                command = 'cli-help-options';
-                            }
-                        }
-                        if (!(command === 'cli-help-options')) return [3 /*break*/, 13];
-                        if (!(componentInstance.__doc && componentInstance.__doc().length > 1685)) return [3 /*break*/, 8];
-                        docResult = componentInstance.__doc();
-                        console.log("".concat(docResult));
-                        return [3 /*break*/, 12];
-                    case 8:
-                        _b.trys.push([8, 11, , 12]);
-                        componentPathYaml = path_1.default.join(componentInstance.__path, 'publish.yml');
-                        return [4 /*yield*/, fs_1.default.existsSync(componentPathYaml)];
-                    case 9:
-                        if (!(_b.sent())) {
-                            componentPathYaml = path_1.default.join(componentInstance.__path, 'publish.yaml');
-                        }
-                        return [4 /*yield*/, yaml.load(fs_1.default.readFileSync(componentPathYaml, 'utf8'))];
-                    case 10:
-                        publishYamlInfor = _b.sent();
-                        console.log("\n  ".concat(publishYamlInfor['Name'], "@").concat(publishYamlInfor['Version'], ": ").concat(publishYamlInfor['Description'], "\n"));
-                        tempLength = 0;
-                        if (publishYamlInfor['Commands']) {
-                            for (item in publishYamlInfor['Commands']) {
-                                if (item.length > tempLength) {
-                                    tempLength = item.length;
-                                }
-                            }
-                            for (item in publishYamlInfor['Commands']) {
-                                console.log("    ".concat(this.getTempCommandStr(item, tempLength), " ").concat(publishYamlInfor['Commands'][item]));
-                            }
-                            console.log("\n  ".concat(publishYamlInfor['HomePage']
-                                ? "".concat((0, common_1.emoji)('🧭'), " ").concat(makeUnderLine('More information: ' + publishYamlInfor['HomePage']), " ") + '\n'
-                                : ''));
-                        }
-                        return [3 /*break*/, 12];
-                    case 11:
-                        e_2 = _b.sent();
-                        utils_1.logger.error('Help information could not be found');
-                        return [3 /*break*/, 12];
-                    case 12: return [2 /*return*/, 'help'];
-                    case 13:
-                        if (!componentInstance[command]) return [3 /*break*/, 19];
-                        tempProp = {};
-                        try {
-                            tempProp = JSON.parse(props || '{}');
-                        }
-                        catch (e) {
-                            throw new Error('-p/--prop parameter format error');
-                        }
-                        _b.label = 14;
-                    case 14:
-                        _b.trys.push([14, 16, , 18]);
-                        return [4 /*yield*/, componentInstance[command]({
-                                props: tempProp,
-                                Properties: tempProp,
-                                Credentials: credentials,
-                                credentials: credentials,
-                                appName: 'default',
-                                Project: {
-                                    ProjectName: 'default',
-                                    projectName: 'default',
-                                    component: component,
-                                    Component: component,
-                                    provider: undefined,
-                                    Provider: undefined,
-                                    accessAlias: access || 'default',
-                                    AccessAlias: access || 'default',
-                                },
-                                project: {
-                                    component: '',
-                                    access: access || 'default',
-                                    projectName: '',
-                                },
-                                command: command,
-                                Command: command,
-                                args: process.env.temp_params,
-                                argsObj: process['temp_params'],
-                                Args: process.env.temp_params,
-                                ArgsObj: process['temp_params'],
-                                path: {
-                                    configPath: '',
-                                },
-                                Path: {
-                                    ConfigPath: '',
-                                },
-                            })];
-                    case 15:
-                        result =
-                            (_b.sent()) || {};
-                        outResult = yaml.dump(JSON.parse(JSON.stringify(result)));
-                        utils_1.logger.success(Object.keys(result).length === 0 ? "End of method: ".concat(command) : outResult);
-                        return [3 /*break*/, 18];
-                    case 16:
-                        error_2 = _b.sent();
-                        return [4 /*yield*/, (0, error_1.HandleError)({ error: error_2, prefix: 'Failed to execute:' })];
-                    case 17:
-                        _b.sent();
-                        process.exit(1);
-                        return [3 /*break*/, 18];
-                    case 18: return [3 /*break*/, 20];
-                    case 19:
-                        utils_1.logger.error("Failed to execute:\n\n  ".concat((0, common_1.emoji)('❌'), " Message: Component ").concat(component, " does not include [").concat(command, "] method\n  ").concat((0, common_1.emoji)('🧭'), " You can get help for this component by [s cli ").concat(component, " -h]\n  ").concat((0, common_1.emoji)('😈'), " If you have questions, please tell us: ").concat(colors.underline('https://github.com/Serverless-Devs/Serverless-Devs/issues'), "\n"));
-                        process.exit(1);
-                        _b.label = 20;
-                    case 20: return [3 /*break*/, 23];
-                    case 21:
-                        error_3 = _b.sent();
-                        return [4 /*yield*/, (0, error_1.HandleError)({ error: error_3, prefix: 'Failed to execute:' })];
-                    case 22:
-                        _b.sent();
-                        process.exit(1);
-                        return [3 /*break*/, 23];
-                    case 23: return [2 /*return*/, result];
-                }
-            });
-        });
-    };
-    return CliManager;
-}());
-exports.default = CliManager;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpLW1hbmFnZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2xpL2NsaS1tYW5hZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxjQUFjOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUVkLGtDQUFrQztBQUNsQyw4Q0FBd0I7QUFDeEIsMENBQW9CO0FBQ3BCLDBDQUF3QztBQUN4QyxrQ0FBdUM7QUFDdkMsdURBQWlDO0FBQ3pCLElBQUEsYUFBYSxHQUFzRSxjQUFJLGNBQTFFLEVBQUUsYUFBYSxHQUF1RCxjQUFJLGNBQTNELEVBQUUsYUFBYSxHQUF3QyxjQUFJLGNBQTVDLEVBQUUsTUFBTSxHQUFnQyxjQUFJLE9BQXBDLEVBQVUsSUFBSSxHQUFrQixjQUFJLE9BQXRCLEVBQUUsV0FBVyxHQUFLLGNBQUksWUFBVCxDQUFVO0FBUWhHO0lBR0Usb0JBQVksTUFBaUI7UUFDM0IsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUM7SUFDdkIsQ0FBQztJQUVELHNDQUFpQixHQUFqQixVQUFrQixRQUFnQixFQUFFLE1BQWM7UUFDaEQsSUFBTSxjQUFjLEdBQUcsUUFBUSxDQUFDLE1BQU0sQ0FBQztRQUN2QyxJQUFNLFNBQVMsR0FBRyxJQUFJLEtBQUssQ0FBQyxNQUFNLEdBQUcsY0FBYyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQy9ELE9BQU8sVUFBRyxRQUFRLFNBQUcsU0FBUyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsUUFBSyxDQUFDO0lBQy9DLENBQUM7SUFFSyx5QkFBSSxHQUFWOzs7Ozs7d0JBQ00sTUFBTSxHQUFHLEVBQUUsQ0FBQzs7Ozt3QkFFVixLQUF3QyxJQUFJLENBQUMsTUFBTSxFQUFqRCxTQUFTLGVBQUEsRUFBRSxPQUFPLGFBQUEsRUFBRSxNQUFNLFlBQUEsRUFBRSxLQUFLLFdBQUEsQ0FBaUI7d0JBRXBELFdBQVcsR0FBRyxFQUFFLENB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

package/lib/constants/index.js

@@ -1 +0,0 @@
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29uc3RhbnRzL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIifQ==

package/lib/constants/static-variable.js

@@ -1,8 +0,0 @@
-"use strict";
-/** @format */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.UPDATE_CHECK_INTERVAL = exports.DEFAULT_REGIRSTRY = exports.PROCESS_ENV_TEMPLATE_NAME = void 0;
-exports.PROCESS_ENV_TEMPLATE_NAME = 'templateFile';
-exports.DEFAULT_REGIRSTRY = 'http://registry.devsapp.cn/simple';
-exports.UPDATE_CHECK_INTERVAL = 1000 * 60 * 60 * 12;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhdGljLXZhcmlhYmxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnN0YW50cy9zdGF0aWMtdmFyaWFibGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLGNBQWM7OztBQUVELFFBQUEseUJBQXlCLEdBQUcsY0FBYyxDQUFDO0FBQzNDLFFBQUEsaUJBQWlCLEdBQUcsbUNBQW1DLENBQUM7QUFDeEQsUUFBQSxxQkFBcUIsR0FBRyxJQUFJLEdBQUcsRUFBRSxHQUFHLEVBQUUsR0FBRyxFQUFFLENBQUMifQ==

package/lib/core/command/command-manager.js

@@ -1,184 +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 (_) 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 });
-exports.CommandManager = void 0;
-var specification_1 = require("../../specification");
-var version_1 = require("../../specification/version");
-var utils_1 = require("../../utils");
-var component_1 = require("../component");
-var common_1 = require("../../utils/common");
-var core_1 = __importDefault(require("../../utils/core"));
-var colors = core_1.default.colors, ansiEscapes = core_1.default.ansiEscapes;
-var error_1 = require("../../error");
-var lodash_1 = require("lodash");
-var CommandManager = /** @class */ (function () {
-    function CommandManager(templateFile, method, customerCommandName, params) {
-        this.templateFile = templateFile;
-        this.method = method;
-        this.customerCommandName = customerCommandName;
-        this.deployParams = params;
-    }
-    CommandManager.prototype.assemblyProjectConfig = function (parse, projectName, parsedObj) {
-        return __awaiter(this, void 0, void 0, function () {
-            var realVariables, projectConfig;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, parse.getRealVariables(parsedObj)];
-                    case 1:
-                        realVariables = _a.sent();
-                        projectConfig = (0, version_1.getServiceConfig)(realVariables, projectName);
-                        projectConfig.appName = realVariables.name; // app name;
-                        projectConfig.ProjectName = projectName;
-                        if (this.deployParams) {
-                            projectConfig.params = this.deployParams;
-                        }
-                        return [2 /*return*/, projectConfig];
-                }
-            });
-        });
-    };
-    CommandManager.prototype.warnEnvironmentVariables = function (realVariables) {
-        return __awaiter(this, void 0, void 0, function () {
-            var services, envObj, key, environmentVariables, keys, key;
-            return __generator(this, function (_a) {
-                services = realVariables === null || realVariables === void 0 ? void 0 : realVariables.services;
-                if ((0, lodash_1.isEmpty)(services))
-                    return [2 /*return*/];
-                envObj = {};
-                for (key in services) {
-                    environmentVariables = (0, lodash_1.get)(services, [key, 'props', 'function', 'environmentVariables'], {});
-                    envObj = Object.assign({}, envObj, environmentVariables);
-                }
-                keys = [];
-                for (key in envObj) {
-                    if ((0, lodash_1.isNil)(envObj[key])) {
-                        keys.push(key);
-                    }
-                }
-                keys.length > 0 && utils_1.logger.warning("The value of environment variable [".concat(keys.join(', '), "] is undefined."));
-                return [2 /*return*/];
-            });
-        });
-    };
-    CommandManager.prototype.init = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var templateFile, outPutData, parse, parsedObj, realVariables, analysis, executeOrderList, tempCustomerCommandName, projectConfig, componentExecute, tempResult, params, componentList, tempResult, item, outResult, error_2;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        _a.trys.push([0, 10, , 12]);
-                        process.stdout.write('Starting ...\n');
-                        templateFile = (0, common_1.checkTemplateFile)(this.templateFile);
-                        if (!templateFile) return [3 /*break*/, 8];
-                        outPutData = {};
-                        parse = new specification_1.Parse(templateFile);
-                        parsedObj = parse.getOriginalParsedObj();
-                        return [4 /*yield*/, parse.getRealVariables(parsedObj)];
-                    case 1:
-                        realVariables = _a.sent();
-                        return [4 /*yield*/, this.warnEnvironmentVariables(realVariables)];
-                    case 2:
-                        _a.sent();
-                        analysis = new specification_1.Analysis(realVariables, parse.dependenciesMap);
-                        executeOrderList = analysis.getProjectOrder();
-                        if (!(this.customerCommandName || executeOrderList.length === 1)) return [3 /*break*/, 5];
-                        tempCustomerCommandName = executeOrderList[0];
-                        return [4 /*yield*/, this.assemblyProjectConfig(parse, this.customerCommandName || tempCustomerCommandName, parsedObj)];
-                    case 3:
-                        projectConfig = _a.sent();
-                        if (process.env['serverless_devs_temp_access']) {
-                            projectConfig.Access = process.env['serverless_devs_temp_access'];
-                            projectConfig.access = process.env['serverless_devs_temp_access'];
-                        }
-                        componentExecute = new component_1.ComponentExeCute({
-                            componentConfig: projectConfig,
-                            method: this.method,
-                            version: parsedObj.edition,
-                            customerCommandName: this.customerCommandName,
-                        });
-                        process.stdout.write(ansiEscapes.eraseLines(2));
-                        return [4 /*yield*/, componentExecute.init()];
-                    case 4:
-                        tempResult = _a.sent();
-                        if (tempResult) {
-                            outPutData[projectConfig.ProjectName] = tempResult;
-                        }
-                        return [3 /*break*/, 7];
-                    case 5:
-                        params = this.deployParams || '';
-                        utils_1.logger.info("It is detected that your project has the following projects < ".concat(executeOrderList.join(','), " > to be execute"));
-                        componentList = (0, component_1.generateSynchronizeComponentExeList)({ list: executeOrderList, parse: parse, parsedObj: parsedObj, method: this.method, params: params }, this.assemblyProjectConfig.bind(this));
-                        return [4 /*yield*/, (0, component_1.synchronizeExecuteComponentList)(componentList)];
-                    case 6:
-                        tempResult = _a.sent();
-                        for (item in tempResult) {
-                            if (executeOrderList.includes(item) && tempResult[item]) {
-                                outPutData[item] = tempResult[item];
-                            }
-                        }
-                        _a.label = 7;
-                    case 7:
-                        outResult = JSON.parse(JSON.stringify(outPutData));
-                        Object.keys(outPutData).length === 0
-                            ? utils_1.logger.success("End of method: ".concat(this.method))
-                            : utils_1.logger.output(outResult);
-                        return [3 /*break*/, 9];
-                    case 8:
-                        utils_1.logger.error("Failed to execute:\n\n  ".concat((0, common_1.emoji)('❌'), " Message: Cannot find s.yaml / s.yml / template.yaml / template.yml file, please check the directory ").concat(this.templateFile, "\n  ").concat((0, common_1.emoji)('🧭'), " If you want to use Serverless Devs, you should have a s.yaml or use [s cli] command.\n      ").concat((0, common_1.emoji)('1️⃣'), " Yaml document: ").concat(colors.underline('https://github.com/Serverless-Devs/docs/blob/master/zh/yaml.md'), "\n      ").concat((0, common_1.emoji)('2️⃣'), " Cli document: [s cli -h]\n  ").concat((0, common_1.emoji)('😈'), " If you have questions, please tell us: ").concat(colors.underline('https://github.com/Serverless-Devs/Serverless-Devs/issues'), "\n"));
-                        process.exit(1);
-                        _a.label = 9;
-                    case 9: return [3 /*break*/, 12];
-                    case 10:
-                        error_2 = _a.sent();
-                        return [4 /*yield*/, (0, error_1.HandleError)({ error: error_2, prefix: 'Failed to execute:' })];
-                    case 11:
-                        _a.sent();
-                        process.exit(1);
-                        return [3 /*break*/, 12];
-                    case 12: return [2 /*return*/];
-                }
-            });
-        });
-    };
-    return CommandManager;
-}());
-exports.CommandManager = CommandManager;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tbWFuZC1tYW5hZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvcmUvY29tbWFuZC9jb21tYW5kLW1hbmFnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEscURBQXNEO0FBQ3RELHVEQUErRDtBQUMvRCxxQ0FBcUM7QUFDckMsMENBS3NCO0FBQ3RCLDZDQUE4RDtBQUM5RCwwREFBb0M7QUFDNUIsSUFBQSxNQUFNLEdBQWtCLGNBQUksT0FBdEIsRUFBRSxXQUFXLEdBQUssY0FBSSxZQUFULENBQVU7QUFDckMscUNBQTBDO0FBQzFDLGlDQUE2QztBQUU3QztJQUdFLHdCQUNZLFlBQW9CLEVBQ3BCLE1BQWMsRUFDZCxtQkFBNEIsRUFDdEMsTUFBWTtRQUhGLGlCQUFZLEdBQVosWUFBWSxDQUFRO1FBQ3BCLFdBQU0sR0FBTixNQUFNLENBQVE7UUFDZCx3QkFBbUIsR0FBbkIsbUJBQW1CLENBQVM7UUFHdEMsSUFBSSxDQUFDLFlBQVksR0FBRyxNQUFNLENBQUM7SUFDN0IsQ0FBQztJQUVLLDhDQUFxQixHQUEzQixVQUE0QixLQUFZLEVBQUUsV0FBbUIsRUFBRSxTQUFjOzs7Ozs0QkFDckQscUJBQU0sS0FBSyxDQUFDLGdCQUFnQixDQUFDLFNBQVMsQ0FBQyxFQUFBOzt3QkFBdkQsYUFBYSxHQUFHLFNBQXVDO3dCQUN2RCxhQUFhLEdBQVEsSUFBQSwwQkFBZ0IsRUFBQyxhQUFhLEVBQUUsV0FBVyxDQUFDLENBQUM7d0JBQ3hFLGFBQWEsQ0FBQyxPQUFPLEdBQUcsYUFBYSxDQUFDLElBQUksQ0FBQyxDQUFDLFlBQVk7d0JBQ3hELGFBQWEsQ0FBQyxXQUFXLEdBQUcsV0FBVyxDQUFDO3dCQUN4QyxJQUFJLElBQUksQ0FBQyxZQUFZLEVBQUU7NEJBQ3JCLGFBQWEsQ0FBQyxNQUFNLEdBQUcsSUFBSSxDQUFDLFlBQVksQ0FBQzt5QkFDMUM7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