@zeppos/zeus-cli 1.2.2 → 1.3.0-beta.2

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

@@ -101,14 +101,16 @@ 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 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) {
+        var cmd, _a, projectName, _b, configVersion, workDir, templateDir, V1_TEMPLATE_DIR, V2_TEMPLATE_DIR, localTemplates, localChoices, watchfaceTemplateChoices, appTemplateChoices, templatesInit, env, generatorMate, generatorMateKeys, choicesValueFormat, answer, choosePkg;
+        return __generator(this, function (_c) {
+            switch (_c.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.configVersion, configVersion = _b === void 0 ? 'v2' : _b;
                     workDir = cwdPath;
-                    V1_TEMPLATE_DIR = (0, path_1.resolve)(__dirname, '../../public/template/v1');
-                    V2_TEMPLATE_DIR = (0, path_1.resolve)(__dirname, '../../public/template/v2');
+                    args.configVersion = (0, lodash_1.toLower)(configVersion);
+                    templateDir = (0, path_1.resolve)(__dirname, "../../public/template".concat((0, lodash_1.toLower)(configVersion) === 'v3' ? '/config-version-v3' : ''));
+                    V1_TEMPLATE_DIR = (0, path_1.resolve)(templateDir, './v1');
+                    V2_TEMPLATE_DIR = (0, path_1.resolve)(templateDir, './v2');
                     localTemplates = {
                         v1: (0, fs_1.readdirSync)(V1_TEMPLATE_DIR),
                         v2: (0, fs_1.readdirSync)(V2_TEMPLATE_DIR)
@@ -199,7 +201,7 @@ var createX = function (cwdPath, args, func, beforeFiles) {
                             watchfaceTemplateChoices: watchfaceTemplateChoices
                         })];
                 case 1:
-                    answer = _b.sent();
+                    answer = _c.sent();
                     answer.appType = answer.appType || AppType.APP;
                     answer.workDir = workDir;
                     choosePkg = answer.appType.toLowerCase() === AppType.APP
@@ -208,7 +210,7 @@ var createX = function (cwdPath, args, func, beforeFiles) {
                     index_1.logger.info('fetching template...');
                     return [4, (0, index_1.sleep)(100)];
                 case 2:
-                    _b.sent();
+                    _c.sent();
                     if (choosePkg.type === AppSourceType.YEOMAN) {
                         index_1.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] }));
@@ -220,7 +222,7 @@ var createX = function (cwdPath, args, func, beforeFiles) {
                     index_1.logger.log('\n');
                     return [4, (0, index_1.sleep)(50)];
                 case 3:
-                    _b.sent();
+                    _c.sent();
                     rd.eachFileSync(workDir, function (file) {
                         if ((0, lodash_1.endsWith)(file, '.DS_Store')) {
                             fs_extra_1["default"].remove(file);
@@ -240,7 +242,7 @@ var createX = function (cwdPath, args, func, beforeFiles) {
                     index_1.logger.log('Start installing dependency packages.');
                     return [4, projectPreInstall(workDir)];
                 case 4:
-                    _b.sent();
+                    _c.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.");
                     return [2, [

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, OSVersion, withAppSide, withSettings, buildTargets, appType, appJsonPath, appJson, appID, defaultTarget, targets, defaultWatchFaceConfig, defaultAssetsPath_1;
+    var workDir, templateInfo, withAppSide, withSettings, buildTargets, appType, appJsonPath, appJson, appID, defaultTarget, targets, defaultWatchFaceConfig, defaultAssetsPath_1;
     return __generator(this, function (_a) {
-        workDir = args.workDir, templateInfo = args.templateInfo, OSVersion = args.OSVersion, withAppSide = args.withAppSide, withSettings = args.withSettings, buildTargets = args.buildTargets, appType = args.appType;
+        workDir = args.workDir, templateInfo = args.templateInfo, 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/".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_extra_1["default"].copySync((0, path_1.resolve)(templateInfo.path, "../jsconfig.json"), "".concat(workDir, "/jsconfig.json"));
+        fs_extra_1["default"].copySync((0, path_1.resolve)(templateInfo.path, "../_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);
@@ -81,11 +81,11 @@ var createLocalApp = function (args) { return __awaiter(void 0, void 0, void 0,
         targets = {};
         if (appType.toLowerCase() === AppType.WATCHFACE) {
             defaultWatchFaceConfig = {
-                "path": "watchface/index",
-                "main": 1,
-                "editable": 0,
-                "lockscreen": 0,
-                "photoscreen": 0
+                path: 'watchface/index',
+                main: 1,
+                editable: 0,
+                lockscreen: 0,
+                photoscreen: 0
             };
             lodash_1["default"].set(appJson, 'app.appType', AppType.WATCHFACE);
             lodash_1["default"].set(appJson, 'app.description', 'empty watchface');

package/private-modules/zeppos-app-utils/dist/public/template/config-version-v3/v1/_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": "^1.0.0"
+  }
+}

package/private-modules/zeppos-app-utils/dist/public/template/config-version-v3/v1/empty/app-side/i18n/en-US.po

@@ -0,0 +1,2 @@
+msgid "example"
+msgstr "This is an example in app-side"

package/private-modules/zeppos-app-utils/dist/public/template/config-version-v3/v1/empty/app-side/index.js

@@ -0,0 +1,13 @@
+import { gettext } from 'i18n'
+
+AppSideService({
+  onInit() {
+    console.log(gettext('example'))
+  },
+
+  onRun() {
+  },
+
+  onDestroy() {
+  }
+})

package/private-modules/zeppos-app-utils/dist/public/template/config-version-v3/v1/empty/app.js

@@ -0,0 +1,10 @@
+App({
+  globalData: {},
+  onCreate(options) {
+    console.log('app on create invoke')
+  },
+
+  onDestroy(options) {
+    console.log('app on destroy invoke')
+  }
+})

package/private-modules/zeppos-app-utils/dist/public/template/config-version-v3/v1/empty/app.json

@@ -0,0 +1,59 @@
+{
+  "configVersion": "v3",
+  "app": {
+    "appId": 20000,
+    "appName": "Empty",
+    "appType": "app",
+    "version": {
+      "code": 1,
+      "name": "1.0.0"
+    },
+    "icon": "icon.png",
+    "vender": "zepp",
+    "description": "empty application"
+  },
+  "permissions": [
+    "data:os.device.info",
+    "device:os.local_storage",
+    "data:user.hd.calorie"
+  ],
+  "runtime": {
+    "apiVersion": {
+      "compatible": "1.0.0",
+      "target": "1.0.0",
+      "minVersion": "1.0"
+    }
+  },
+  "targets": {
+    "default": {
+      "module": {
+        "page": {
+          "pages": [
+            "page/index"
+          ]
+        },
+        "app-side": {
+          "path": "app-side/index"
+        },
+        "setting": {
+          "path": "setting/index"
+        }
+      },
+      "platforms": [
+        {
+          "st": "r"
+        },
+        {
+          "st": "s"
+        }
+      ],
+      "designWidth": 480
+    }
+  },
+  "i18n": {
+    "en-US": {
+      "appName": "Empty"
+    }
+  },
+  "defaultLanguage": "en-US"
+}

package/private-modules/zeppos-app-utils/dist/public/template/config-version-v3/v1/empty/page/i18n/en-US.po

@@ -0,0 +1,2 @@
+msgid "example"
+msgstr "This is an example in device"

package/private-modules/zeppos-app-utils/dist/public/template/config-version-v3/v1/empty/page/index.js

@@ -0,0 +1,7 @@
+import { gettext } from 'i18n'
+
+Page({
+  build() {
+    console.log(gettext('example'))
+  }
+})

package/private-modules/zeppos-app-utils/dist/public/template/config-version-v3/v1/empty/setting/i18n/en-US.po

@@ -0,0 +1,2 @@
+msgid "example"
+msgstr "This is an example in app-side"

package/private-modules/zeppos-app-utils/dist/public/template/config-version-v3/v1/empty/setting/index.js

@@ -0,0 +1,7 @@
+import { gettext } from 'i18n'
+
+AppSettingsPage({
+  build() {
+    console.log(gettext('example'))
+  }
+})

package/private-modules/zeppos-app-utils/dist/public/template/config-version-v3/v1/empty/watchface/index.js

@@ -0,0 +1,13 @@
+WatchFace({
+  onInit() {
+    console.log('index page.js on init invoke')
+  },
+
+  build() {
+    console.log('index page.js on build invoke')
+  },
+
+  onDestroy() {
+    console.log('index page.js on destroy invoke')
+  },
+})

package/private-modules/zeppos-app-utils/dist/public/template/config-version-v3/v1/hello-world/app-side/index.js

@@ -0,0 +1,11 @@
+AppSideService({
+  onInit() {
+    console.log('app side service invoke onInit')
+  },
+  onRun() {
+    console.log('app side service invoke onRun')
+  },
+  onDestroy() {
+    console.log('app side service invoke onDestroy')
+  }
+})

package/private-modules/zeppos-app-utils/dist/public/template/config-version-v3/v1/hello-world/app.js

@@ -0,0 +1,10 @@
+App({
+  globalData: {},
+  onCreate(options) {
+    console.log('app on create invoke')
+  },
+
+  onDestroy(options) {
+    console.log('app on destroy invoke')
+  }
+})

package/private-modules/zeppos-app-utils/dist/public/template/config-version-v3/v1/hello-world/app.json

@@ -0,0 +1,66 @@
+{
+  "configVersion": "v2",
+  "app": {
+    "appId": 20001,
+    "appName": "Hello World",
+    "appType": "app",
+    "version": {
+      "code": 1,
+      "name": "1.0.1"
+    },
+    "icon": "icon.png",
+    "vender": "zepp",
+    "description": "hello world app"
+  },
+  "permissions": [
+    "data:os.device.info",
+    "device:os.local_storage"
+  ],
+  "runtime": {
+    "apiVersion": {
+      "compatible": "1.0.0",
+      "target": "1.0.0",
+      "minVersion": "1.0"
+    }
+  },
+  "debug": false,
+  "targets": {
+    "gt": {
+      "module": {
+        "page": {
+          "pages": [
+            "page/gt/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": [
+        {
+          "st": "r"
+        },
+        {
+          "st": "s"
+        }
+      ],
+      "designWidth": 480
+    }
+  },
+  "i18n": {
+    "en-US": {
+      "appName": "Hello World"
+    }
+  },
+  "defaultLanguage": "en-US"
+}

package/private-modules/zeppos-app-utils/dist/public/template/config-version-v3/v1/hello-world/page/gtr3/home/index.page.js

@@ -0,0 +1,18 @@
+import { TEXT_STYLE } from './index.style'
+
+const logger = DeviceRuntimeCore.HmLogger.getLogger('helloworld')
+Page({
+  build() {
+    logger.debug('page build invoked')
+    hmUI.createWidget(hmUI.widget.TEXT, {
+      ...TEXT_STYLE,
+    })
+  },
+  onInit() {
+    logger.debug('page onInit invoked')
+  },
+
+  onDestroy() {
+    logger.debug('page onDestroy invoked')
+  },
+})

package/private-modules/zeppos-app-utils/dist/public/template/config-version-v3/v1/hello-world/page/gtr3/home/index.page.json

@@ -0,0 +1 @@
+{}

package/private-modules/zeppos-app-utils/dist/public/template/config-version-v3/v1/hello-world/page/gtr3/home/index.style.js

@@ -0,0 +1,15 @@
+import { gettext } from "i18n"
+
+export const { width: DEVICE_WIDTH, height: DEVICE_HEIGHT } = hmSetting.getDeviceInfo()
+
+export const TEXT_STYLE = {
+  text: gettext('appName'),
+  x: px(42),
+  y: px(200),
+  w: DEVICE_WIDTH - px(42) * 2,
+  h: px(100),
+  color: 0xffffff,
+  text_size: px(36),
+  align_h: hmUI.align.CENTER_H,
+  text_style: hmUI.text_style.WRAP,
+}

package/private-modules/zeppos-app-utils/dist/public/template/config-version-v3/v1/hello-world/page/gtr3-pro/home/index.page.js

@@ -0,0 +1,18 @@
+import { TEXT_STYLE } from './index.style'
+
+const logger = DeviceRuntimeCore.HmLogger.getLogger('helloworld')
+Page({
+  build() {
+    logger.debug('page build invoked')
+    hmUI.createWidget(hmUI.widget.TEXT, {
+      ...TEXT_STYLE,
+    })
+  },
+  onInit() {
+    logger.debug('page onInit invoked')
+  },
+
+  onDestroy() {
+    logger.debug('page onDestroy invoked')
+  },
+})

package/private-modules/zeppos-app-utils/dist/public/template/config-version-v3/v1/hello-world/page/gtr3-pro/home/index.page.json

@@ -0,0 +1 @@
+{}

package/private-modules/zeppos-app-utils/dist/public/template/config-version-v3/v1/hello-world/page/gtr3-pro/home/index.style.js

@@ -0,0 +1,15 @@
+import { gettext } from "i18n"
+
+export const { width: DEVICE_WIDTH, height: DEVICE_HEIGHT } = hmSetting.getDeviceInfo()
+
+export const TEXT_STYLE = {
+  text: gettext('appName'),
+  x: px(42),
+  y: px(200),
+  w: DEVICE_WIDTH - px(42) * 2,
+  h: px(100),
+  color: 0xffffff,
+  text_size: px(36),
+  align_h: hmUI.align.CENTER_H,
+  text_style: hmUI.text_style.WRAP,
+}

package/private-modules/zeppos-app-utils/dist/public/template/config-version-v3/v1/hello-world/page/gts3/home/index.page.js

@@ -0,0 +1,19 @@
+import { TEXT_STYLE } from './index.style'
+
+const logger = DeviceRuntimeCore.HmLogger.getLogger('helloworld')
+
+Page({
+  build() {
+    logger.debug('page build invoked')
+    hmUI.createWidget(hmUI.widget.TEXT, {
+      ...TEXT_STYLE,
+    })
+  },
+  onInit() {
+    logger.debug('page onInit invoked')
+  },
+
+  onDestroy() {
+    logger.debug('page onDestroy invoked')
+  },
+})

package/private-modules/zeppos-app-utils/dist/public/template/config-version-v3/v1/hello-world/page/gts3/home/index.page.json

@@ -0,0 +1 @@
+{}

package/private-modules/zeppos-app-utils/dist/public/template/config-version-v3/v1/hello-world/page/gts3/home/index.style.js

@@ -0,0 +1,15 @@
+import { gettext } from "i18n"
+
+export const { width: DEVICE_WIDTH, height: DEVICE_HEIGHT } = hmSetting.getDeviceInfo()
+
+export const TEXT_STYLE = {
+  text: gettext('appName'),
+  x: 42,
+  y: 200,
+  w: DEVICE_WIDTH - 42 * 2,
+  h: 100,
+  color: 0xffffff,
+  text_size: 36,
+  align_h: hmUI.align.CENTER_H,
+  text_style: hmUI.text_style.WRAP,
+}

package/private-modules/zeppos-app-utils/dist/public/template/config-version-v3/v1/hello-world/page/i18n/en-US.po

@@ -0,0 +1,3 @@
+
+msgid "appName"
+msgstr "HelloWorld"

package/private-modules/zeppos-app-utils/dist/public/template/config-version-v3/v1/hello-world/setting/i18n/en-US.po

@@ -0,0 +1,2 @@
+msgid "appName"
+msgstr "HelloWorld"

package/private-modules/zeppos-app-utils/dist/public/template/config-version-v3/v1/hello-world/setting/index.js

@@ -0,0 +1,5 @@
+AppSettingsPage({
+  build(props) {
+    return Section({})
+  },
+})

package/private-modules/zeppos-app-utils/dist/public/template/config-version-v3/v1/hello-world/utils/index.js

@@ -0,0 +1,3 @@
+export function assets(type) {
+  return (path) => type + '/' + path
+}

package/private-modules/zeppos-app-utils/dist/public/template/config-version-v3/v1/jsconfig.json

@@ -0,0 +1,14 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "target": "es6",
+    "checkJs": true
+  },
+  "exclude": [
+    "node_modules",
+    "**/node_modules/*"
+  ],
+  "files": [
+    "node_modules/@zeppos/device-types/index.d.ts"
+  ]
+}

package/private-modules/zeppos-app-utils/dist/public/template/config-version-v3/v1/timer/app.js

@@ -0,0 +1,7 @@
+import './shared/device-polyfill'
+
+App({
+  globalData: {},
+  onCreate(options) {},
+  onDestroy(options) {}
+})

package/private-modules/zeppos-app-utils/dist/public/template/config-version-v3/v1/timer/app.json

@@ -0,0 +1,51 @@
+{
+  "configVersion": "v3",
+  "app": {
+    "appId": 20001,
+    "appName": "Timer",
+    "appType": "watchface",
+    "version": {
+      "code": 1,
+      "name": "1.0"
+    },
+    "vender": "zepp",
+    "description": "Timer",
+    "icon": "images/preview.png"
+  },
+  "permissions": ["gps"],
+  "runtime": {
+    "apiVersion": {
+      "compatible": "1.0.0",
+      "target": "1.0.1",
+      "minVersion": "1.0.0"
+    }
+  },
+  "targets": {
+    "gtr-3-pro": {
+      "module": {
+        "watchface": {
+          "path": "watchface/gtr-3-pro/index",
+          "main": 1,
+          "editable": 1,
+          "lockscreen": 1
+        }
+      },
+      "platforms": [
+        {
+          "st": "r"
+        },
+        {
+          "st": "s"
+        }
+      ],
+      "designWidth": 480
+    }
+  },
+  "i18n": {
+    "en-US": {
+      "appName": "timer"
+    }
+  },
+  "defaultLanguage": "en-US",
+  "debug": false
+}