@serverless-devs/s 2.1.14 → 3.0.0-beta.1

package/lib/logger.js

@@ -0,0 +1,82 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var logger_1 = __importDefault(require("@serverless-devs/logger"));
+var lodash_1 = require("lodash");
+var path_1 = __importDefault(require("path"));
+var utils_1 = require("@serverless-devs/utils");
+var Logger = /** @class */ (function () {
+    function Logger() {
+        var _this = this;
+        this.initialization = function () {
+            var level = (0, lodash_1.includes)(process.argv, '--debug') ? 'DEBUG' : 'INFO';
+            _this.loggerInstance = new logger_1.default({
+                traceId: process.env.serverless_devs_trace_id,
+                logDir: path_1.default.join((0, utils_1.getRootHome)(), 'logs'),
+                level: level,
+            });
+            var logger = _this.loggerInstance.__generate('s_cli');
+            _this.log = function () {
+                var args = [];
+                for (var _i = 0; _i < arguments.length; _i++) {
+                    args[_i] = arguments[_i];
+                }
+                return logger.log.apply(logger, args);
+            };
+            _this.info = function () {
+                var args = [];
+                for (var _i = 0; _i < arguments.length; _i++) {
+                    args[_i] = arguments[_i];
+                }
+                return logger.info.apply(logger, args);
+            };
+            _this.debug = function () {
+                var args = [];
+                for (var _i = 0; _i < arguments.length; _i++) {
+                    args[_i] = arguments[_i];
+                }
+                return logger.debug.apply(logger, args);
+            };
+            _this.warn = function () {
+                var args = [];
+                for (var _i = 0; _i < arguments.length; _i++) {
+                    args[_i] = arguments[_i];
+                }
+                return logger.warn.apply(logger, args);
+            };
+            _this.write = function () {
+                var args = [];
+                for (var _i = 0; _i < arguments.length; _i++) {
+                    args[_i] = arguments[_i];
+                }
+                return logger.write.apply(logger, args);
+            };
+            _this.error = function () {
+                var args = [];
+                for (var _i = 0; _i < arguments.length; _i++) {
+                    args[_i] = arguments[_i];
+                }
+                return logger.error.apply(logger, args);
+            };
+            _this.output = function () {
+                var args = [];
+                for (var _i = 0; _i < arguments.length; _i++) {
+                    args[_i] = arguments[_i];
+                }
+                return logger.output.apply(logger, args);
+            };
+            _this.progress = function () {
+                var args = [];
+                for (var _i = 0; _i < arguments.length; _i++) {
+                    args[_i] = arguments[_i];
+                }
+                return logger.progress.apply(logger, args);
+            };
+        };
+    }
+    return Logger;
+}());
+exports.default = new Logger();
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2xvZ2dlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLG1FQUE4QztBQUM5QyxpQ0FBa0M7QUFDbEMsOENBQXdCO0FBQ3hCLGdEQUFxRDtBQUVyRDtJQUFBO1FBQUEsaUJBOEJDO1FBbkJDLG1CQUFjLEdBQUc7WUFDZixJQUFNLEtBQUssR0FBRyxJQUFBLGlCQUFRLEVBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUM7WUFDbkUsS0FBSSxDQUFDLGNBQWMsR0FBRyxJQUFJLGdCQUFPLENBQUM7Z0JBQ2hDLE9BQU8sRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLHdCQUFrQztnQkFDdkQsTUFBTSxFQUFFLGNBQUksQ0FBQyxJQUFJLENBQUMsSUFBQSxtQkFBVyxHQUFFLEVBQUUsTUFBTSxDQUFDO2dCQUN4QyxLQUFLLE9BQUE7YUFDTixDQUFDLENBQUM7WUFFSCxJQUFNLE1BQU0sR0FBRyxLQUFJLENBQUMsY0FBYyxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUMsQ0FBQztZQUV2RCxLQUFJLENBQUMsR0FBRyxHQUFHO2dCQUFDLGNBQU87cUJBQVAsVUFBTyxFQUFQLHFCQUFPLEVBQVAsSUFBTztvQkFBUCx5QkFBTzs7Z0JBQUssT0FBQSxNQUFNLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxNQUFNLEVBQUUsSUFBSSxDQUFDO1lBQTlCLENBQThCLENBQUM7WUFDdkQsS0FBSSxDQUFDLElBQUksR0FBRztnQkFBQyxjQUFPO3FCQUFQLFVBQU8sRUFBUCxxQkFBTyxFQUFQLElBQU87b0JBQVAseUJBQU87O2dCQUFLLE9BQUEsTUFBTSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxFQUFFLElBQUksQ0FBQztZQUEvQixDQUErQixDQUFDO1lBQ3pELEtBQUksQ0FBQyxLQUFLLEdBQUc7Z0JBQUMsY0FBTztxQkFBUCxVQUFPLEVBQVAscUJBQU8sRUFBUCxJQUFPO29CQUFQLHlCQUFPOztnQkFBSyxPQUFBLE1BQU0sQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUM7WUFBaEMsQ0FBZ0MsQ0FBQztZQUMzRCxLQUFJLENBQUMsSUFBSSxHQUFHO2dCQUFDLGNBQU87cUJBQVAsVUFBTyxFQUFQLHFCQUFPLEVBQVAsSUFBTztvQkFBUCx5QkFBTzs7Z0JBQUssT0FBQSxNQUFNLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxNQUFNLEVBQUUsSUFBSSxDQUFDO1lBQS9CLENBQStCLENBQUM7WUFDekQsS0FBSSxDQUFDLEtBQUssR0FBRztnQkFBQyxjQUFPO3FCQUFQLFVBQU8sRUFBUCxxQkFBTyxFQUFQLElBQU87b0JBQVAseUJBQU87O2dCQUFLLE9BQUEsTUFBTSxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsTUFBTSxFQUFFLElBQUksQ0FBQztZQUFoQyxDQUFnQyxDQUFDO1lBQzNELEtBQUksQ0FBQyxLQUFLLEdBQUc7Z0JBQUMsY0FBTztxQkFBUCxVQUFPLEVBQVAscUJBQU8sRUFBUCxJQUFPO29CQUFQLHlCQUFPOztnQkFBSyxPQUFBLE1BQU0sQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUM7WUFBaEMsQ0FBZ0MsQ0FBQztZQUMzRCxLQUFJLENBQUMsTUFBTSxHQUFHO2dCQUFDLGNBQU87cUJBQVAsVUFBTyxFQUFQLHFCQUFPLEVBQVAsSUFBTztvQkFBUCx5QkFBTzs7Z0JBQUssT0FBQSxNQUFNLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxNQUFNLEVBQUUsSUFBSSxDQUFDO1lBQWpDLENBQWlDLENBQUM7WUFDN0QsS0FBSSxDQUFDLFFBQVEsR0FBRztnQkFBQyxjQUFPO3FCQUFQLFVBQU8sRUFBUCxxQkFBTyxFQUFQLElBQU87b0JBQVAseUJBQU87O2dCQUFLLE9BQUEsTUFBTSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsTUFBTSxFQUFFLElBQUksQ0FBQztZQUFuQyxDQUFtQyxDQUFDO1FBQ25FLENBQUMsQ0FBQztJQUNKLENBQUM7SUFBRCxhQUFDO0FBQUQsQ0FBQyxBQTlCRCxJQThCQztBQUVELGtCQUFlLElBQUksTUFBTSxFQUFFLENBQUMifQ==

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

@@ -0,0 +1,15 @@
+"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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2stbm9kZS12ZXJzaW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL2NoZWNrLW5vZGUtdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLGtDQUFzQztBQUV0QyxTQUFTLGdCQUFnQjtJQUN2QixJQUFNLFdBQVcsR0FBRyxNQUFNLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDbkUsSUFBSSxXQUFXLEdBQUcsRUFBRSxFQUFFO1FBQ3BCLElBQUksa0JBQVUsQ0FBQztZQUNiLFlBQVksRUFBRSx5REFBeUQ7WUFDdkUsSUFBSSxFQUFFLDBDQUFtQyxPQUFPLENBQUMsT0FBTyxxRUFBa0U7U0FDM0gsQ0FBQyxDQUFDO1FBQ0gsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztLQUNqQjtBQUNILENBQUM7QUFFRCxrQkFBZSxnQkFBZ0IsQ0FBQyJ9

package/lib/utils/get-pid.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isMAC = exports.getMAC = void 0;
+var os_1 = require("os");
+var macRegex = /(?:[a-z0-9]{1,2}[:-]){5}[a-z0-9]{1,2}/i;
+var zeroRegex = /(?:[0]{1,2}[:-]){5}[0]{1,2}/;
+/**
+ * Get the first proper MAC address
+ * @param iface If provided, restrict MAC address fetching to this interface
+ */
+function getMAC(iface) {
+    var list = (0, os_1.networkInterfaces)();
+    if (iface) {
+        var parts = list[iface];
+        if (!parts) {
+            throw new Error("interface ".concat(iface, " was not found"));
+        }
+        for (var _i = 0, parts_1 = parts; _i < parts_1.length; _i++) {
+            var part = parts_1[_i];
+            if (zeroRegex.test(part.mac) === false) {
+                return part.mac;
+            }
+        }
+        throw new Error("interface ".concat(iface, " had no valid mac addresses"));
+    }
+    else {
+        for (var _a = 0, _b = Object.entries(list); _a < _b.length; _a++) {
+            var _c = _b[_a], parts = _c[1];
+            if (!parts)
+                continue;
+            for (var _d = 0, parts_2 = parts; _d < parts_2.length; _d++) {
+                var part = parts_2[_d];
+                if (zeroRegex.test(part.mac) === false) {
+                    return part.mac;
+                }
+            }
+        }
+    }
+    throw new Error('failed to get the MAC address');
+}
+exports.getMAC = getMAC;
+/** Check if the input is a valid MAC address */
+function isMAC(macAddress) {
+    return macRegex.test(macAddress);
+}
+exports.isMAC = isMAC;
+exports.default = (function () {
+    try {
+        return getMAC().replace(/:/g, '');
+    }
+    catch (error) {
+        return 'unknown';
+    }
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0LXBpZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9nZXQtcGlkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHlCQUF1QztBQUN2QyxJQUFNLFFBQVEsR0FBRyx3Q0FBd0MsQ0FBQztBQUMxRCxJQUFNLFNBQVMsR0FBRyw2QkFBNkIsQ0FBQztBQUVoRDs7O0dBR0c7QUFDSCxTQUFnQixNQUFNLENBQUMsS0FBYztJQUNuQyxJQUFNLElBQUksR0FBRyxJQUFBLHNCQUFpQixHQUFFLENBQUM7SUFDakMsSUFBSSxLQUFLLEVBQUU7UUFDVCxJQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDMUIsSUFBSSxDQUFDLEtBQUssRUFBRTtZQUNWLE1BQU0sSUFBSSxLQUFLLENBQUMsb0JBQWEsS0FBSyxtQkFBZ0IsQ0FBQyxDQUFDO1NBQ3JEO1FBQ0QsS0FBbUIsVUFBSyxFQUFMLGVBQUssRUFBTCxtQkFBSyxFQUFMLElBQUssRUFBRTtZQUFyQixJQUFNLElBQUksY0FBQTtZQUNiLElBQUksU0FBUyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEtBQUssS0FBSyxFQUFFO2dCQUN0QyxPQUFPLElBQUksQ0FBQyxHQUFHLENBQUM7YUFDakI7U0FDRjtRQUNELE1BQU0sSUFBSSxLQUFLLENBQUMsb0JBQWEsS0FBSyxnQ0FBNkIsQ0FBQyxDQUFDO0tBQ2xFO1NBQU07UUFDTCxLQUF3QixVQUFvQixFQUFwQixLQUFBLE1BQU0sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEVBQXBCLGNBQW9CLEVBQXBCLElBQW9CLEVBQUU7WUFBbkMsSUFBQSxXQUFTLEVBQU4sS0FBSyxRQUFBO1lBQ2pCLElBQUksQ0FBQyxLQUFLO2dCQUFFLFNBQVM7WUFDckIsS0FBbUIsVUFBSyxFQUFMLGVBQUssRUFBTCxtQkFBSyxFQUFMLElBQUssRUFBRTtnQkFBckIsSUFBTSxJQUFJLGNBQUE7Z0JBQ2IsSUFBSSxTQUFTLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsS0FBSyxLQUFLLEVBQUU7b0JBQ3RDLE9BQU8sSUFBSSxDQUFDLEdBQUcsQ0FBQztpQkFDakI7YUFDRjtTQUNGO0tBQ0Y7SUFDRCxNQUFNLElBQUksS0FBSyxDQUFDLCtCQUErQixDQUFDLENBQUM7QUFDbkQsQ0FBQztBQXhCRCx3QkF3QkM7QUFFRCxnREFBZ0Q7QUFDaEQsU0FBZ0IsS0FBSyxDQUFDLFVBQWtCO0lBQ3RDLE9BQU8sUUFBUSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQztBQUNuQyxDQUFDO0FBRkQsc0JBRUM7QUFFRCxtQkFBZTtJQUNiLElBQUk7UUFDRixPQUFPLE1BQU0sRUFBRSxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLENBQUM7S0FDbkM7SUFBQyxPQUFPLEtBQUssRUFBRTtRQUNkLE9BQU8sU0FBUyxDQUFDO0tBQ2xCO0FBQ0gsQ0FBQyxFQUFDIn0=

package/lib/utils/index.js

@@ -1,39 +1,43 @@
 "use strict";
-/** @format */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.registerCommandChecker = exports.i18n = exports.logger = void 0;
-var logger_1 = __importDefault(require("./logger"));
-__exportStar(require("./common"), exports);
-__exportStar(require("./handler-set-config"), exports);
-var logger_2 = require("./logger");
-Object.defineProperty(exports, "logger", { enumerable: true, get: function () { return __importDefault(logger_2).default; } });
-var i18n_1 = require("./i18n");
-Object.defineProperty(exports, "i18n", { enumerable: true, get: function () { return __importDefault(i18n_1).default; } });
-function registerCommandChecker(program) {
-    program.on('command:*', function (cmds) {
-        var commands = program.commands.map(function (command) { return command.name(); });
-        if (!commands.includes(cmds[0])) {
-            logger_1.default.error("  error: unknown command ".concat(cmds[0]));
-            program.help();
-        }
-    });
-}
-exports.registerCommandChecker = registerCommandChecker;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLGNBQWM7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBRWQsb0RBQThCO0FBQzlCLDJDQUF5QjtBQUN6Qix1REFBcUM7QUFDckMsbUNBQTZDO0FBQXBDLGlIQUFBLE9BQU8sT0FBVTtBQUMxQiwrQkFBeUM7QUFBaEMsNkdBQUEsT0FBTyxPQUFRO0FBRXhCLFNBQWdCLHNCQUFzQixDQUFDLE9BQVk7SUFDakQsT0FBTyxDQUFDLEVBQUUsQ0FBQyxXQUFXLEVBQUUsVUFBQyxJQUFTO1FBQ2hDLElBQU0sUUFBUSxHQUFHLE9BQU8sQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLFVBQUMsT0FBWSxJQUFLLE9BQUEsT0FBTyxDQUFDLElBQUksRUFBRSxFQUFkLENBQWMsQ0FBQyxDQUFDO1FBQ3hFLElBQUksQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFO1lBQy9CLGdCQUFNLENBQUMsS0FBSyxDQUFDLG1DQUE0QixJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUUsQ0FBQyxDQUFDO1lBQ3BELE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FBQztTQUNoQjtJQUNILENBQUMsQ0FBQyxDQUFDO0FBQ0wsQ0FBQztBQVJELHdEQVFDIn0=
+exports.tableLayout = exports.emoji = exports.setProxy = exports.checkNodeVersion = exports.getPid = void 0;
+var os_1 = __importDefault(require("os"));
+var lodash_1 = require("lodash");
+var table_layout_1 = __importDefault(require("table-layout"));
+var get_pid_1 = require("./get-pid");
+Object.defineProperty(exports, "getPid", { enumerable: true, get: function () { return __importDefault(get_pid_1).default; } });
+var check_node_version_1 = require("./check-node-version");
+Object.defineProperty(exports, "checkNodeVersion", { enumerable: true, get: function () { return __importDefault(check_node_version_1).default; } });
+var set_proxy_1 = require("./set-proxy");
+Object.defineProperty(exports, "setProxy", { enumerable: true, get: function () { return __importDefault(set_proxy_1).default; } });
+var emoji = function (text, fallback) {
+    if (os_1.default.platform() === 'win32') {
+        return fallback || '◆';
+    }
+    return "".concat(text, " ");
+};
+exports.emoji = emoji;
+var tableLayout = function (data, indent) {
+    if (indent === void 0) { indent = 0; }
+    var newData = (0, lodash_1.filter)(data, function (item) { return item.command !== 'help'; });
+    var commandMaxLen = (0, lodash_1.maxBy)(newData, function (item) { return item.command.length; }).command.length;
+    var descMaxLen = (0, lodash_1.maxBy)(newData, function (item) { return item.description.length; }).description.length;
+    return new table_layout_1.default(newData, {
+        padding: { left: (0, lodash_1.repeat)(' ', indent + 2) },
+        columns: [
+            {
+                name: 'command',
+                width: commandMaxLen + 2 > 29 ? commandMaxLen + 2 : 29,
+            },
+            {
+                name: 'description',
+                width: descMaxLen + 10,
+            },
+        ],
+    }).toString();
+};
+exports.tableLayout = tableLayout;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsMENBQW9CO0FBQ3BCLGlDQUE4QztBQUM5Qyw4REFBdUM7QUFFdkMscUNBQThDO0FBQXJDLGtIQUFBLE9BQU8sT0FBVTtBQUMxQiwyREFBbUU7QUFBMUQsdUlBQUEsT0FBTyxPQUFvQjtBQUNwQyx5Q0FBa0Q7QUFBekMsc0hBQUEsT0FBTyxPQUFZO0FBRXJCLElBQU0sS0FBSyxHQUFHLFVBQUMsSUFBWSxFQUFFLFFBQWlCO0lBQ25ELElBQUksWUFBRSxDQUFDLFFBQVEsRUFBRSxLQUFLLE9BQU8sRUFBRTtRQUM3QixPQUFPLFFBQVEsSUFBSSxHQUFHLENBQUM7S0FDeEI7SUFDRCxPQUFPLFVBQUcsSUFBSSxNQUFHLENBQUM7QUFDcEIsQ0FBQyxDQUFDO0FBTFcsUUFBQSxLQUFLLFNBS2hCO0FBR0ssSUFBTSxXQUFXLEdBQUcsVUFBQyxJQUFnRCxFQUFFLE1BQVU7SUFBVix1QkFBQSxFQUFBLFVBQVU7SUFDdEYsSUFBTSxPQUFPLEdBQUcsSUFBQSxlQUFNLEVBQUMsSUFBSSxFQUFFLFVBQUMsSUFBSSxJQUFLLE9BQUEsSUFBSSxDQUFDLE9BQU8sS0FBSyxNQUFNLEVBQXZCLENBQXVCLENBQUMsQ0FBQTtJQUMvRCxJQUFNLGFBQWEsR0FBRyxJQUFBLGNBQUssRUFBQyxPQUFPLEVBQUUsVUFBQyxJQUFJLElBQUssT0FBQSxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sRUFBbkIsQ0FBbUIsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUM7SUFDbkYsSUFBTSxVQUFVLEdBQUcsSUFBQSxjQUFLLEVBQUMsT0FBTyxFQUFFLFVBQUMsSUFBSSxJQUFLLE9BQUEsSUFBSSxDQUFDLFdBQVcsQ0FBQyxNQUFNLEVBQXZCLENBQXVCLENBQUMsQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDO0lBQ3hGLE9BQU8sSUFBSSxzQkFBVyxDQUFDLE9BQU8sRUFBRTtRQUM5QixPQUFPLEVBQUUsRUFBRSxJQUFJLEVBQUUsSUFBQSxlQUFNLEVBQUMsR0FBRyxFQUFFLE1BQU0sR0FBRyxDQUFDLENBQUMsRUFBRTtRQUMxQyxPQUFPLEVBQUU7WUFDUDtnQkFDRSxJQUFJLEVBQUUsU0FBUztnQkFDZixLQUFLLEVBQUUsYUFBYSxHQUFHLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDLGFBQWEsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUU7YUFDdkQ7WUFDRDtnQkFDRSxJQUFJLEVBQUUsYUFBYTtnQkFDbkIsS0FBSyxFQUFFLFVBQVUsR0FBRyxFQUFFO2FBQ3ZCO1NBQ0Y7S0FDRixDQUFDLENBQUMsUUFBUSxFQUFFLENBQUE7QUFDZixDQUFDLENBQUE7QUFqQlksUUFBQSxXQUFXLGVBaUJ2QiJ9

package/lib/utils/set-proxy.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var utils_1 = require("@serverless-devs/utils");
+var globalAgent = require('global-agent');
+var setProxy = function () {
+    var proxy_enable = (0, utils_1.getGlobalConfig)('proxy_enable');
+    if (!proxy_enable)
+        return;
+    globalAgent.bootstrap();
+    var http_proxy = (0, utils_1.getGlobalConfig)('http_proxy');
+    var https_proxy = (0, utils_1.getGlobalConfig)('https_proxy');
+    if (http_proxy) {
+        global.GLOBAL_AGENT.HTTP_PROXY = http_proxy;
+    }
+    if (https_proxy) {
+        global.GLOBAL_AGENT.HTTPS_PROXY = https_proxy;
+    }
+    process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = '0';
+};
+exports.default = setProxy;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0LXByb3h5LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL3NldC1wcm94eS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLGdEQUF5RDtBQUN6RCxJQUFNLFdBQVcsR0FBRyxPQUFPLENBQUMsY0FBYyxDQUFDLENBQUM7QUFFNUMsSUFBTSxRQUFRLEdBQUc7SUFDZixJQUFNLFlBQVksR0FBRyxJQUFBLHVCQUFlLEVBQUMsY0FBYyxDQUFDLENBQUM7SUFDckQsSUFBSSxDQUFDLFlBQVk7UUFBRSxPQUFPO0lBRTFCLFdBQVcsQ0FBQyxTQUFTLEVBQUUsQ0FBQztJQUV4QixJQUFNLFVBQVUsR0FBRyxJQUFBLHVCQUFlLEVBQUMsWUFBWSxDQUFDLENBQUM7SUFDakQsSUFBTSxXQUFXLEdBQUcsSUFBQSx1QkFBZSxFQUFDLGFBQWEsQ0FBQyxDQUFDO0lBQ25ELElBQUksVUFBVSxFQUFFO1FBQ2IsTUFBYyxDQUFDLFlBQVksQ0FBQyxVQUFVLEdBQUcsVUFBVSxDQUFDO0tBQ3REO0lBQ0QsSUFBSSxXQUFXLEVBQUU7UUFDZCxNQUFjLENBQUMsWUFBWSxDQUFDLFdBQVcsR0FBRyxXQUFXLENBQUM7S0FDeEQ7SUFDRCxPQUFPLENBQUMsR0FBRyxDQUFDLDhCQUE4QixDQUFDLEdBQUcsR0FBRyxDQUFDO0FBQ3BELENBQUMsQ0FBQztBQUVGLGtCQUFlLFFBQVEsQ0FBQyJ9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serverless-devs/s",
-  "version": "2.1.14",
+  "version": "3.0.0-beta.1",
   "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,17 +29,12 @@
   },
   "scripts": {
     "start": "npm run watch",
+    "format": "prettier --write src/",
     "prewatch": "rm -rf lib/* && cp -r ./src/daemon ./lib",
-    "watch": "tsc -w",
-    "test": "jest test/special-command.test",
+    "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",
-    "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",
     "beta": "npm publish --tag=beta",
     "pkg": "tsc && pkg bin/s"
   },
@@ -48,43 +43,34 @@
     "s": "bin/s"
   },
   "devDependencies": {
-    "@serverless-devs/commander": "^6.2.6",
-    "@serverless-devs/utils": "^0.0.4",
-    "@types/jest": "^27.4.0",
+    "@serverless-devs/core": "^0.1.59",
+    "@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",
+    "@types/fs-extra": "^11.0.1",
+    "@types/js-yaml": "^4.0.5",
+    "@types/lodash": "^4.14.195",
     "@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",
+    "chalk": "^4.1.0",
+    "commander": "^11.0.0",
+    "esbuild": "^0.18.11",
+    "fs-extra": "^11.1.1",
     "global-agent": "^3.0.0",
-    "husky": "^4.2.3",
-    "inquirer": "8.2.0",
+    "inquirer": "8.2.5",
     "inquirer-autocomplete-prompt": "^1.3.0",
-    "jest": "^27.4.7",
-    "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": "^27.1.3",
+    "js-yaml": "^4.1.0",
+    "lodash": "^4.17.21",
+    "prettier": "^2.8.8",
+    "rimraf": "^5.0.1",
+    "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": "latest",
-    "@serverless-devs/ui": "latest"
   }
 }

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