@zeppos/zeus-cli 1.2.3 → 1.3.0-beta.10

package/modules/build.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -64,14 +75,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 exports.__esModule = true;
 exports.buildPreview = exports.buildProd = exports.chooseBuildPackages = exports.BuildMode = void 0;
 var path = __importStar(require("path"));
+var fs_1 = __importDefault(require("fs"));
 var fs_extra_1 = __importDefault(require("fs-extra"));
 var lodash_1 = require("lodash");
 var dayjs_1 = __importDefault(require("dayjs"));
 var qrcode_terminal_1 = __importDefault(require("qrcode-terminal"));
 var inquirer_1 = __importDefault(require("inquirer"));
 var zeppos_app_utils_1 = require("zeppos-app-utils");
-var AppType = zeppos_app_utils_1.config.AppType, OSV2Devices = zeppos_app_utils_1.config.OSV2Devices;
-var appJsonContent = fs_extra_1["default"].readJSONSync(path.resolve('./app.json'), { throws: false });
+var tools_1 = require("../utils/tools");
+var AppType = zeppos_app_utils_1.config.AppType, deviceTargets = zeppos_app_utils_1.config.deviceTargets, OSV2Devices = zeppos_app_utils_1.config.OSV2Devices;
+var appJsonPath = path.resolve('./app.json');
+var appJsonContent = fs_extra_1["default"].readJSONSync(appJsonPath, { throws: false });
 var BuildMode;
 (function (BuildMode) {
     BuildMode["DEV"] = "development";
@@ -83,17 +97,77 @@ var isV2ApiVersion = function (appJson) {
     var minVersionArr = minVersion.split('.');
     return parseInt("0".concat(minVersionArr[0]), 10) >= 2;
 };
-var chooseBuildPackages = function (mode, args) {
+var checkAppJson = function () {
+    if (!appJsonContent) {
+        try {
+            fs_1["default"].accessSync(appJsonPath, fs_1["default"].constants.R_OK);
+            zeppos_app_utils_1.logger.warn('Syntax error, malformed JSON in app.json file.');
+        }
+        catch (err) {
+            zeppos_app_utils_1.logger.warn("This command needs to be executed in the root of the project.");
+        }
+        process.exit(1);
+    }
+};
+var chooseBuildTargetsV3Config = function (mode, args) {
+    if (mode === void 0) { mode = 'development'; }
+    return __awaiter(void 0, void 0, void 0, function () {
+        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 || {}, min = _b.min, max = _b.max;
+                        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 || '1.0.0', apiLevel) >= 0 && (0, tools_1.compareVersion)(max || '99.99.99', apiLevel) < 0) {
+                                Object.assign(targetDevices, (_a = {},
+                                    _a[device.deviceName] = device,
+                                    _a));
+                            }
+                        }
+                    });
+                    deviceNames = Object.keys(targetDevices);
+                    if (!deviceNames.length) {
+                        zeppos_app_utils_1.logger.error("The current project's API Level version is too high and there is no available device for debugging, please check if the version is correct.");
+                        process.exit(1);
+                    }
+                    return [4, inquirer_1["default"].prompt([
+                            {
+                                name: 'device',
+                                type: 'list',
+                                message: 'Which device would you like to preview?',
+                                choices: deviceNames
+                            },
+                        ])];
+                case 1:
+                    answers = _a.sent();
+                    return [2, {
+                            sources: (0, lodash_1.get)(targetDevices, "[".concat(answers.device, "].platforms"), []).reduce(function (list, item) {
+                                list.push(Number(item.deviceSource));
+                                return (0, lodash_1.uniq)((0, lodash_1.compact)(list));
+                            }, [])
+                        }];
+            }
+        });
+    });
+};
+var chooseBuildTargetsV2Config = function (mode, args) {
     if (mode === void 0) { mode = 'development'; }
     return __awaiter(void 0, void 0, void 0, function () {
         var jsonTargets_1, unsupportedTargets_1, targets, returnRes, _a, promptTarget_1, answers;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
-                    if (!appJsonContent) {
-                        zeppos_app_utils_1.logger.warn("This command needs to be executed in the root of the project.");
-                        process.exit(1);
-                    }
+                    checkAppJson();
                     if (isV2ApiVersion(appJsonContent)) {
                         jsonTargets_1 = (0, lodash_1.get)(appJsonContent, 'targets', {});
                         unsupportedTargets_1 = [];
@@ -106,7 +180,8 @@ var chooseBuildPackages = 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 = [];
@@ -139,7 +214,9 @@ var chooseBuildPackages = 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;
@@ -152,11 +229,12 @@ var chooseBuildPackages = 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) {
@@ -167,18 +245,53 @@ var chooseBuildPackages = function (mode, args) {
         });
     });
 };
+var chooseBuildPackages = function (mode, args) {
+    if (mode === void 0) { mode = 'development'; }
+    return __awaiter(void 0, void 0, void 0, function () {
+        var configVersion, result, _a, _b, _c, _d, _e, _f;
+        var _g;
+        return __generator(this, function (_h) {
+            switch (_h.label) {
+                case 0:
+                    configVersion = (0, lodash_1.toLower)((0, lodash_1.get)(appJsonContent, 'configVersion'));
+                    result = {};
+                    if (!(configVersion === 'v3')) return [3, 3];
+                    if (!(mode !== BuildMode.PROD)) return [3, 2];
+                    _b = (_a = Object).assign;
+                    _c = [result];
+                    return [4, chooseBuildTargetsV3Config(mode, args)];
+                case 1:
+                    _b.apply(_a, _c.concat([_h.sent()]));
+                    _h.label = 2;
+                case 2: return [3, 5];
+                case 3:
+                    _e = (_d = Object).assign;
+                    _f = [result];
+                    _g = {};
+                    return [4, chooseBuildTargetsV2Config(mode, args)];
+                case 4:
+                    _e.apply(_d, _f.concat([(_g.targets = _h.sent(),
+                            _g)]));
+                    _h.label = 5;
+                case 5: return [2, result];
+            }
+        });
+    });
+};
 exports.chooseBuildPackages = chooseBuildPackages;
 var buildProd = function (args) { return __awaiter(void 0, void 0, void 0, function () {
-    var packages, appId, buildInfo;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4, (0, exports.chooseBuildPackages)(BuildMode.PROD, args)];
+    var _a, _b, _c, buildInfo;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
+            case 0:
+                _b = (_a = Object).assign;
+                _c = [args];
+                return [4, (0, exports.chooseBuildPackages)(BuildMode.PROD, args)];
             case 1:
-                packages = _a.sent();
-                appId = (0, lodash_1.get)(appJsonContent, 'app.appId');
-                return [4, zeppos_app_utils_1.modules.build(path.resolve('./'), BuildMode.PROD, args, packages, appId)];
+                _b.apply(_a, _c.concat([_d.sent()]));
+                return [4, zeppos_app_utils_1.modules.buildSupportV3Config(path.resolve('./'), BuildMode.PROD, __assign(__assign({}, args), { renameWithAppId: (0, lodash_1.get)(appJsonContent, 'app.appId') }))];
             case 2:
-                buildInfo = _a.sent();
+                buildInfo = _d.sent();
                 if (buildInfo) {
                     (0, zeppos_app_utils_1.HM_Analytics)('ZEPP_CLI_BUILD_C', { res: '1' });
                 }
@@ -191,30 +304,37 @@ var buildProd = function (args) { return __awaiter(void 0, void 0, void 0, funct
 }); };
 exports.buildProd = buildProd;
 var buildPreview = function (args, callback) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, curCommand, curBridgeTarget, buildMode, appType, appId, packages, buildInfo;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
+    var _a, curCommand, curBridgeTarget, buildMode, appType, _b, _c, _d, buildInfo;
+    return __generator(this, function (_e) {
+        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');
-                appId = (0, lodash_1.get)(appJsonContent, 'app.appId');
-                return [4, (0, exports.chooseBuildPackages)(buildMode, args)];
+                _c = (_b = Object).assign;
+                _d = [args];
+                return [4, (0, exports.chooseBuildPackages)(BuildMode.PREVIEW, args)];
             case 1:
-                packages = _b.sent();
-                return [4, zeppos_app_utils_1.modules.build(path.resolve('./'), buildMode, args, packages, appId)];
+                _c.apply(_b, _d.concat([_e.sent()]));
+                return [4, zeppos_app_utils_1.modules.buildSupportV3Config(path.resolve('./'), buildMode, __assign(__assign({}, args), { renameWithAppId: (0, lodash_1.get)(appJsonContent, 'app.appId') }))];
             case 2:
-                buildInfo = _b.sent();
+                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];
@@ -234,7 +354,7 @@ var buildPreview = function (args, callback) { return __awaiter(void 0, void 0,
                         zeppos_app_utils_1.logger.error('Generating preview qrcode failed, please check your network.');
                     })];
             case 3:
-                _b.sent();
+                _e.sent();
                 return [2];
         }
     });

package/modules/create.js

@@ -57,11 +57,11 @@ var AppType = zeppos_app_utils_1.config.AppType, deviceTargets = zeppos_app_util
 var inquirerFunc = function (args, _a) {
     var appTemplateChoices = _a.appTemplateChoices, watchfaceTemplateChoices = _a.watchfaceTemplateChoices;
     return __awaiter(void 0, void 0, void 0, function () {
-        var _b, promptAppType, _c, promptOsVersion, _d, promptTemplate, _e, promptWithAppSide, _f, promptWithSettings, _g, promptBuildTargets;
-        return __generator(this, function (_h) {
-            switch (_h.label) {
+        var _b, promptAppType, _c, promptOsVersion, _d, promptTemplate, _e, promptWithAppSide, _f, promptWithSettings, _g, promptBuildTargets, _h, configVersion;
+        return __generator(this, function (_j) {
+            switch (_j.label) {
                 case 0:
-                    _b = args.appType, promptAppType = _b === void 0 ? '' : _b, _c = args.OSVersion, promptOsVersion = _c === void 0 ? '' : _c, _d = args.template, promptTemplate = _d === void 0 ? '' : _d, _e = args.withAppSide, promptWithAppSide = _e === void 0 ? false : _e, _f = args.withSettings, promptWithSettings = _f === void 0 ? false : _f, _g = args.buildTargets, promptBuildTargets = _g === void 0 ? [] : _g;
+                    _b = args.appType, promptAppType = _b === void 0 ? '' : _b, _c = args.OSVersion, promptOsVersion = _c === void 0 ? '' : _c, _d = args.template, promptTemplate = _d === void 0 ? '' : _d, _e = args.withAppSide, promptWithAppSide = _e === void 0 ? false : _e, _f = args.withSettings, promptWithSettings = _f === void 0 ? false : _f, _g = args.buildTargets, promptBuildTargets = _g === void 0 ? [] : _g, _h = args.configVersion, configVersion = _h === void 0 ? 'v2' : _h;
                     return [4, inquirer_1["default"].prompt([
                             {
                                 name: 'appType',
@@ -180,6 +180,7 @@ var inquirerFunc = function (args, _a) {
                                         args.buildTargets = (0, lodash_1.intersection)(Object.keys(deviceTargets), promptBuildTargets.split(','));
                                         return [3, 3];
                                     case 1:
+                                        if (!(configVersion !== 'v3')) return [3, 3];
                                         choicePlatforms_1 = [];
                                         switch (args.OSVersion) {
                                             case 'v1':
@@ -212,7 +213,7 @@ var inquirerFunc = function (args, _a) {
                                 }
                             });
                         }); })];
-                case 1: return [2, _h.sent()];
+                case 1: return [2, _j.sent()];
             }
         });
     });

package/modules/run.js

@@ -69,10 +69,10 @@ var path = __importStar(require("path"));
 var zeppos_app_utils_1 = require("zeppos-app-utils");
 var DEFAULT_HOST = zeppos_app_utils_1.config.DEFAULT_HOST, DEFAULT_PORT = zeppos_app_utils_1.config.DEFAULT_PORT, simulatorStorageKey = zeppos_app_utils_1.config.simulatorStorageKey;
 var run = function (args) { return __awaiter(void 0, void 0, void 0, function () {
-    var simulatorHost, simulatorPort, _a, promptSimulatorHost, _b, promptSimulatorPort, answer, packages, simulatorWebSocketURL, root;
-    var _c;
-    return __generator(this, function (_d) {
-        switch (_d.label) {
+    var simulatorHost, simulatorPort, _a, promptSimulatorHost, _b, promptSimulatorPort, answer, _c, _d, _e, simulatorWebSocketURL, root;
+    var _f;
+    return __generator(this, function (_g) {
+        switch (_g.label) {
             case 0:
                 simulatorHost = '';
                 simulatorPort = '';
@@ -108,22 +108,24 @@ var run = function (args) { return __awaiter(void 0, void 0, void 0, function ()
                         }
                     ])];
             case 1:
-                answer = _d.sent();
+                answer = _g.sent();
                 if (!simulatorHost) {
                     simulatorHost = answer.host || DEFAULT_HOST;
                     simulatorPort = answer.port || DEFAULT_PORT;
-                    zeppos_app_utils_1.globalStorage.set((_c = {},
-                        _c[simulatorStorageKey.simulatorHost] = answer.host || DEFAULT_HOST,
-                        _c[simulatorStorageKey.simulatorPort] = answer.port || DEFAULT_PORT,
-                        _c));
+                    zeppos_app_utils_1.globalStorage.set((_f = {},
+                        _f[simulatorStorageKey.simulatorHost] = answer.host || DEFAULT_HOST,
+                        _f[simulatorStorageKey.simulatorPort] = answer.port || DEFAULT_PORT,
+                        _f));
                 }
                 (0, zeppos_app_utils_1.HM_Analytics)('ZEPP_CLI_DEV_C');
+                _d = (_c = Object).assign;
+                _e = [args];
                 return [4, (0, build_1.chooseBuildPackages)(build_1.BuildMode.DEV, args)];
             case 2:
-                packages = _d.sent();
+                _d.apply(_c, _e.concat([_g.sent()]));
                 simulatorWebSocketURL = "http://".concat(simulatorHost, ":").concat(simulatorPort);
                 root = path.resolve('./');
-                zeppos_app_utils_1.modules.runX(root, args, simulatorWebSocketURL, packages);
+                zeppos_app_utils_1.modules.runX(root, args, simulatorWebSocketURL);
                 return [2];
         }
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeppos/zeus-cli",
-  "version": "1.2.3",
+  "version": "1.3.0-beta.10",
   "description": "zeus mini-program tools",
   "main": "index.ts",
   "author": "zepp",
@@ -21,7 +21,7 @@
     "qrcode-terminal": "^0.12.0",
     "vorpal": "^1.12.0",
     "yargs": "^17.5.1",
-    "@zeppos/zpm": "^2.6.6",
+    "@zeppos/zpm": "^2.9.24-beta",
     "axios": "^0.27.2",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",