@zeppos/zeus-cli 1.7.10 → 1.8.0

package/private-modules/zeppos-app-utils/dist/modules/build.js

@@ -26,13 +26,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -43,8 +53,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 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;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["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.");
@@ -69,10 +79,19 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.runX = exports.previewBuild = exports.build = exports.buildSupportV3Config = exports.BuildMode = void 0;
 var zpm_1 = require("@zeppos/zpm");
 var rd = __importStar(require("rd"));
@@ -93,7 +112,7 @@ var BuildMode;
     BuildMode["DEV"] = "development";
     BuildMode["PREVIEW"] = "preview";
     BuildMode["PROD"] = "production";
-})(BuildMode = exports.BuildMode || (exports.BuildMode = {}));
+})(BuildMode || (exports.BuildMode = BuildMode = {}));
 var TransformType;
 (function (TransformType) {
     TransformType["Default"] = "";
@@ -101,7 +120,7 @@ var TransformType;
     TransformType["C"] = "c";
     TransformType["Bin"] = "bin";
 })(TransformType || (TransformType = {}));
-var INNER_PRODUCT_TIP = "\n\n".concat(chalk_1["default"].yellow.bold('Notice:'), "\n").concat(chalk_1["default"].blue('Please note that if your installation package includes intermediate products, you specifically authorize us to modify, edit, utilize, repackage, and distribute the installation package(including intermediate products) for the following purposes:'), "\n\n").concat(chalk_1["default"].blue.bold('1.'), " Using intermediate products to generate new installation packages and distribute them to new devices;\n").concat(chalk_1["default"].blue.bold('2.'), " Distribute the installation package to devices with the same CPU architecture and screen resolution, not limited to the device you have currently selected.\n\nHowever, we will not distribute intermediate products to user devices directly. If you choose not to include intermediate products in your installation package, use the ").concat(chalk_1["default"].bold.green('zeus prune --ip'), " command to remove it immediately after the build is completed. However, you\u2019ll then have to manually provide a build for each device type.\n\n");
+var INNER_PRODUCT_TIP = "\n\n".concat(chalk_1.default.yellow.bold('Notice:'), "\n").concat(chalk_1.default.blue('Please note that if your installation package includes intermediate products, you specifically authorize us to modify, edit, utilize, repackage, and distribute the installation package(including intermediate products) for the following purposes:'), "\n\n").concat(chalk_1.default.blue.bold('1.'), " Using intermediate products to generate new installation packages and distribute them to new devices;\n").concat(chalk_1.default.blue.bold('2.'), " Distribute the installation package to devices with the same CPU architecture and screen resolution, not limited to the device you have currently selected.\n\nHowever, we will not distribute intermediate products to user devices directly. If you choose not to include intermediate products in your installation package, use the ").concat(chalk_1.default.bold.green('zeus prune --ip'), " command to remove it immediately after the build is completed. However, you\u2019ll then have to manually provide a build for each device type.\n\n");
 var gitignoreDefaultItem = [
     '.DS_Store',
     'node_modules/**',
@@ -120,12 +139,12 @@ var gitignoreDefaultItem = [
     '*.sln',
 ];
 function getSimulatorPath() {
-    var platform = os_1["default"].platform();
+    var platform = os_1.default.platform();
     var newPath;
     if (platform === 'win32')
         newPath = process.env.APPDATA || '';
     else
-        newPath = path.join(os_1["default"].homedir(), '.config');
+        newPath = path.join(os_1.default.homedir(), '.config');
     return path.join(newPath, 'simulator');
 }
 function getSimulatorAppsPath(projectName, appId) {
@@ -144,12 +163,12 @@ function updateLastAppInfo(projectName, appId, userProjectPath) {
         user_app_path: userProjectPath,
         project_name: projectName,
         app_id: appId,
-        last_updated: new Date().toISOString()
+        last_updated: new Date().toISOString(),
     };
     var needsUpdate = true;
-    if (fs_1["default"].existsSync(lastAppInfoPath)) {
+    if (fs_1.default.existsSync(lastAppInfoPath)) {
         try {
-            var existingContent = fs_1["default"].readFileSync(lastAppInfoPath, 'utf8');
+            var existingContent = fs_1.default.readFileSync(lastAppInfoPath, 'utf8');
             var existingInfo = JSON.parse(existingContent);
             if (existingInfo.sim_app_path === newAppInfo.sim_app_path &&
                 existingInfo.user_app_path === newAppInfo.user_app_path) {
@@ -162,16 +181,20 @@ function updateLastAppInfo(projectName, appId, userProjectPath) {
         }
     }
     if (needsUpdate) {
-        fs_1["default"].mkdirSync(simulatorDir, { recursive: true });
-        fs_1["default"].writeFileSync(lastAppInfoPath, JSON.stringify(newAppInfo, null, 2));
+        fs_1.default.mkdirSync(simulatorDir, { recursive: true });
+        fs_1.default.writeFileSync(lastAppInfoPath, JSON.stringify(newAppInfo, null, 2));
     }
     return newAppInfo;
 }
-var buildSupportV3Config = function (workspace, mode, buildConfigOption) {
-    if (mode === void 0) { mode = BuildMode.PROD; }
-    if (buildConfigOption === void 0) { buildConfigOption = {}; }
-    return __awaiter(void 0, void 0, void 0, function () {
+var buildSupportV3Config = function (workspace_1) {
+    var args_1 = [];
+    for (var _i = 1; _i < arguments.length; _i++) {
+        args_1[_i - 1] = arguments[_i];
+    }
+    return __awaiter(void 0, __spreadArray([workspace_1], args_1, true), void 0, function (workspace, mode, buildConfigOption) {
         var _a, sources_1, _b, targets, _c, sources, buildOptions, _d, js2c, _e, js2bin, _f, png2vg, _g, prune, _h, compress, _j, ip, zabName_1, distDir_1, name_1, newName_1, error_1;
+        if (mode === void 0) { mode = BuildMode.PROD; }
+        if (buildConfigOption === void 0) { buildConfigOption = {}; }
         return __generator(this, function (_k) {
             switch (_k.label) {
                 case 0:
@@ -185,7 +208,7 @@ var buildSupportV3Config = function (workspace, mode, buildConfigOption) {
                         buildMode: mode,
                         targets: targets,
                         sources: sources,
-                        jsc: TransformType.Default
+                        jsc: TransformType.Default,
                     };
                     if ([BuildMode.PROD, BuildMode.PREVIEW].includes(mode)) {
                         _d = buildConfigOption || {}, js2c = _d.js2c, _e = _d.js2bin, js2bin = _e === void 0 ? true : _e, _f = _d.png2vg, png2vg = _f === void 0 ? true : _f, _g = _d.prune, prune = _g === void 0 ? true : _g, _h = _d.compress, compress = _h === void 0 ? true : _h, _j = _d.ip, ip = _j === void 0 ? BuildMode.PROD === mode : _j;
@@ -197,7 +220,7 @@ var buildSupportV3Config = function (workspace, mode, buildConfigOption) {
                             png2vg: (0, tools_1.booleanString)(png2vg),
                             prune: (0, tools_1.booleanString)(prune),
                             compress: (0, tools_1.booleanString)(compress),
-                            ip: (0, tools_1.booleanString)(ip)
+                            ip: (0, tools_1.booleanString)(ip),
                         });
                     }
                     _k.label = 1;
@@ -226,10 +249,10 @@ var buildSupportV3Config = function (workspace, mode, buildConfigOption) {
                         rd.eachFileSync(distDir_1, function (file) {
                             var oldName = path.join(distDir_1, zabName_1);
                             if (file !== oldName) {
-                                fs_extra_1["default"].removeSync(file);
+                                fs_extra_1.default.removeSync(file);
                             }
                             else {
-                                fs_1["default"].renameSync(oldName, path.join(distDir_1, newName_1));
+                                fs_1.default.renameSync(oldName, path.join(distDir_1, newName_1));
                             }
                         });
                         mode === BuildMode.PROD && index_1.logger.log(INNER_PRODUCT_TIP);
@@ -247,11 +270,15 @@ var buildSupportV3Config = function (workspace, mode, buildConfigOption) {
     });
 };
 exports.buildSupportV3Config = buildSupportV3Config;
-var build = function (workspace, mode, buildConfigOption, packages, appId) {
-    if (mode === void 0) { mode = BuildMode.PROD; }
-    if (appId === void 0) { appId = '10000'; }
-    return __awaiter(void 0, void 0, void 0, function () {
+var build = function (workspace_1) {
+    var args_1 = [];
+    for (var _i = 1; _i < arguments.length; _i++) {
+        args_1[_i - 1] = arguments[_i];
+    }
+    return __awaiter(void 0, __spreadArray([workspace_1], args_1, true), void 0, function (workspace, mode, buildConfigOption, packages, appId) {
         var buildOptions, _a, js2c, _b, js2bin, _c, png2vg, _d, prune, _e, compress, _f, ip, curOpt, productName_1, DistDir_1, name_2, newName_2, error_2;
+        if (mode === void 0) { mode = BuildMode.PROD; }
+        if (appId === void 0) { appId = '10000'; }
         return __generator(this, function (_g) {
             switch (_g.label) {
                 case 0:
@@ -259,7 +286,7 @@ var build = function (workspace, mode, buildConfigOption, packages, appId) {
                         path: workspace,
                         targets: packages,
                         buildMode: mode,
-                        jsc: TransformType.Default
+                        jsc: TransformType.Default,
                     };
                     if (mode === BuildMode.PROD || mode === BuildMode.PREVIEW) {
                         _a = buildConfigOption || {}, js2c = _a.js2c, _b = _a.js2bin, js2bin = _b === void 0 ? true : _b, _c = _a.png2vg, png2vg = _c === void 0 ? true : _c, _d = _a.prune, prune = _d === void 0 ? true : _d, _e = _a.compress, compress = _e === void 0 ? true : _e, _f = _a.ip, ip = _f === void 0 ? mode === BuildMode.PROD : _f;
@@ -271,7 +298,7 @@ var build = function (workspace, mode, buildConfigOption, packages, appId) {
                             png2vg: (0, tools_1.booleanString)(png2vg),
                             prune: (0, tools_1.booleanString)(prune),
                             compress: (0, tools_1.booleanString)(compress),
-                            ip: (0, tools_1.booleanString)(ip)
+                            ip: (0, tools_1.booleanString)(ip),
                         });
                     }
                     _g.label = 1;
@@ -290,10 +317,10 @@ var build = function (workspace, mode, buildConfigOption, packages, appId) {
                         rd.eachFileSync(DistDir_1, function (file) {
                             var oldName = path.join(DistDir_1, productName_1);
                             if (file !== oldName) {
-                                fs_extra_1["default"].removeSync(file);
+                                fs_extra_1.default.removeSync(file);
                             }
                             else {
-                                fs_1["default"].renameSync(oldName, path.join(DistDir_1, newName_2));
+                                fs_1.default.renameSync(oldName, path.join(DistDir_1, newName_2));
                             }
                         });
                         productName_1 = newName_2;
@@ -321,8 +348,8 @@ var previewBuild = function (root, args, workspace, appType, curCommand) { retur
         return [2, new Promise(function (resolve, reject) { return __awaiter(void 0, void 0, void 0, function () {
                 var form;
                 return __generator(this, function (_a) {
-                    form = new form_data_1["default"]();
-                    form.append('file', fs_1["default"].createReadStream(workspace));
+                    form = new form_data_1.default();
+                    form.append('file', fs_1.default.createReadStream(workspace));
                     form.append('app_type', appType === index_1.config.AppType.WATCHFACE ? '1' : '2');
                     form.getLength(function (err, length) { return __awaiter(void 0, void 0, void 0, function () {
                         var protocol, code, res, error_3, _subRegionalHost, url, _a, deviceSource, appId, appName, appType_1, deviceSourceArr, targetDeviceInternalName, packageInfo, url, preview, downloadPackageReturn;
@@ -389,10 +416,10 @@ var previewBuild = function (root, args, workspace, appType, curCommand) { retur
                                         preview: preview,
                                         appid: appId,
                                         name: appName,
-                                        "debugger": true,
+                                        debugger: true,
                                         updatedTime: Math.round(new Date().getTime() / 1000),
                                         devices: (0, lodash_1.get)(args, "sources", deviceSourceArr),
-                                        target: targetDeviceInternalName
+                                        target: targetDeviceInternalName,
                                     });
                                     _b.label = 10;
                                 case 10: return [2];
@@ -433,17 +460,17 @@ var runX = function (root, args, url, logAfterFunc) { return __awaiter(void 0, v
                         else {
                             logger.error('build error');
                         }
-                        logger.info(chalk_1["default"].green("watching the changes in this project..."));
+                        logger.info(chalk_1.default.green("watching the changes in this project..."));
                         return [2];
                 }
             });
         }); }, 150, { maxWait: 1000 });
         refreshSimulator();
         gitignorePath = path.resolve(root, '.gitignore');
-        fs_extra_1["default"].ensureFileSync(gitignorePath);
-        gitignore = (0, parse_gitignore_1["default"])(fs_extra_1["default"].readFileSync(gitignorePath));
+        fs_extra_1.default.ensureFileSync(gitignorePath);
+        gitignore = (0, parse_gitignore_1.default)(fs_extra_1.default.readFileSync(gitignorePath));
         if (!gitignore.length) {
-            fs_extra_1["default"].writeFileSync(gitignorePath, gitignoreDefaultItem.join('\n'));
+            fs_extra_1.default.writeFileSync(gitignorePath, gitignoreDefaultItem.join('\n'));
             gitignore = gitignoreDefaultItem;
         }
         ignored = (0, lodash_2.union)([
@@ -457,15 +484,15 @@ var runX = function (root, args, url, logAfterFunc) { return __awaiter(void 0, v
             'yarn.lock',
             'package-lock.json',
         ], gitignore);
-        return [2, chokidar_1["default"]
+        return [2, chokidar_1.default
                 .watch('.', {
                 ignored: ignored,
                 ignoreInitial: true,
                 interval: 1000,
-                cwd: root
+                cwd: root,
             })
                 .on('all', function (_type, path) {
-                logger.info("".concat(path, " ").concat(chalk_1["default"].green(_type)));
+                logger.info("".concat(path, " ").concat(chalk_1.default.green(_type)));
                 path && refreshSimulator();
             })];
     });

package/private-modules/zeppos-app-utils/dist/modules/config.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 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;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["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.");
@@ -38,7 +38,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.config = void 0;
 var lodash_1 = __importDefault(require("lodash"));
 var chalk_1 = __importDefault(require("chalk"));
@@ -47,27 +47,27 @@ var config = function (args, logAfterFunc) { return __awaiter(void 0, void 0, vo
     var cliName, _a, cmd, _b, method, values, allowedMethods, myLogger, commonHandleNotKeyTips, config_1;
     return __generator(this, function (_c) {
         cliName = process.env.CMD_NAME || '';
-        _a = lodash_1["default"].get(args, '_', []), cmd = _a[0], _b = _a[1], method = _b === void 0 ? '' : _b, values = _a.slice(2);
+        _a = lodash_1.default.get(args, '_', []), cmd = _a[0], _b = _a[1], method = _b === void 0 ? '' : _b, values = _a.slice(2);
         allowedMethods = ['get', 'set', 'delete', 'list'];
         myLogger = new index_1.MyLogger();
         if (logAfterFunc) {
             myLogger.addAfterFunc(logAfterFunc);
         }
-        if (!lodash_1["default"].includes(allowedMethods, method)) {
+        if (!lodash_1.default.includes(allowedMethods, method)) {
             index_1.logger.error("invalid method: '".concat(method, "'"));
-            index_1.logger.log(chalk_1["default"].yellow('try to use one of the following:'));
+            index_1.logger.log(chalk_1.default.yellow('try to use one of the following:'));
             index_1.logger.log("- ".concat(cliName, " ").concat(cmd, " set <key>=<value> [<key>=<value> ...]"));
             index_1.logger.log("- ".concat(cliName, " ").concat(cmd, " get <key> [<key> ...]"));
             index_1.logger.log("- ".concat(cliName, " ").concat(cmd, " delete <key> [<key> ...]"));
             index_1.logger.log("- ".concat(cliName, " ").concat(cmd, " list [--json]"));
         }
         commonHandleNotKeyTips = function (method) {
-            index_1.logger.error("Please enter the data in the format: ".concat(chalk_1["default"].yellow("zeus config ".concat(method, " <key>"))));
+            index_1.logger.error("Please enter the data in the format: ".concat(chalk_1.default.yellow("zeus config ".concat(method, " <key>"))));
         };
         switch (method) {
             case 'set':
                 if (!values.length) {
-                    myLogger.error("Please enter the data in the format: ".concat(chalk_1["default"].yellow('zeus config set <key>=<value>')));
+                    myLogger.error("Please enter the data in the format: ".concat(chalk_1.default.yellow('zeus config set <key>=<value>')));
                     break;
                 }
                 values.forEach(function (info) {
@@ -124,15 +124,17 @@ var config = function (args, logAfterFunc) { return __awaiter(void 0, void 0, vo
             case 'list':
                 config_1 = index_1.instanceStorage.getStorage();
                 Object.keys(config_1).forEach(function (key) {
-                    if (lodash_1["default"].startsWith(key, '____')) {
-                        lodash_1["default"].unset(config_1, key);
+                    if (lodash_1.default.startsWith(key, '____')) {
+                        lodash_1.default.unset(config_1, key);
                     }
                 });
-                if (lodash_1["default"].get(args, 'json', false)) {
+                if (lodash_1.default.get(args, 'json', false)) {
                     myLogger.log(JSON.stringify(config_1, null, 2));
                 }
                 else {
-                    myLogger.log(Object.keys(config_1).map(function (key) { return "".concat(key, "=").concat(config_1[key]); }).join('\n'));
+                    myLogger.log(Object.keys(config_1)
+                        .map(function (key) { return "".concat(key, "=").concat(config_1[key]); })
+                        .join('\n'));
                 }
                 break;
             default:

package/private-modules/zeppos-app-utils/dist/modules/create/index.js

@@ -26,13 +26,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -43,8 +53,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 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;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["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.");
@@ -69,10 +79,19 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.createX = void 0;
 var chalk_1 = __importDefault(require("chalk"));
 var rd = __importStar(require("rd"));
@@ -84,11 +103,11 @@ var yeoman_environment_1 = __importDefault(require("yeoman-environment"));
 var local_app_1 = require("./local-app");
 var yeoman_app_1 = require("./yeoman-app");
 var index_1 = require("../../index");
-var AppType = index_1.config.AppType, AppSourceType = index_1.config.AppSourceType, TemplateCopyType = index_1.config.TemplateCopyType, zeppFontIcon = index_1.config.zeppFontIcon;
 var child_process_1 = require("child_process");
+var AppType = index_1.config.AppType, AppSourceType = index_1.config.AppSourceType, TemplateCopyType = index_1.config.TemplateCopyType, zeppFontIcon = index_1.config.zeppFontIcon;
 var projectPreInstall = function (dir) {
     return new Promise(function (resolve) {
-        if (!fs_extra_1["default"].existsSync((0, path_1.join)(dir, 'package.json'))) {
+        if (!fs_extra_1.default.existsSync((0, path_1.join)(dir, 'package.json'))) {
             resolve(true);
             return;
         }
@@ -102,10 +121,14 @@ var projectPreInstall = function (dir) {
         });
     });
 };
-var createX = function (cwdPath, args, func, beforeFiles) {
-    if (beforeFiles === void 0) { beforeFiles = []; }
-    return __awaiter(void 0, void 0, void 0, function () {
+var createX = function (cwdPath_1, args_1, func_1) {
+    var args_2 = [];
+    for (var _i = 3; _i < arguments.length; _i++) {
+        args_2[_i - 3] = arguments[_i];
+    }
+    return __awaiter(void 0, __spreadArray([cwdPath_1, args_1, func_1], args_2, true), void 0, function (cwdPath, args, func, beforeFiles) {
         var cmd, _a, projectName, _b, configVersion, workDir, templateDir, localTemplatesDirMap, localTemplates, allOS, appTypes, genChoices, localChoices, watchfaceTemplateChoices, appTemplateChoices, workoutExtTemplateChoices, getTemplateChoices, templatesInit, env, generatorMate, generatorMateKeys, choicesValueFormat, answer, choosePkg;
+        if (beforeFiles === void 0) { beforeFiles = []; }
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -118,7 +141,7 @@ var createX = function (cwdPath, args, func, beforeFiles) {
                         v2: (0, path_1.resolve)(templateDir, './os2.0'),
                         v3: (0, path_1.resolve)(templateDir, './os3.0'),
                         'v3.5': (0, path_1.resolve)(templateDir, './os3.5'),
-                        v4: (0, path_1.resolve)(templateDir, './os4.0')
+                        v4: (0, path_1.resolve)(templateDir, './os4.0'),
                     };
                     localTemplates = Object.keys(localTemplatesDirMap).reduce(function (temps, osVersion) {
                         var dir = localTemplatesDirMap[osVersion];
@@ -128,25 +151,30 @@ var createX = function (cwdPath, args, func, beforeFiles) {
                         temps[osVersion] = {
                             app: (0, fs_1.existsSync)(appDir) ? (0, fs_1.readdirSync)(appDir) : [],
                             watchface: (0, fs_1.existsSync)(watchfaceDir) ? (0, fs_1.readdirSync)(watchfaceDir) : [],
-                            'workout-extension': (0, fs_1.existsSync)(workoutExtensionDir) ? (0, fs_1.readdirSync)(workoutExtensionDir) : []
+                            'workout-extension': (0, fs_1.existsSync)(workoutExtensionDir) ? (0, fs_1.readdirSync)(workoutExtensionDir) : [],
                         };
                         return temps;
                     }, {});
                     allOS = ['v1', 'v2', 'v3', 'v3.5', 'v4'];
                     appTypes = ['watchface', 'app', 'workout-extension'];
-                    genChoices = function () { return allOS.reduce(function (pre, osVersion) {
-                        pre[osVersion] = [];
-                        return pre;
-                    }, {}); };
+                    genChoices = function () {
+                        return allOS.reduce(function (pre, osVersion) {
+                            pre[osVersion] = [];
+                            return pre;
+                        }, {});
+                    };
                     localChoices = genChoices();
                     watchfaceTemplateChoices = { v1: [], v2: [] };
                     appTemplateChoices = genChoices();
                     workoutExtTemplateChoices = { 'v3.5': [] };
                     getTemplateChoices = function (appType) {
                         switch (appType) {
-                            case 'app': return appTemplateChoices;
-                            case 'watchface': return watchfaceTemplateChoices;
-                            case 'workout-extension': return workoutExtTemplateChoices;
+                            case 'app':
+                                return appTemplateChoices;
+                            case 'watchface':
+                                return watchfaceTemplateChoices;
+                            case 'workout-extension':
+                                return workoutExtTemplateChoices;
                         }
                     };
                     templatesInit = function (os, dir) {
@@ -156,11 +184,11 @@ var createX = function (cwdPath, args, func, beforeFiles) {
                             var chooseItem = {
                                 name: tempName,
                                 path: dirPath,
-                                type: AppSourceType.LOCAL
+                                type: AppSourceType.LOCAL,
                             };
                             if (tempName === 'Empty') {
                                 Object.assign(chooseItem, {
-                                    copyType: TemplateCopyType.EDIT
+                                    copyType: TemplateCopyType.EDIT,
                                 });
                                 localChoices[os].unshift(chooseItem);
                                 tempChoices[os].unshift(chooseItem);
@@ -184,7 +212,7 @@ var createX = function (cwdPath, args, func, beforeFiles) {
                             templatesInit(osVersion, localTemplatesDirMap[osVersion]);
                         });
                     }
-                    env = yeoman_environment_1["default"].createEnv();
+                    env = yeoman_environment_1.default.createEnv();
                     env.lookup();
                     generatorMate = env.getGeneratorsMeta();
                     generatorMateKeys = Object.keys(generatorMate);
@@ -194,15 +222,15 @@ var createX = function (cwdPath, args, func, beforeFiles) {
                                 allOS.forEach(function (osVersion) {
                                     localChoices[osVersion].push({
                                         name: name,
-                                        type: AppSourceType.YEOMAN
+                                        type: AppSourceType.YEOMAN,
                                     });
                                     appTemplateChoices[osVersion].push({
                                         name: name,
-                                        type: AppSourceType.YEOMAN
+                                        type: AppSourceType.YEOMAN,
                                     });
                                     watchfaceTemplateChoices[osVersion].push({
                                         name: name,
-                                        type: AppSourceType.YEOMAN
+                                        type: AppSourceType.YEOMAN,
                                     });
                                 });
                             }
@@ -222,7 +250,7 @@ var createX = function (cwdPath, args, func, beforeFiles) {
                     return [4, func(args, {
                             appTemplateChoices: appTemplateChoices,
                             workoutExtTemplateChoices: workoutExtTemplateChoices,
-                            watchfaceTemplateChoices: watchfaceTemplateChoices
+                            watchfaceTemplateChoices: watchfaceTemplateChoices,
                         })];
                 case 1:
                     answer = _c.sent();
@@ -230,10 +258,14 @@ var createX = function (cwdPath, args, func, beforeFiles) {
                     answer.workDir = workDir;
                     choosePkg = (function (appType) {
                         switch (appType.toLowerCase()) {
-                            case AppType.APP: return appTemplateChoices[answer.OSVersion][answer.template];
-                            case AppType.WORKOUT_EXTENSION: return workoutExtTemplateChoices[answer.OSVersion][answer.template];
-                            case AppType.WATCHFACE: return watchfaceTemplateChoices[answer.OSVersion][answer.template];
-                            default: return appTemplateChoices[answer.OSVersion][answer.template];
+                            case AppType.APP:
+                                return appTemplateChoices[answer.OSVersion][answer.template];
+                            case AppType.WORKOUT_EXTENSION:
+                                return workoutExtTemplateChoices[answer.OSVersion][answer.template];
+                            case AppType.WATCHFACE:
+                                return watchfaceTemplateChoices[answer.OSVersion][answer.template];
+                            default:
+                                return appTemplateChoices[answer.OSVersion][answer.template];
                         }
                     })(answer.appType || AppType.APP);
                     index_1.logger.info('fetching template...');
@@ -254,15 +286,15 @@ var createX = function (cwdPath, args, func, beforeFiles) {
                     _c.sent();
                     rd.eachFileSync(workDir, function (file) {
                         if ((0, lodash_1.endsWith)(file, '.DS_Store')) {
-                            fs_extra_1["default"].remove(file);
+                            fs_extra_1.default.remove(file);
                         }
                         else {
                             var shortFile = file.replace(cwdPath, '');
                             if (beforeFiles.includes(file)) {
-                                index_1.logger.log(chalk_1["default"].yellow("  ".concat(chalk_1["default"].bold('replace'), "  ")), shortFile);
+                                index_1.logger.log(chalk_1.default.yellow("  ".concat(chalk_1.default.bold('replace'), "  ")), shortFile);
                             }
                             else {
-                                index_1.logger.log(chalk_1["default"].green("   ".concat(chalk_1["default"].bold('create'), "  ")), shortFile);
+                                index_1.logger.log(chalk_1.default.green("   ".concat(chalk_1.default.bold('create'), "  ")), shortFile);
                             }
                         }
                     });
@@ -272,7 +304,7 @@ var createX = function (cwdPath, args, func, beforeFiles) {
                     return [4, projectPreInstall(workDir)];
                 case 4:
                     _c.sent();
-                    index_1.logger.log(chalk_1["default"].hex('#DB8C41')(zeppFontIcon));
+                    index_1.logger.log(chalk_1.default.hex('#DB8C41')(zeppFontIcon));
                     index_1.logger.log("I'm all done. Now you can start your application.");
                     return [2, [
                             "Project created successfully by \"".concat(choosePkg.name, "\" template."),