@zeppos/zeus-cli 1.1.4 → 1.1.5

package/config/device.js

@@ -17,8 +17,8 @@ var DevicePlatformName;
     DevicePlatformName["VERONAW"] = "gtr3-w";
     DevicePlatformName["ZURICH"] = "gts3";
     DevicePlatformName["ZURICHW"] = "gts3-w";
-    DevicePlatformName["TEIDE"] = "teide";
-    DevicePlatformName["TEIDEW"] = "teide-w";
+    DevicePlatformName["TEIDE"] = "t-rex2";
+    DevicePlatformName["TEIDEW"] = "t-rex2-w";
 })(DevicePlatformName = exports.DevicePlatformName || (exports.DevicePlatformName = {}));
 var DeviceSource;
 (function (DeviceSource) {
@@ -92,7 +92,7 @@ exports.deviceTargets = (_a = {},
         }
     },
     _a[DeviceTarget.TEIDE] = {
-        deviceName: 'TEIDE',
+        deviceName: 'T-Rex2',
         platforms: [
             {
                 name: DevicePlatformName.TEIDE,

package/modules/build.js

@@ -67,7 +67,7 @@ var node_js_1 = require("@zeppos/zpm/lib/node.js");
 var fs_1 = __importDefault(require("fs"));
 var rd = __importStar(require("rd"));
 var path = __importStar(require("path"));
-var lodash_1 = __importDefault(require("lodash"));
+var lodash_1 = require("lodash");
 var fs_extra_1 = __importDefault(require("fs-extra"));
 var form_data_1 = __importDefault(require("form-data"));
 var qrcode_terminal_1 = __importDefault(require("qrcode-terminal"));
@@ -97,52 +97,66 @@ function handleExecCommandInErrorDir(mode) {
     logger.warn("This command needs to be executed in the root of the project.");
     process.exit(1);
 }
-function chooseBuildPackages(mode) {
+function chooseBuildPackages(mode, buildConfigOption) {
     if (mode === void 0) { mode = 'development'; }
+    if (buildConfigOption === void 0) { buildConfigOption = {}; }
     return __awaiter(this, void 0, void 0, function () {
-        var targets, answers;
-        var _a, _b;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+        var targets, _a, promptTarget_1, answers;
+        var _b, _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
                 case 0:
                     if (!appJsonContent) {
                         handleExecCommandInErrorDir(mode);
                     }
-                    targets = Object.keys(lodash_1["default"].get(appJsonContent, 'targets', {}));
+                    targets = Object.keys((0, lodash_1.get)(appJsonContent, 'targets', {}));
                     if (!!targets.length) return [3, 1];
                     logger.error('Please set at least one package.');
                     process.exit(1);
                     return [3, 4];
                 case 1:
                     if (!(targets.length === 1)) return [3, 2];
-                    storage_1.globalStorage.set((_a = {}, _a[project_1.buildStorageKey.targetDeviceToBuild] = targets[0], _a));
+                    storage_1.globalStorage.set((_b = {}, _b[project_1.buildStorageKey.targetDeviceToBuild] = targets[0], _b));
                     return [2, [targets[0]]];
-                case 2: return [4, inquirer_1["default"].prompt([
-                        {
-                            name: 'target',
-                            type: 'list',
-                            when: function () { return mode !== BuildMode.PROD; },
-                            message: 'Which target would you like to preview?',
-                            choices: targets
-                        },
-                        {
-                            name: 'buildTargets',
-                            type: 'checkbox',
-                            when: function () { return mode === BuildMode.PROD; },
-                            choices: targets.map(function (item) { return ({
-                                name: item,
-                                value: item,
-                                checked: true
-                            }); }),
-                            message: 'Which targets would you like to build?'
-                        }
-                    ])];
+                case 2:
+                    _a = buildConfigOption.target, promptTarget_1 = _a === void 0 ? '' : _a;
+                    return [4, inquirer_1["default"].prompt([
+                            {
+                                name: 'target',
+                                type: 'list',
+                                when: function (args) {
+                                    var bool = targets.includes(promptTarget_1);
+                                    if (bool) {
+                                        args.target = promptTarget_1;
+                                    }
+                                    return mode !== BuildMode.PROD && !bool;
+                                },
+                                message: 'Which target would you like to preview?',
+                                choices: targets
+                            },
+                            {
+                                name: 'target',
+                                type: 'checkbox',
+                                when: function (args) {
+                                    var arr = typeof promptTarget_1 === 'string' ? (0, lodash_1.intersection)(targets, promptTarget_1.split(',')) : [];
+                                    var bool = !!arr.length;
+                                    if (bool) {
+                                        args.target = arr;
+                                    }
+                                    return mode === BuildMode.PROD && !bool;
+                                },
+                                choices: targets.map(function (item) { return ({
+                                    name: item,
+                                    value: item,
+                                    checked: true
+                                }); }),
+                                message: 'Which targets would you like to build?'
+                            }
+                        ])];
                 case 3:
-                    answers = _c.sent();
-                    if (BuildMode.PROD) {
-                        storage_1.globalStorage.set((_b = {}, _b[project_1.buildStorageKey.targetDeviceToBuild] = answers.target, _b));
-                    }
-                    return [2, mode !== BuildMode.PROD ? [answers.target] : answers.buildTargets];
+                    answers = _d.sent();
+                    storage_1.globalStorage.set((_c = {}, _c[project_1.buildStorageKey.targetDeviceToBuild] = answers.target, _c));
+                    return [2, typeof answers.target === 'string' ? [answers.target] : answers.target];
                 case 4: return [2];
             }
         });
@@ -159,7 +173,7 @@ var build = function (mode, packages, buildConfigOption) {
                 case 0:
                     workspace = path.resolve('./');
                     if (!!packages.length) return [3, 2];
-                    return [4, chooseBuildPackages(mode)];
+                    return [4, chooseBuildPackages(mode, buildConfigOption)];
                 case 1:
                     choosePackages = _b.sent();
                     if (!choosePackages || !choosePackages.length) {
@@ -228,9 +242,9 @@ var build = function (mode, packages, buildConfigOption) {
     });
 };
 exports.build = build;
-var buildDev = function (packages) {
+var buildDev = function (args, packages) {
     (0, hm_analytics_1.HM_Analytics)('ZEPP_CLI_DEV_C');
-    return (0, exports.build)(BuildMode.DEV, packages);
+    return (0, exports.build)(BuildMode.DEV, packages, args);
 };
 exports.buildDev = buildDev;
 var buildProd = function (args) { return __awaiter(void 0, void 0, void 0, function () {
@@ -262,7 +276,7 @@ var buildPreview = function (args, cb) { return __awaiter(void 0, void 0, void 0
                 return [4, (0, exports.build)(buildMode, [], args)];
             case 1:
                 buildInfo = _b.sent();
-                appType = lodash_1["default"].get(appJsonContent, 'app.appType');
+                appType = (0, lodash_1.get)(appJsonContent, 'app.appType');
                 isWatchFaceProject = appType === project_1.AppType.WATCHFACE;
                 logger.info('getting package...');
                 form = new form_data_1["default"]();
@@ -312,8 +326,9 @@ var buildPreview = function (args, cb) { return __awaiter(void 0, void 0, void 0
                                 url = "".concat(protocol, "://").concat(_subRegionalHost, "/custom/tools/app-dial/download/").concat(code);
                                 if (protocol && code) {
                                     logger.info('Generating preview qrcode...');
-                                    logger.success('Below within two hours,please use Zepp APP to scan the qrcode below to preview your app.');
+                                    logger.success('Please use Zepp APP to scan the following qrcode to preview your application within two hours.');
                                     qrcode_terminal_1["default"].generate(url, { small: true });
+                                    storage_1.globalStorage.set({ ____preview_url: url });
                                 }
                                 else {
                                     logger.error('Generating preview qrcode failed, please check your network.');
@@ -328,7 +343,7 @@ var buildPreview = function (args, cb) { return __awaiter(void 0, void 0, void 0
                                 url = packageInfo;
                                 preview = '';
                                 if (isWatchFaceProject) {
-                                    downloadPackageReturn = lodash_1["default"].get(packageInfo, 'data', {});
+                                    downloadPackageReturn = (0, lodash_1.get)(packageInfo, 'data', {});
                                     url = downloadPackageReturn.url;
                                     preview = downloadPackageReturn.preview;
                                 }

package/modules/create/index.js

@@ -83,7 +83,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 exports.__esModule = true;
 exports.create = void 0;
-var lodash_1 = __importDefault(require("lodash"));
+var lodash_1 = require("lodash");
 var chalk_1 = __importDefault(require("chalk"));
 var inquirer_1 = __importDefault(require("inquirer"));
 var rd = __importStar(require("rd"));
@@ -102,11 +102,11 @@ var sleep_1 = require("../../utils/sleep");
 var hm_analytics_1 = require("../../utils/hm-analytics");
 var TEMPLATE_DIR = (0, path_1.resolve)(__dirname, '../../public/template');
 var create = function (args) { return __awaiter(void 0, void 0, void 0, function () {
-    var cmd, _a, projectName, cwdPath, beforeFiles, workDir, localTemplates, localChoices, watchfaceTemplateChoices, appTemplateChoices, env, generatorMate, generatorMateKeys, answer, choosePkg;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
+    var cmd, _a, projectName, _b, promptAppType, _c, promptTemplate, _d, promptWithAppSide, _e, promptWithSettings, _f, promptBuildTargets, cwdPath, beforeFiles, workDir, localTemplates, localChoices, watchfaceTemplateChoices, appTemplateChoices, env, generatorMate, generatorMateKeys, answer, choosePkg;
+    return __generator(this, function (_g) {
+        switch (_g.label) {
             case 0:
-                cmd = args._[0], _a = args.projectName, projectName = _a === void 0 ? '' : _a;
+                cmd = args._[0], _a = args.projectName, projectName = _a === void 0 ? '' : _a, _b = args.appType, promptAppType = _b === void 0 ? '' : _b, _c = args.template, promptTemplate = _c === void 0 ? '' : _c, _d = args.withAppSide, promptWithAppSide = _d === void 0 ? false : _d, _e = args.withSettings, promptWithSettings = _e === void 0 ? false : _e, _f = args.buildTargets, promptBuildTargets = _f === void 0 ? [] : _f;
                 cwdPath = (0, path_1.resolve)('./');
                 beforeFiles = [];
                 workDir = cwdPath;
@@ -136,13 +136,13 @@ var create = function (args) { return __awaiter(void 0, void 0, void 0, function
                 localChoices = [];
                 watchfaceTemplateChoices = [];
                 appTemplateChoices = [];
-                if (!lodash_1["default"].isEmpty(localTemplates)) {
+                if (!(0, lodash_1.isEmpty)(localTemplates)) {
                     localTemplates.forEach(function (dirName) {
                         var dirPath = "".concat(TEMPLATE_DIR, "/").concat(dirName);
                         var dirStat = (0, fs_1.lstatSync)(dirPath);
                         if (dirStat.isDirectory()) {
                             var chooseItem = {
-                                name: lodash_1["default"].startCase(dirName),
+                                name: (0, lodash_1.startCase)(dirName),
                                 path: dirPath,
                                 type: project_1.AppSourceType.LOCAL
                             };
@@ -207,45 +207,92 @@ var create = function (args) { return __awaiter(void 0, void 0, void 0, function
                         {
                             name: 'appType',
                             type: 'list',
+                            when: function (args) {
+                                var bool = !promptAppType || !Object.values(project_1.AppType).includes(promptAppType);
+                                if (!bool) {
+                                    args.appType = promptAppType.toUpperCase();
+                                }
+                                return bool;
+                            },
                             message: 'What type of application do you want to create?',
                             choices: Object.keys(project_1.AppType)
                         },
                         {
                             name: 'template',
                             type: 'list',
-                            when: function (args) { return args.appType.toLowerCase() === project_1.AppType.APP; },
-                            message: 'Which template do you want to use?',
+                            when: function (args) {
+                                var isApp = args.appType.toLowerCase() === project_1.AppType.APP;
+                                var objMap = appTemplateChoices.find(function (val) {
+                                    var name = val.name === 'Hello World' ? 'Hello_World' : val.name;
+                                    return name === promptTemplate;
+                                });
+                                if (isApp && objMap) {
+                                    args.template = objMap.value;
+                                }
+                                return isApp && !objMap;
+                            },
+                            message: 'Which app template do you want to use?',
                             choices: __spreadArray([
                                 new inquirer_1["default"].Separator(),
-                                new inquirer_1["default"].Separator('Choose a template')
+                                new inquirer_1["default"].Separator('Choose a app template')
                             ], appTemplateChoices, true)
                         },
                         {
                             name: 'template',
                             type: 'list',
-                            when: function (args) { return args.appType.toLowerCase() === project_1.AppType.WATCHFACE; },
-                            message: 'Which template do you want to use?',
+                            when: function (args) {
+                                var isWatchFace = args.appType.toLowerCase() === project_1.AppType.WATCHFACE;
+                                var objMap = watchfaceTemplateChoices.find(function (val) { return val.name === promptTemplate; });
+                                if (isWatchFace && objMap) {
+                                    args.template = objMap.value;
+                                }
+                                return isWatchFace && !objMap;
+                            },
+                            message: 'Which watchface template do you want to use?',
                             choices: __spreadArray([
                                 new inquirer_1["default"].Separator(),
-                                new inquirer_1["default"].Separator('Choose a template')
+                                new inquirer_1["default"].Separator('Choose a watchface template')
                             ], watchfaceTemplateChoices, true)
                         },
                         {
                             name: 'withAppSide',
                             type: 'confirm',
-                            when: function (args) { return args.template === 0 && args.appType.toLowerCase() === project_1.AppType.APP; },
+                            when: function (args) {
+                                var isApp = args.appType.toLowerCase() === project_1.AppType.APP;
+                                var isEmpty = args.template === 0;
+                                if (isApp && isEmpty && promptWithAppSide) {
+                                    args.withAppSide = promptWithAppSide === 'no' ? false : true;
+                                    return false;
+                                }
+                                return isApp && isEmpty;
+                            },
                             message: 'Should this application contain a app-side component?'
                         },
                         {
                             name: 'withSettings',
                             type: 'confirm',
-                            when: function (args) { return args.withAppSide; },
+                            when: function (args) {
+                                var withAppSide = args.withAppSide;
+                                if (withAppSide && promptWithSettings) {
+                                    args.withSettings = promptWithSettings === 'no' ? false : true;
+                                    return false;
+                                }
+                                return withAppSide;
+                            },
                             message: 'Should this application contain a settings component?'
                         },
                         {
                             name: 'buildTargets',
                             type: 'checkbox',
-                            when: function (args) { return args.template === 0; },
+                            when: function (args) {
+                                var bool = args.template === 0;
+                                var tarArr = typeof promptBuildTargets === 'string' ? (0, lodash_1.intersection)(Object.keys(device_1.deviceTargets), promptBuildTargets.split(',')) : [];
+                                if (bool && tarArr.length) {
+                                    args.buildTargets = tarArr;
+                                    return false;
+                                }
+                                return bool;
+                            },
                             choices: Object.keys(device_1.deviceTargets).map(function (platform) { return ({
                                 name: device_1.deviceTargets[platform].deviceName,
                                 value: platform,
@@ -256,28 +303,28 @@ var create = function (args) { return __awaiter(void 0, void 0, void 0, function
                         },
                     ])];
             case 1:
-                answer = _b.sent();
+                answer = _g.sent();
                 answer.appType = answer.appType || project_1.AppType.APP;
                 answer.workDir = workDir;
                 choosePkg = answer.appType.toLowerCase() === project_1.AppType.APP ? appTemplateChoices[answer.template] : watchfaceTemplateChoices[answer.template];
                 logger.info('fetching template...');
                 return [4, (0, sleep_1.sleep)(100)];
             case 2:
-                _b.sent();
+                _g.sent();
                 if (choosePkg.type === project_1.AppSourceType.YEOMAN) {
-                    logger.info("".concat(lodash_1["default"].upperFirst(cmd), " application using yeoman template \"").concat(choosePkg.name, "\"."));
+                    logger.info("".concat((0, lodash_1.upperFirst)(cmd), " application using yeoman template \"").concat(choosePkg.name, "\"."));
                     (0, yeoman_app_1.createYeomanApp)(__assign(__assign({}, answer), { env: env, templateInfo: generatorMate[choosePkg.name] }));
                 }
                 else {
-                    logger.info("".concat(lodash_1["default"].upperFirst(cmd), " application using local template \"").concat(choosePkg.name, "\"."));
+                    logger.info("".concat((0, lodash_1.upperFirst)(cmd), " application using local template \"").concat(choosePkg.name, "\"."));
                     (0, local_app_1.createLocalApp)(__assign(__assign({}, answer), { templateInfo: choosePkg }));
                 }
                 logger.log('\n');
                 return [4, (0, sleep_1.sleep)(50)];
             case 3:
-                _b.sent();
+                _g.sent();
                 rd.eachFileSync(workDir, function (file) {
-                    if (lodash_1["default"].endsWith(file, '.DS_Store')) {
+                    if ((0, lodash_1.endsWith)(file, '.DS_Store')) {
                         fs_extra_1["default"].remove(file);
                     }
                     else {
@@ -298,11 +345,11 @@ var create = function (args) { return __awaiter(void 0, void 0, void 0, function
                 shell.exec('npm install');
                 return [4, (0, sleep_1.sleep)(300)];
             case 4:
-                _b.sent();
+                _g.sent();
                 logger.log(chalk_1["default"].hex('#DB8C41')(font_icon_1["default"]));
                 return [4, (0, sleep_1.sleep)(800)];
             case 5:
-                _b.sent();
+                _g.sent();
                 logger.log('I\'m all done. Now you can start your application.');
                 return [2];
         }

package/modules/run.js

@@ -79,37 +79,57 @@ var project_1 = require("../config/project");
 exports.DEFAULT_HOST = '127.0.0.1';
 exports.DEFAULT_PORT = '7650';
 var run = function (args) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, _b, simulatorHost, _c, _d, simulatorPort, answer, hasStarted, packages, simulatorWebSocketURL, simulator, refreshSimulator, gitignorePath, gitignore, ignored;
-    var _e;
-    return __generator(this, function (_f) {
-        switch (_f.label) {
+    var simulatorHost, simulatorPort, _a, promptSimulatorHost, _b, promptSimulatorPort, answer, hasStarted, packages, simulatorWebSocketURL, simulator, refreshSimulator, gitignorePath, gitignore, ignored;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
-                _a = storage_1.instanceStorage.getStorage(), _b = project_1.simulatorStorageKey.simulatorHost, simulatorHost = _a[_b], _c = project_1.simulatorStorageKey.simulatorPort, _d = _a[_c], simulatorPort = _d === void 0 ? exports.DEFAULT_PORT : _d;
-                if (!!simulatorHost) return [3, 2];
+                fs_extra_1["default"].readJSONSync(path.resolve('./app.json'), { throws: false });
+                simulatorHost = '';
+                simulatorPort = '';
+                _a = args.simulatorHost, promptSimulatorHost = _a === void 0 ? '' : _a, _b = args.simulatorPort, promptSimulatorPort = _b === void 0 ? exports.DEFAULT_PORT : _b;
+                if (!promptSimulatorHost) {
+                    simulatorHost = storage_1.instanceStorage.getStorage()[project_1.simulatorStorageKey.simulatorHost];
+                    simulatorPort = storage_1.instanceStorage.getStorage()[project_1.simulatorStorageKey.simulatorPort] || exports.DEFAULT_PORT;
+                }
                 return [4, inquirer_1["default"].prompt([
                         {
                             name: 'host',
                             type: 'input',
+                            when: function (args) {
+                                if (promptSimulatorHost) {
+                                    args.host = promptSimulatorHost;
+                                }
+                                return !promptSimulatorHost && !simulatorHost;
+                            },
+                            "default": exports.DEFAULT_HOST,
                             message: "simulator host (".concat(exports.DEFAULT_HOST, "):")
                         },
                         {
                             name: 'port',
                             type: 'input',
+                            when: function (args) {
+                                if (promptSimulatorPort) {
+                                    args.port = promptSimulatorPort;
+                                }
+                                return !promptSimulatorPort && !simulatorPort;
+                            },
+                            "default": exports.DEFAULT_PORT,
                             message: "simulator port (".concat(exports.DEFAULT_PORT, "):")
                         }
                     ])];
             case 1:
-                answer = _f.sent();
-                storage_1.globalStorage.set((_e = {},
-                    _e[project_1.simulatorStorageKey.simulatorHost] = answer.host || exports.DEFAULT_HOST,
-                    _e[project_1.simulatorStorageKey.simulatorPort] = answer.port || exports.DEFAULT_PORT,
-                    _e));
-                _f.label = 2;
-            case 2:
+                answer = _d.sent();
+                if (!simulatorHost) {
+                    storage_1.globalStorage.set((_c = {},
+                        _c[project_1.simulatorStorageKey.simulatorHost] = answer.host || exports.DEFAULT_HOST,
+                        _c[project_1.simulatorStorageKey.simulatorPort] = answer.port || exports.DEFAULT_PORT,
+                        _c));
+                }
                 hasStarted = false;
-                return [4, (0, build_1.chooseBuildPackages)()];
-            case 3:
-                packages = _f.sent();
+                return [4, (0, build_1.chooseBuildPackages)('development', args)];
+            case 2:
+                packages = _d.sent();
                 simulatorWebSocketURL = "http://".concat(simulatorHost, ":").concat(simulatorPort);
                 simulator = new simulator_1.Simulator(simulatorWebSocketURL);
                 refreshSimulator = lodash_1["default"].debounce(function () { return __awaiter(void 0, void 0, void 0, function () {
@@ -118,7 +138,7 @@ var run = function (args) { return __awaiter(void 0, void 0, void 0, function ()
                         switch (_b.label) {
                             case 0:
                                 logger.info('rebuilding...');
-                                return [4, (0, build_1.buildDev)(packages)];
+                                return [4, (0, build_1.buildDev)(args, packages)];
                             case 1:
                                 zpkBuffer = _b.sent();
                                 if (zpkBuffer) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeppos/zeus-cli",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "zeus mini-program tools",
   "main": "index.js",
   "author": "zepp",

package/public/template/hello-world/app.json

@@ -84,6 +84,14 @@
         {
           "name": "gtr3-w",
           "deviceSource": 227
+        },
+        {
+          "name": "t-rex2",
+          "deviceSource": 418
+        },
+        {
+          "name": "t-rex2-w",
+          "deviceSource": 419
         }
       ],
       "designWidth": 454
@@ -120,6 +128,39 @@
         }
       ],
       "designWidth": 390
+    },
+    "teide": {
+      "module": {
+        "page": {
+          "pages": [
+            "page/t-rex2/home/index.page"
+          ],
+          "window": {
+            "navigationBarBackgroundColor": "#ffffff",
+            "navigationBarTextStyle": "black",
+            "navigationBarTitleText": "Hello World",
+            "backgroundColor": "#eeeeee",
+            "backgroundTextStyle": "light"
+          }
+        },
+        "app-side": {
+          "path": "app-side/index"
+        },
+        "setting": {
+          "path": "setting/index"
+        }
+      },
+      "platforms": [
+        {
+          "name": "t-rex2",
+          "deviceSource": 418
+        },
+        {
+          "name": "t-rex2-w",
+          "deviceSource": 419
+        }
+      ],
+      "designWidth": 454
     }
   },
   "i18n": {