@zeppos/zeus-cli 1.3.0-beta.4 → 1.3.0-beta.6

package/modules/build.js

@@ -112,20 +112,27 @@ var checkAppJson = function () {
 var chooseBuildTargetsV3Config = function (mode, args) {
     if (mode === void 0) { mode = 'development'; }
     return __awaiter(void 0, void 0, void 0, function () {
-        var apiLevel, targetDevices, deviceNames, answers;
+        var apiLevel, platforms, usefulScreenTypes, usefulDeviceSource, targetDevices, deviceNames, answers;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     checkAppJson();
                     apiLevel = (0, lodash_1.get)(appJsonContent, 'runtime.apiVersion.minVersion', '1.0.0');
+                    platforms = Object.values((0, lodash_1.get)(appJsonContent, 'targets', {})).reduce(function (list, item) {
+                        return list.concat((0, lodash_1.get)(item, 'platforms', []));
+                    }, []);
+                    usefulScreenTypes = (0, lodash_1.compact)(Object.keys((0, lodash_1.groupBy)(platforms, 'st')));
+                    usefulDeviceSource = (0, lodash_1.compact)(Object.keys((0, lodash_1.groupBy)(platforms, 'deviceSource')));
                     targetDevices = {};
                     Object.values(deviceTargets).forEach(function (device) {
                         var _a;
                         var _b = device.apiLevelLimit || {}, _c = _b.min, min = _c === void 0 ? '1.0.0' : _c, _d = _b.max, max = _d === void 0 ? '99.99.99' : _d;
-                        if ((0, tools_1.compareVersion)(min, apiLevel) >= 0 && (0, tools_1.compareVersion)(max, apiLevel) <= 0) {
-                            Object.assign(targetDevices, (_a = {},
-                                _a[device.deviceName] = device,
-                                _a));
+                        if (usefulScreenTypes.includes((0, lodash_1.get)(device, 'screen.type', '')) || (0, lodash_1.find)(device.platforms, function (o) { return usefulDeviceSource.includes("".concat(o.deviceSource)); })) {
+                            if ((0, tools_1.compareVersion)(min, apiLevel) >= 0 && (0, tools_1.compareVersion)(max, apiLevel) <= 0) {
+                                Object.assign(targetDevices, (_a = {},
+                                    _a[device.deviceName] = device,
+                                    _a));
+                            }
                         }
                     });
                     deviceNames = Object.keys(targetDevices);
@@ -139,7 +146,7 @@ var chooseBuildTargetsV3Config = function (mode, args) {
                                 type: 'list',
                                 message: 'Which device would you like to preview?',
                                 choices: deviceNames
-                            }
+                            },
                         ])];
                 case 1:
                     answers = _a.sent();
@@ -173,7 +180,8 @@ var chooseBuildTargetsV2Config = function (mode, args) {
                                 unsupportedTargets_1.push(target);
                             }
                         });
-                        unsupportedTargets_1.length && zeppos_app_utils_1.logger.warn("Unsupported targets(".concat(unsupportedTargets_1.join(', '), ") have been removed."));
+                        unsupportedTargets_1.length &&
+                            zeppos_app_utils_1.logger.warn("Unsupported targets(".concat(unsupportedTargets_1.join(', '), ") have been removed."));
                     }
                     targets = Object.keys((0, lodash_1.get)(appJsonContent, 'targets', {}));
                     returnRes = [];
@@ -206,7 +214,9 @@ var chooseBuildTargetsV2Config = function (mode, args) {
                                 name: 'target',
                                 type: 'checkbox',
                                 when: function (args) {
-                                    var arr = typeof promptTarget_1 === 'string' ? (0, lodash_1.intersection)(targets, promptTarget_1.split(',')) : [];
+                                    var arr = typeof promptTarget_1 === 'string'
+                                        ? (0, lodash_1.intersection)(targets, promptTarget_1.split(','))
+                                        : [];
                                     var bool = !!arr.length;
                                     if (bool) {
                                         args.target = arr;
@@ -219,11 +229,12 @@ var chooseBuildTargetsV2Config = function (mode, args) {
                                     checked: true
                                 }); }),
                                 message: 'Which targets would you like to build?'
-                            }
+                            },
                         ])];
                 case 3:
                     answers = _b.sent();
-                    returnRes = typeof answers.target === 'string' ? [answers.target] : answers.target;
+                    returnRes =
+                        typeof answers.target === 'string' ? [answers.target] : answers.target;
                     _b.label = 4;
                 case 4:
                     if (!process.env._targetDeviceToBuild) {
@@ -298,7 +309,9 @@ var buildPreview = function (args, callback) { return __awaiter(void 0, void 0,
         switch (_e.label) {
             case 0:
                 _a = args._, curCommand = _a[0], curBridgeTarget = _a[1];
-                buildMode = (curBridgeTarget && curBridgeTarget === 'simulator') ? BuildMode.DEV : BuildMode.PREVIEW;
+                buildMode = curBridgeTarget && curBridgeTarget === 'simulator'
+                    ? BuildMode.DEV
+                    : BuildMode.PREVIEW;
                 zeppos_app_utils_1.logger.info('building...');
                 appType = (0, lodash_1.get)(appJsonContent, 'app.appType');
                 _c = (_b = Object).assign;
@@ -310,14 +323,18 @@ var buildPreview = function (args, callback) { return __awaiter(void 0, void 0,
             case 2:
                 buildInfo = _e.sent();
                 zeppos_app_utils_1.logger.info('getting package...');
-                return [4, zeppos_app_utils_1.modules.previewBuild(path.resolve('./'), args, "./dist/".concat(buildInfo), appType, curCommand).then(function (res) { return __awaiter(void 0, void 0, void 0, function () {
+                return [4, zeppos_app_utils_1.modules
+                        .previewBuild(path.resolve('./'), args, "./dist/".concat(buildInfo), appType, curCommand)
+                        .then(function (res) { return __awaiter(void 0, void 0, void 0, function () {
                         return __generator(this, function (_a) {
                             switch (_a.label) {
                                 case 0:
                                     if (!(res.type === 'preview')) return [3, 1];
                                     zeppos_app_utils_1.logger.info('Generating preview QR code...');
                                     zeppos_app_utils_1.logger.success("Please use Zepp APP to scan the following QR code to preview your ".concat(appType === AppType.WATCHFACE ? 'WatchFace' : 'application', "."));
-                                    zeppos_app_utils_1.logger.success("The QR code will expire on ".concat((0, dayjs_1["default"])().add(2, 'hour').format('YYYY-MM-DD HH:mm:ss'), "."));
+                                    zeppos_app_utils_1.logger.success("The QR code will expire on ".concat((0, dayjs_1["default"])()
+                                        .add(2, 'hour')
+                                        .format('YYYY-MM-DD HH:mm:ss'), "."));
                                     qrcode_terminal_1["default"].generate(res.url, { small: true });
                                     callback && callback(res);
                                     return [3, 4];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeppos/zeus-cli",
-  "version": "1.3.0-beta.4",
+  "version": "1.3.0-beta.6",
   "description": "zeus mini-program tools",
   "main": "index.ts",
   "author": "zepp",

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

@@ -12,6 +12,15 @@ var DeviceTarget;
     DeviceTarget["BARI"] = "bari";
     DeviceTarget["BERLIN"] = "berlin";
     DeviceTarget["LILLE"] = "lille";
+    DeviceTarget["VIENNA"] = "vienna";
+    DeviceTarget["ANDES"] = "andes";
+    DeviceTarget["MONACO"] = "monaco";
+    DeviceTarget["SWIFT"] = "swift";
+    DeviceTarget["SWORDFISH"] = "swordfish";
+    DeviceTarget["CHEETAH"] = "cheetah";
+    DeviceTarget["HANNOVER"] = "hannover";
+    DeviceTarget["ETNA"] = "etna";
+    DeviceTarget["ALTAI"] = "altai";
 })(DeviceTarget = exports.DeviceTarget || (exports.DeviceTarget = {}));
 var DevicePlatformName;
 (function (DevicePlatformName) {
@@ -33,6 +42,21 @@ var DevicePlatformName;
     DevicePlatformName["BERLIN_W"] = "gtr4-w";
     DevicePlatformName["LILLE"] = "gts4";
     DevicePlatformName["LILLE_W"] = "gts4-w";
+    DevicePlatformName["VIENNA"] = "falcon";
+    DevicePlatformName["VIENNA_W"] = "falcon-w";
+    DevicePlatformName["ANDES"] = "t-rex-ultra";
+    DevicePlatformName["ANDES_W"] = "t-rex-ultra-w";
+    DevicePlatformName["MONACO"] = "monaco";
+    DevicePlatformName["MONACO_WN"] = "monaco-wn";
+    DevicePlatformName["MONACO_W"] = "monaco-w";
+    DevicePlatformName["SWIFT"] = "swift";
+    DevicePlatformName["SWIFT_W"] = "swift-w";
+    DevicePlatformName["SWORDFISH_W"] = "swordfish-w";
+    DevicePlatformName["CHEETAH_W"] = "cheetah-w";
+    DevicePlatformName["HANNOVER"] = "hannover";
+    DevicePlatformName["ETNA"] = "etna";
+    DevicePlatformName["ETNA_W"] = "etna-w";
+    DevicePlatformName["ALTAI"] = "altai";
 })(DevicePlatformName = exports.DevicePlatformName || (exports.DevicePlatformName = {}));
 var DeviceSource;
 (function (DeviceSource) {
@@ -54,11 +78,27 @@ var DeviceSource;
     DeviceSource[DeviceSource["BERLIN_W"] = 7930113] = "BERLIN_W";
     DeviceSource[DeviceSource["LILLE"] = 7995648] = "LILLE";
     DeviceSource[DeviceSource["LILLE_W"] = 7995649] = "LILLE_W";
+    DeviceSource[DeviceSource["VIENNA"] = 414] = "VIENNA";
+    DeviceSource[DeviceSource["VIENNA_W"] = 415] = "VIENNA_W";
+    DeviceSource[DeviceSource["ANDES"] = 6553856] = "ANDES";
+    DeviceSource[DeviceSource["ANDES_W"] = 6553857] = "ANDES_W";
+    DeviceSource[DeviceSource["MONACO"] = 8519936] = "MONACO";
+    DeviceSource[DeviceSource["MONACO_WN"] = 8519937] = "MONACO_WN";
+    DeviceSource[DeviceSource["MONACO_W"] = 8519939] = "MONACO_W";
+    DeviceSource[DeviceSource["SWIFT"] = 8192256] = "SWIFT";
+    DeviceSource[DeviceSource["SWIFT_W"] = 8192257] = "SWIFT_W";
+    DeviceSource[DeviceSource["SWORDFISH_W"] = 8257793] = "SWORDFISH_W";
+    DeviceSource[DeviceSource["CHEETAH_W"] = 8126721] = "CHEETAH_W";
+    DeviceSource[DeviceSource["HANNOVER"] = 8323329] = "HANNOVER";
+    DeviceSource[DeviceSource["ETNA"] = 8388864] = "ETNA";
+    DeviceSource[DeviceSource["ETNA_W"] = 8388865] = "ETNA_W";
+    DeviceSource[DeviceSource["ALTAI"] = 8454401] = "ALTAI";
 })(DeviceSource = exports.DeviceSource || (exports.DeviceSource = {}));
 var DeviceScreenType;
 (function (DeviceScreenType) {
     DeviceScreenType["R"] = "r";
     DeviceScreenType["S"] = "s";
+    DeviceScreenType["B"] = "b";
 })(DeviceScreenType = exports.DeviceScreenType || (exports.DeviceScreenType = {}));
 exports.deviceTargets = (_a = {},
     _a[DeviceTarget.MADRID] = {
@@ -192,7 +232,7 @@ exports.deviceTargets = (_a = {},
             }
         ],
         screen: {
-            type: DeviceScreenType.S,
+            type: DeviceScreenType.B,
             width: 194,
             height: 368
         },
@@ -243,12 +283,202 @@ exports.deviceTargets = (_a = {},
             min: '1.0.0'
         }
     },
+    _a[DeviceTarget.VIENNA] = {
+        deviceName: 'Falcon',
+        platforms: [
+            {
+                name: DevicePlatformName.VIENNA,
+                deviceSource: DeviceSource.VIENNA
+            },
+            {
+                name: DevicePlatformName.VIENNA_W,
+                deviceSource: DeviceSource.VIENNA_W
+            }
+        ],
+        screen: {
+            type: DeviceScreenType.R,
+            width: 416,
+            height: 416
+        },
+        apiLevelLimit: {
+            min: '1.0.0',
+            max: '1.99.99'
+        }
+    },
+    _a[DeviceTarget.ANDES] = {
+        deviceName: 'T-Rex Ultra',
+        platforms: [
+            {
+                name: DevicePlatformName.ANDES,
+                deviceSource: DeviceSource.ANDES
+            },
+            {
+                name: DevicePlatformName.ANDES_W,
+                deviceSource: DeviceSource.ANDES_W
+            }
+        ],
+        screen: {
+            type: DeviceScreenType.R,
+            width: 454,
+            height: 454
+        },
+        apiLevelLimit: {
+            min: '1.0.0'
+        }
+    },
+    _a[DeviceTarget.MONACO] = {
+        deviceName: 'GTR 5',
+        platforms: [
+            {
+                name: DevicePlatformName.MONACO,
+                deviceSource: DeviceSource.MONACO
+            },
+            {
+                name: DevicePlatformName.MONACO_WN,
+                deviceSource: DeviceSource.MONACO_WN
+            },
+            {
+                name: DevicePlatformName.MONACO_W,
+                deviceSource: DeviceSource.MONACO_W
+            }
+        ],
+        screen: {
+            type: DeviceScreenType.R,
+            width: 480,
+            height: 480
+        },
+        apiLevelLimit: {
+            min: '1.0.0'
+        }
+    },
+    _a[DeviceTarget.SWIFT] = {
+        deviceName: 'Runner (Round)',
+        platforms: [
+            {
+                name: DevicePlatformName.SWIFT,
+                deviceSource: DeviceSource.SWIFT
+            },
+            {
+                name: DevicePlatformName.SWIFT_W,
+                deviceSource: DeviceSource.SWIFT_W
+            }
+        ],
+        screen: {
+            type: DeviceScreenType.R,
+            width: 454,
+            height: 454
+        },
+        apiLevelLimit: {
+            min: '1.0.0'
+        }
+    },
+    _a[DeviceTarget.SWORDFISH] = {
+        deviceName: 'Runner (Square)',
+        platforms: [
+            {
+                name: DevicePlatformName.SWORDFISH_W,
+                deviceSource: DeviceSource.SWORDFISH_W
+            }
+        ],
+        screen: {
+            type: DeviceScreenType.S,
+            width: 390,
+            height: 450
+        },
+        apiLevelLimit: {
+            min: '1.0.0'
+        }
+    },
+    _a[DeviceTarget.CHEETAH] = {
+        deviceName: 'Runner Pro',
+        platforms: [
+            {
+                name: DevicePlatformName.CHEETAH_W,
+                deviceSource: DeviceSource.CHEETAH_W
+            }
+        ],
+        screen: {
+            type: DeviceScreenType.R,
+            width: 480,
+            height: 480
+        },
+        apiLevelLimit: {
+            min: '1.0.0'
+        }
+    },
+    _a[DeviceTarget.HANNOVER] = {
+        deviceName: 'GTS 5 Active',
+        platforms: [
+            {
+                name: DevicePlatformName.HANNOVER,
+                deviceSource: DeviceSource.HANNOVER
+            }
+        ],
+        screen: {
+            type: DeviceScreenType.S,
+            width: 390,
+            height: 450
+        },
+        apiLevelLimit: {
+            min: '1.0.0'
+        }
+    },
+    _a[DeviceTarget.ETNA] = {
+        deviceName: 'GTR Shock',
+        platforms: [
+            {
+                name: DevicePlatformName.ETNA,
+                deviceSource: DeviceSource.ETNA
+            },
+            {
+                name: DevicePlatformName.ETNA_W,
+                deviceSource: DeviceSource.ETNA_W
+            }
+        ],
+        screen: {
+            type: DeviceScreenType.S,
+            width: 360,
+            height: 360
+        },
+        apiLevelLimit: {
+            min: '1.0.0'
+        }
+    },
+    _a[DeviceTarget.ALTAI] = {
+        deviceName: 'Bip 5s',
+        platforms: [
+            {
+                name: DevicePlatformName.ALTAI,
+                deviceSource: DeviceSource.ALTAI
+            }
+        ],
+        screen: {
+            type: DeviceScreenType.S,
+            width: 320,
+            height: 380
+        },
+        apiLevelLimit: {
+            min: '1.0.0'
+        }
+    },
     _a);
 exports.OSV2Devices = [
     DeviceSource.BERLIN,
     DeviceSource.BERLIN_W,
     DeviceSource.LILLE,
-    DeviceSource.LILLE_W
+    DeviceSource.LILLE_W,
+    DeviceTarget.ANDES,
+    DeviceSource.MONACO,
+    DeviceSource.MONACO_WN,
+    DeviceSource.MONACO_W,
+    DeviceSource.SWIFT,
+    DeviceSource.SWIFT_W,
+    DeviceSource.SWORDFISH_W,
+    DeviceSource.CHEETAH_W,
+    DeviceSource.HANNOVER,
+    DeviceSource.ETNA,
+    DeviceSource.ETNA_W,
+    DeviceSource.ALTAI
 ];
 exports.OSV2DeviceTargetNames = Object.keys(exports.deviceTargets).reduce(function (targetNames, target) {
     var flag = true;

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

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

package/private-modules/zeppos-app-utils/dist/public/template/v2/empty/page/index.js

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