@zeppos/zeus-cli 1.1.9 → 1.2.0

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

@@ -86,23 +86,39 @@ 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 projectPreInstall = function (dir) {
+    return new Promise(function (resolve) {
+        var execInstall = (0, child_process_1.spawn)('npm', ['install'], {
+            stdio: 'pipe',
+            cwd: dir
+        });
+        execInstall.stdout.pipe(process.stdout);
+        execInstall.on('close', function (code) {
+            resolve(code);
+        });
+    });
+};
 var createX = function (cwdPath, args, func, beforeFiles) {
     if (beforeFiles === void 0) { beforeFiles = []; }
     return __awaiter(void 0, void 0, void 0, function () {
-        var cmd, _a, projectName, workDir, TEMPLATE_DIR, localTemplates, localChoices, watchfaceTemplateChoices, appTemplateChoices, env, generatorMate, generatorMateKeys, answer, choosePkg;
+        var cmd, _a, projectName, workDir, V1_TEMPLATE_DIR, V2_TEMPLATE_DIR, localTemplates, localChoices, watchfaceTemplateChoices, appTemplateChoices, templatesInit, env, generatorMate, generatorMateKeys, choicesValueFormat, answer, choosePkg;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
                     cmd = args._[0], _a = args.projectName, projectName = _a === void 0 ? '' : _a;
                     workDir = cwdPath;
-                    TEMPLATE_DIR = (0, path_1.resolve)(__dirname, '../../public/template');
-                    localTemplates = (0, fs_1.readdirSync)(TEMPLATE_DIR);
-                    localChoices = [];
-                    watchfaceTemplateChoices = [];
-                    appTemplateChoices = [];
-                    if (!(0, lodash_1.isEmpty)(localTemplates)) {
-                        localTemplates.forEach(function (dirName) {
-                            var dirPath = "".concat(TEMPLATE_DIR, "/").concat(dirName);
+                    V1_TEMPLATE_DIR = (0, path_1.resolve)(__dirname, '../../public/template/v1');
+                    V2_TEMPLATE_DIR = (0, path_1.resolve)(__dirname, '../../public/template/v2');
+                    localTemplates = {
+                        v1: (0, fs_1.readdirSync)(V1_TEMPLATE_DIR),
+                        v2: (0, fs_1.readdirSync)(V2_TEMPLATE_DIR)
+                    };
+                    localChoices = { v1: [], v2: [] };
+                    watchfaceTemplateChoices = { v1: [], v2: [] };
+                    appTemplateChoices = { v1: [], v2: [] };
+                    templatesInit = function (os, dir) {
+                        localTemplates[os].forEach(function (dirName) {
+                            var dirPath = "".concat(dir, "/").concat(dirName);
                             var dirStat = (0, fs_1.lstatSync)(dirPath);
                             if (dirStat.isDirectory()) {
                                 var chooseItem = {
@@ -111,27 +127,31 @@ var createX = function (cwdPath, args, func, beforeFiles) {
                                     type: AppSourceType.LOCAL
                                 };
                                 if (dirName === 'empty') {
-                                    localChoices.unshift(Object.assign(chooseItem, {
+                                    localChoices[os].unshift(Object.assign(chooseItem, {
                                         copyType: TemplateCopyType.EDIT
                                     }));
-                                    watchfaceTemplateChoices.unshift(Object.assign(chooseItem, {
+                                    watchfaceTemplateChoices[os].unshift(Object.assign(chooseItem, {
                                         copyType: TemplateCopyType.EDIT
                                     }));
-                                    appTemplateChoices.unshift(Object.assign(chooseItem, {
+                                    appTemplateChoices[os].unshift(Object.assign(chooseItem, {
                                         copyType: TemplateCopyType.EDIT
                                     }));
                                 }
+                                else if (['hello-world', 'calories', 'fetch-api', 'todo-list'].includes(dirName)) {
+                                    appTemplateChoices[os].push(chooseItem);
+                                }
+                                else if (dirName === 'timer') {
+                                    watchfaceTemplateChoices[os].push(chooseItem);
+                                }
                                 else {
-                                    if (dirName === 'hello-world') {
-                                        appTemplateChoices.push(chooseItem);
-                                    }
-                                    if (dirName === 'timer') {
-                                        watchfaceTemplateChoices.push(chooseItem);
-                                    }
-                                    localChoices.push(chooseItem);
+                                    localChoices[os].push(chooseItem);
                                 }
                             }
                         });
+                    };
+                    if (!(0, lodash_1.isEmpty)(localTemplates)) {
+                        templatesInit('v1', V1_TEMPLATE_DIR);
+                        templatesInit('v2', V2_TEMPLATE_DIR);
                     }
                     env = yeoman_environment_1["default"].createEnv();
                     env.lookup();
@@ -140,36 +160,51 @@ var createX = function (cwdPath, args, func, beforeFiles) {
                     if (generatorMateKeys.length) {
                         generatorMateKeys.forEach(function (name) {
                             if (/:(app|all)$/.test(name)) {
-                                localChoices.push({
+                                localChoices['v1'].push({
+                                    name: name,
+                                    type: AppSourceType.YEOMAN
+                                });
+                                appTemplateChoices['v1'].push({
                                     name: name,
                                     type: AppSourceType.YEOMAN
                                 });
-                                appTemplateChoices.push({
+                                watchfaceTemplateChoices['v1'].push({
                                     name: name,
                                     type: AppSourceType.YEOMAN
                                 });
-                                watchfaceTemplateChoices.push({
+                                localChoices['v2'].push({
+                                    name: name,
+                                    type: AppSourceType.YEOMAN
+                                });
+                                appTemplateChoices['v2'].push({
+                                    name: name,
+                                    type: AppSourceType.YEOMAN
+                                });
+                                watchfaceTemplateChoices['v2'].push({
                                     name: name,
                                     type: AppSourceType.YEOMAN
                                 });
                             }
                         });
                     }
-                    localChoices.map(function (val, index) {
-                        val.value = index;
-                    });
-                    appTemplateChoices.map(function (val, index) {
-                        val.value = index;
-                    });
-                    watchfaceTemplateChoices.map(function (val, index) {
-                        val.value = index;
-                    });
-                    return [4, func(args, { appTemplateChoices: appTemplateChoices, watchfaceTemplateChoices: watchfaceTemplateChoices })];
+                    choicesValueFormat = function (arr) {
+                        arr['v1'].map(function (val, index) { return (val.value = index); });
+                        arr['v2'].map(function (val, index) { return (val.value = index); });
+                    };
+                    choicesValueFormat(localChoices);
+                    choicesValueFormat(appTemplateChoices);
+                    choicesValueFormat(watchfaceTemplateChoices);
+                    return [4, func(args, {
+                            appTemplateChoices: appTemplateChoices,
+                            watchfaceTemplateChoices: watchfaceTemplateChoices
+                        })];
                 case 1:
                     answer = _b.sent();
                     answer.appType = answer.appType || AppType.APP;
                     answer.workDir = workDir;
-                    choosePkg = answer.appType.toLowerCase() === AppType.APP ? appTemplateChoices[answer.template] : watchfaceTemplateChoices[answer.template];
+                    choosePkg = answer.appType.toLowerCase() === AppType.APP
+                        ? appTemplateChoices[answer.OSVersion][answer.template]
+                        : watchfaceTemplateChoices[answer.OSVersion][answer.template];
                     index_1.logger.info('fetching template...');
                     return [4, (0, index_1.sleep)(100)];
                 case 2:
@@ -202,12 +237,15 @@ var createX = function (cwdPath, args, func, beforeFiles) {
                     });
                     index_1.logger.log('\n');
                     index_1.logger.success("Project created successfully by \"".concat(choosePkg.name, "\" template."));
-                    (0, child_process_1.exec)('npm install', { cwd: workDir });
+                    index_1.logger.log('Start installing dependency packages.');
+                    return [4, projectPreInstall(workDir)];
+                case 4:
+                    _b.sent();
                     index_1.logger.log(chalk_1["default"].hex('#DB8C41')(zeppFontIcon));
-                    index_1.logger.log('I\'m all done. Now you can start your application.');
+                    index_1.logger.log("I'm all done. Now you can start your application.");
                     return [2, [
                             "Project created successfully by \"".concat(choosePkg.name, "\" template."),
-                            'I\'m all done. Now you can start your application.'
+                            "I'm all done. Now you can start your application.",
                         ]];
             }
         });

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

@@ -59,12 +59,12 @@ var fs_1 = __importDefault(require("fs"));
 var index_1 = require("../../index");
 var TemplateCopyType = index_1.config.TemplateCopyType, AppType = index_1.config.AppType, deviceTargets = index_1.config.deviceTargets;
 var createLocalApp = function (args) { return __awaiter(void 0, void 0, void 0, function () {
-    var workDir, templateInfo, withAppSide, withSettings, buildTargets, appType, appJsonPath, appJson, appID, defaultTarget, targets, defaultWatchFaceConfig, defaultAssetsPath_1;
+    var workDir, templateInfo, OSVersion, withAppSide, withSettings, buildTargets, appType, appJsonPath, appJson, appID, defaultTarget, targets, defaultWatchFaceConfig, defaultAssetsPath_1;
     return __generator(this, function (_a) {
-        workDir = args.workDir, templateInfo = args.templateInfo, withAppSide = args.withAppSide, withSettings = args.withSettings, buildTargets = args.buildTargets, appType = args.appType;
+        workDir = args.workDir, templateInfo = args.templateInfo, OSVersion = args.OSVersion, withAppSide = args.withAppSide, withSettings = args.withSettings, buildTargets = args.buildTargets, appType = args.appType;
         fs_extra_1["default"].copySync(templateInfo.path, workDir);
-        fs_extra_1["default"].copySync((0, path_1.resolve)(__dirname, '../../public/template/jsconfig.json'), "".concat(workDir, "/jsconfig.json"));
-        fs_extra_1["default"].copySync((0, path_1.resolve)(__dirname, '../../public/template/_package.json'), "".concat(workDir, "/package.json"));
+        fs_extra_1["default"].copySync((0, path_1.resolve)(__dirname, "../../public/template/".concat(OSVersion, "/jsconfig.json")), "".concat(workDir, "/jsconfig.json"));
+        fs_extra_1["default"].copySync((0, path_1.resolve)(__dirname, "../../public/template/".concat(OSVersion, "/_package.json")), "".concat(workDir, "/package.json"));
         fs_1["default"].writeFileSync("".concat(workDir, "/global.d.ts"), '/// <reference path="node_modules/@zeppos/device-types/index.d.ts" />');
         appJsonPath = (0, path_1.resolve)(workDir, './app.json');
         appJson = fs_extra_1["default"].readJsonSync(appJsonPath);

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

@@ -48,7 +48,6 @@ var lodash_1 = __importDefault(require("lodash"));
 var get_port_1 = __importDefault(require("get-port"));
 var stoppable_1 = __importDefault(require("stoppable"));
 var index_1 = require("../index");
-var hm_analytics_1 = require("../hm-analytics");
 var _a = index_1.config.getLocalConfig(), loginConfig = _a.loginConfig, loginStorageKey = _a.loginStorageKey;
 var loginCallbackServer = function (cb) { return __awaiter(void 0, void 0, void 0, function () {
     var callbackPath, port, server;
@@ -133,15 +132,12 @@ var login = function (args) { return __awaiter(void 0, void 0, void 0, function
                 index_1.logger.error('Unknown error, the default browser failed to open the login page.');
                 process.exit(1);
                 return [3, 5];
-            case 5:
-                (0, hm_analytics_1.HM_Analytics)('ZEPP_CLI_LOGIN_C');
-                return [2, loginPromise];
+            case 5: return [2, loginPromise];
         }
     });
 }); };
 exports.login = login;
 var logout = function () {
-    (0, hm_analytics_1.HM_Analytics)('ZEPP_CLI_LOGOUT_C');
     index_1.globalStorage.deleteStorage('____login');
     index_1.logger.success('Logged out');
 };

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

@@ -99,7 +99,6 @@ var status = function (args) { return __awaiter(void 0, void 0, void 0, function
                 message3 = "simulator port: ".concat(chalk_1["default"].yellow(simulatorPort));
                 index_1.logger.log(message3);
                 loggerMessage.push(message3);
-                (0, index_1.HM_Analytics)('ZEPP_CLI_STATUS_C');
                 return [2, loggerMessage];
         }
     });

package/private-modules/zeppos-app-utils/dist/public/template/v2/_package.json

@@ -0,0 +1,14 @@
+{
+  "name": "empty",
+  "version": "1.0.0",
+  "description": "",
+  "main": "app.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@zeppos/device-types": "^2.0.0"
+  }
+}

package/private-modules/zeppos-app-utils/dist/public/template/v2/calories/app.js

@@ -0,0 +1,28 @@
+import { log as Logger } from '@zos/utils'
+import LocalStorage from './utils/storage'
+
+const logger = Logger.getLogger('calories-app')
+const fileName = 'calorie_data.txt'
+
+App({
+  globalData: {
+    foodType: 'chocolate',
+    localStorage: null
+  },
+  onCreate() {
+    try {
+      this.globalData.localStorage = new LocalStorage(fileName)
+      const { foodType = 'chocolate' } = this.globalData.localStorage.get()
+      this.globalData.foodType = foodType
+
+    } catch (e) {
+      logger.log('--->e:', e)
+    }
+  },
+
+  onDestroy() {
+    this.globalData.localStorage.set({
+      foodType: getApp()._options.globalData.foodType
+    })
+  },
+})

package/private-modules/zeppos-app-utils/dist/public/template/v2/calories/app.json

@@ -0,0 +1,56 @@
+{
+  "configVersion": "v2",
+  "app": {
+    "appId": 20001,
+    "appName": "Calories",
+    "appType": "app",
+    "version": {
+      "code": 1,
+      "name": "1.0.0"
+    },
+    "icon": "icon.png",
+    "vender": "zepp",
+    "description": "calories application"
+  },
+  "permissions": [
+    "data:os.device.info",
+    "device:os.local_storage",
+    "data:user.hd.calorie"
+  ],
+  "runtime": {
+    "apiVersion": {
+      "compatible": "2.0.0",
+      "target": "2.0.0",
+      "minVersion": "2.0.0"
+    }
+  },
+  "targets": {
+    "gts": {
+      "module": {
+        "page": {
+          "pages": [
+            "page/gts/index",
+            "page/gts/food-list"
+          ]
+        }
+      },
+      "platforms": [
+        {
+          "name": "gts4",
+          "deviceSource": 7995648
+        },
+        {
+          "name": "gts4-w",
+          "deviceSource": 7995649
+        }
+      ],
+      "designWidth": 390
+    }
+  },
+  "i18n": {
+    "en-US": {
+      "appName": "Calories"
+    }
+  },
+  "defaultLanguage": "en-US"
+}