@aiot-toolkit/aiotpack 2.0.2 → 2.0.3-beta.10

package/lib/utils/ux/android/AndroidUx.js

@@ -1,98 +1,96 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const parser_1 = require("@aiot-toolkit/parser");
-const shared_utils_1 = require("@aiot-toolkit/shared-utils");
-const UxToTypescript_1 = __importDefault(require("@aiot-toolkit/parser/lib/ux/translate/android/UxToTypescript"));
-const generator_1 = require("@aiot-toolkit/generator");
-const path_1 = __importDefault(require("path"));
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _parser = require("@aiot-toolkit/parser");
+var _sharedUtils = require("@aiot-toolkit/shared-utils");
+var _UxToTypescript = _interopRequireDefault(require("@aiot-toolkit/parser/lib/ux/translate/android/UxToTypescript"));
+var _generator = require("@aiot-toolkit/generator");
+var _path = _interopRequireDefault(require("path"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * AndroidUx
  */
 class AndroidUx {
-    /**
-     *
-     * 编译 ux 文件
-     * 1. 获取文件类型：app  page  普通ux
-     * 2. 使用`UxParse`解析
-     * 3. 使用`UxToTypeScript`转换
-     * 4. 使用`TypeScriptGenerator`生成
-     * @param params
-     */
-    compileUx(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { context, file, compilerOption } = params;
-            const { path: filePath, content } = file;
-            const { projectPath } = context;
-            const fileType = this.getFileType(filePath, context);
-            // 无内容的文件，添加空内容警告
-            if (!content) {
-                return {
-                    files: [],
-                    logs: [
-                        {
-                            level: shared_utils_1.Loglevel.WARN,
-                            message: `${filePath} is empty`,
-                            filePath
-                        }
-                    ]
-                };
-            }
-            const logs = [];
-            const option = {
-                filePath,
-                projectPath,
-                projectType: shared_utils_1.ProjectType.ANDDROID_UX,
-                fileType,
-                onLog: function (log) {
-                    logs.push(log);
-                },
-                content: content.toString()
-            };
-            const uxAst = yield new parser_1.UxParser(option, compilerOption, {}, (path) => path).parser();
-            const tsAst = yield new UxToTypescript_1.default(option, compilerOption, context).translate(uxAst.ast, uxAst.offsetList || []);
-            const filePathParse = path_1.default.parse(filePath);
-            const code = new generator_1.TypescriptGenerator().generate({
-                sourceFilePath: filePathParse.base,
-                targetFilePath: `${filePathParse.name}.js`,
-                ast: tsAst.targetTree,
-                mapList: tsAst.mapList
-            });
-            return {
-                files: [
-                    {
-                        path: filePath,
-                        content: code.code
-                    },
-                    {
-                        path: `${filePathParse.dir}/${filePathParse.base}.map`,
-                        content: code.sourcemap
-                    }
-                    // resource todo
-                ],
-                logs
-            };
-        });
+  /**
+   *
+   * 编译 ux 文件
+   * 1. 获取文件类型：app  page  普通ux
+   * 2. 使用`UxParse`解析
+   * 3. 使用`UxToTypeScript`转换
+   * 4. 使用`TypeScriptGenerator`生成
+   * @param params
+   */
+  async compileUx(params) {
+    const {
+      context,
+      file,
+      compilerOption
+    } = params;
+    const {
+      path: filePath,
+      content
+    } = file;
+    const {
+      projectPath
+    } = context;
+    const fileType = this.getFileType(filePath, context);
+
+    // 无内容的文件，添加空内容警告
+    if (!content) {
+      return {
+        files: [],
+        logs: [{
+          level: _sharedUtils.Loglevel.WARN,
+          message: `${filePath} is empty`,
+          filePath
+        }]
+      };
     }
-    getFileType(filePath, context) {
-        const { entries } = context;
-        if (path_1.default.basename(filePath) === 'app.ux') {
-            return 'app';
-        }
-        else if (entries.includes(filePath)) {
-            return 'page';
-        }
+    const logs = [];
+    const option = {
+      filePath,
+      projectPath,
+      projectType: _sharedUtils.ProjectType.ANDDROID_UX,
+      fileType,
+      onLog: function (log) {
+        logs.push(log);
+      },
+      content: content.toString()
+    };
+    const uxAst = await new _parser.UxParser(option, compilerOption, {}, path => path).parser();
+    const tsAst = await new _UxToTypescript.default(option, compilerOption, context).translate(uxAst.ast, uxAst.offsetList || []);
+    const filePathParse = _path.default.parse(filePath);
+    const code = new _generator.TypescriptGenerator().generate({
+      sourceFilePath: filePathParse.base,
+      targetFilePath: `${filePathParse.name}.js`,
+      ast: tsAst.targetTree,
+      mapList: tsAst.mapList
+    });
+    return {
+      files: [{
+        path: filePath,
+        content: code.code
+      }, {
+        path: `${filePathParse.dir}/${filePathParse.base}.map`,
+        content: code.sourcemap
+      }
+      // resource todo
+      ],
+      logs
+    };
+  }
+  getFileType(filePath, context) {
+    const {
+      entries
+    } = context;
+    if (_path.default.basename(filePath) === 'app.ux') {
+      return 'app';
+    } else if (entries.includes(filePath)) {
+      return 'page';
     }
+  }
 }
-exports.default = AndroidUx;
+var _default = exports.default = AndroidUx;

package/lib/utils/xts/XtsFileLaneUtils.js

@@ -1,68 +1,61 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const shared_utils_1 = require("@aiot-toolkit/shared-utils");
-const archiver_1 = __importDefault(require("archiver"));
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const path_1 = __importDefault(require("path"));
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _sharedUtils = require("@aiot-toolkit/shared-utils");
+var _archiver = _interopRequireDefault(require("archiver"));
+var _fsExtra = _interopRequireDefault(require("fs-extra"));
+var _path = _interopRequireDefault(require("path"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class XtsFileLaneUtils {
-    /**
-     * 将buildPath文件夹的内容压缩成zip包，放置于targetPath路径下
-     * @param buildPath
-     * @param targetPath
-     * @param zipRootDirNames 可自定义压缩包内最外层目录的名称
-     */
-    static zipProject(buildPath, targetFile, zipRootDirNames) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                const output = fs_extra_1.default.createWriteStream(targetFile);
-                const archive = archiver_1.default.create('zip', {
-                    zlib: { level: 9 }
-                });
-                // 监听错误
-                archive.on('error', (err) => {
-                    shared_utils_1.ColorConsole.throw(`${err.message}`);
-                    output.close();
-                    reject();
-                });
-                // 监听写入流打开的事件
-                output.on('open', () => {
-                    shared_utils_1.ColorConsole.info(`Write stream is open`);
-                });
-                output.on('close', () => {
-                    shared_utils_1.ColorConsole.info(`Write stream is closed`);
-                    resolve();
-                });
-                // 将压缩文件导入到输出流中
-                archive.pipe(output);
-                // 指定压缩目录
-                buildPath.forEach((folder, index) => {
-                    const folderName = path_1.default.basename(folder); // 获取文件夹名
-                    if (zipRootDirNames && zipRootDirNames[index]) {
-                        archive.directory(folder, zipRootDirNames[index]);
-                    }
-                    else {
-                        archive.directory(folder, folderName);
-                    }
-                });
-                archive.on('finish', () => {
-                    shared_utils_1.ColorConsole.info('finish');
-                });
-                // 完成压缩，关闭输出流
-                archive.finalize();
-            });
-        });
-    }
+  /**
+   * 将buildPath文件夹的内容压缩成zip包，放置于targetPath路径下
+   * @param buildPath
+   * @param targetPath
+   * @param zipRootDirNames 可自定义压缩包内最外层目录的名称
+   */
+  static async zipProject(buildPath, targetFile, zipRootDirNames) {
+    return new Promise((resolve, reject) => {
+      const output = _fsExtra.default.createWriteStream(targetFile);
+      const archive = _archiver.default.create('zip', {
+        zlib: {
+          level: 9
+        }
+      });
+      // 监听错误
+      archive.on('error', err => {
+        _sharedUtils.ColorConsole.throw(`${err.message}`);
+        output.close();
+        reject();
+      });
+      // 监听写入流打开的事件
+      output.on('open', () => {
+        _sharedUtils.ColorConsole.info(`Write stream is open`);
+      });
+      output.on('close', () => {
+        _sharedUtils.ColorConsole.info(`Write stream is closed`);
+        resolve();
+      });
+      // 将压缩文件导入到输出流中
+      archive.pipe(output);
+
+      // 指定压缩目录
+      buildPath.forEach((folder, index) => {
+        const folderName = _path.default.basename(folder); // 获取文件夹名
+        if (zipRootDirNames && zipRootDirNames[index]) {
+          archive.directory(folder, zipRootDirNames[index]);
+        } else {
+          archive.directory(folder, folderName);
+        }
+      });
+      archive.on('finish', () => {
+        _sharedUtils.ColorConsole.info('finish');
+      });
+      // 完成压缩，关闭输出流
+      archive.finalize();
+    });
+  }
 }
-exports.default = XtsFileLaneUtils;
+var _default = exports.default = XtsFileLaneUtils;

package/lib/utils/xts/XtsFollowWorks.js

@@ -1,141 +1,134 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const shared_utils_1 = require("@aiot-toolkit/shared-utils");
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const path_1 = __importDefault(require("path"));
-const UxFileUtils_1 = __importDefault(require("./../ux/UxFileUtils"));
-const XtsFileLaneUtils_1 = __importDefault(require("../../utils/xts/XtsFileLaneUtils"));
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _sharedUtils = require("@aiot-toolkit/shared-utils");
+var _fsExtra = _interopRequireDefault(require("fs-extra"));
+var _path = _interopRequireDefault(require("path"));
+var _UxFileUtils = _interopRequireDefault(require("./../ux/UxFileUtils"));
+var _XtsFileLaneUtils = _interopRequireDefault(require("../../utils/xts/XtsFileLaneUtils"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * XtsFollowWorks
  */
 class XtsFollowWorks {
-    /**
-     * 将项目中build文件夹的内容压缩成zip包，并将压缩产物放到dist文件夹下
-     * @param context
-     */
-    static defaultZipProject(context, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { projectPath } = context;
-            const output = options.tarDir || context.output;
-            const buildPath = path_1.default.join(projectPath, output);
-            const zipPath = path_1.default.join(projectPath, 'dist');
-            // buildPath必须是真实文件夹路径
-            if (!fs_extra_1.default.existsSync(buildPath)) {
-                shared_utils_1.ColorConsole.throw(`buildPath: '${buildPath}' not exist`);
-            }
-            try {
-                // 确认文件夹是否存在，不存在则创建
-                fs_extra_1.default.ensureDirSync(zipPath);
-                // 清空dist文件夹
-                fs_extra_1.default.emptyDirSync(zipPath);
-                const filePath = XtsFollowWorks.getFilePath(projectPath, 'dist', options.packageName, 'rpk');
-                yield XtsFileLaneUtils_1.default.zipProject([buildPath], filePath, [options.packageName]);
-            }
-            catch (err) {
-                shared_utils_1.ColorConsole.throw(`${err.message}`);
-            }
-        });
+  /**
+   * 将项目中build文件夹的内容压缩成zip包，并将压缩产物放到dist文件夹下
+   * @param context
+   */
+  static async defaultZipProject(context, options) {
+    const {
+      projectPath
+    } = context;
+    const output = options.tarDir || context.output;
+    const buildPath = _path.default.join(projectPath, output);
+    const zipPath = _path.default.join(projectPath, 'dist');
+    // buildPath必须是真实文件夹路径
+    if (!_fsExtra.default.existsSync(buildPath)) {
+      _sharedUtils.ColorConsole.throw(`buildPath: '${buildPath}' not exist`);
     }
-    /**
-     * 将分布式项目按照manifest.json中的配置打包，思路如下：
-     * 1. 获取manifest中aspect的路由配置
-     * 2. 对aspects中的所有路由信息进行遍历
-     * 3. 按照设备（设备+rule）对aspect分类
-     * 4. 按照设备列表分别进行打包
-     * @param context
-     */
-    static zipDistributedQuickApp(context) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            const deviceList = [
-                {
-                    device: 'phone',
-                    aspectList: []
-                }
-            ];
-            const { projectPath, output } = context;
-            const manifestPath = UxFileUtils_1.default.getManifestFilePath(projectPath, 'app');
-            if (fs_extra_1.default.existsSync(manifestPath)) {
-                //获取manifest.json内容
-                const aspectsRule = (_b = (_a = fs_extra_1.default.readJSONSync(manifestPath)) === null || _a === void 0 ? void 0 : _a.router) === null || _b === void 0 ? void 0 : _b.aspects;
-                if (aspectsRule) {
-                    Object.keys(aspectsRule).forEach((aspectRule) => {
-                        // 分别处理每个aspectRule数组
-                        for (let item of aspectsRule[aspectRule]) {
-                            const { devices, rule, path } = item;
-                            // 如果存在设备列表
-                            if (devices && Array.isArray(devices) && devices.length > 0) {
-                                for (let device of devices) {
-                                    // 设备名与rule组合为一个设备
-                                    if (rule) {
-                                        device = `${device}.${rule}`;
-                                    }
-                                    // 查找设备是否已存在于设备列表中
-                                    const index = device === 'phone' ? 0 : deviceList.findIndex((item) => item.device === device);
-                                    if (index === -1) {
-                                        // 新设备
-                                        deviceList.push({
-                                            device,
-                                            aspectList: [path]
-                                        });
-                                    }
-                                    else {
-                                        // 已存在的设备信息时，仅需添加aspect路由
-                                        deviceList[index].aspectList.push(path);
-                                    }
-                                }
-                            }
-                            else {
-                                // 设备值默认值为phone
-                                deviceList[0].aspectList.push(path);
-                            }
-                        }
-                    });
+    try {
+      // 确认文件夹是否存在，不存在则创建
+      _fsExtra.default.ensureDirSync(zipPath);
+      // 清空dist文件夹
+      _fsExtra.default.emptyDirSync(zipPath);
+      const filePath = XtsFollowWorks.getFilePath(projectPath, 'dist', options.packageName, 'rpk');
+      await _XtsFileLaneUtils.default.zipProject([buildPath], filePath, [options.packageName]);
+    } catch (err) {
+      _sharedUtils.ColorConsole.throw(`${err.message}`);
+    }
+  }
+  /**
+   * 将分布式项目按照manifest.json中的配置打包，思路如下：
+   * 1. 获取manifest中aspect的路由配置
+   * 2. 对aspects中的所有路由信息进行遍历
+   * 3. 按照设备（设备+rule）对aspect分类
+   * 4. 按照设备列表分别进行打包
+   * @param context
+   */
+  static async zipDistributedQuickApp(context) {
+    const deviceList = [{
+      device: 'phone',
+      aspectList: []
+    }];
+    const {
+      projectPath,
+      output
+    } = context;
+    const manifestPath = _UxFileUtils.default.getManifestFilePath(projectPath, 'app');
+    if (_fsExtra.default.existsSync(manifestPath)) {
+      //获取manifest.json内容
+      const aspectsRule = _fsExtra.default.readJSONSync(manifestPath)?.router?.aspects;
+      if (aspectsRule) {
+        Object.keys(aspectsRule).forEach(aspectRule => {
+          // 分别处理每个aspectRule数组
+          for (let item of aspectsRule[aspectRule]) {
+            const {
+              devices,
+              rule,
+              path
+            } = item;
+            // 如果存在设备列表
+            if (devices && Array.isArray(devices) && devices.length > 0) {
+              for (let device of devices) {
+                // 设备名与rule组合为一个设备
+                if (rule) {
+                  device = `${device}.${rule}`;
                 }
-                const zipPath = path_1.default.join(projectPath, 'dist');
-                fs_extra_1.default.ensureDirSync(zipPath);
-                fs_extra_1.default.emptyDirSync(zipPath);
-                // 根据deviceList进行打包
-                for (const item of deviceList) {
-                    // 所有zip包都需要app信息
-                    item.aspectList.push('app');
-                    // 将路由转为真实路径
-                    const buildPaths = item.aspectList.map((name) => path_1.default.join(projectPath, output, name));
-                    const filePath = XtsFollowWorks.getFilePath(projectPath, 'dist', item.device);
-                    try {
-                        yield XtsFileLaneUtils_1.default.zipProject(buildPaths, filePath);
-                    }
-                    catch (error) { }
+                // 查找设备是否已存在于设备列表中
+                const index = device === 'phone' ? 0 : deviceList.findIndex(item => item.device === device);
+                if (index === -1) {
+                  // 新设备
+                  deviceList.push({
+                    device,
+                    aspectList: [path]
+                  });
+                } else {
+                  // 已存在的设备信息时，仅需添加aspect路由
+                  deviceList[index].aspectList.push(path);
                 }
+              }
+            } else {
+              // 设备值默认值为phone
+              deviceList[0].aspectList.push(path);
             }
-            else {
-                shared_utils_1.ColorConsole.throw('not find manifest.json');
-            }
+          }
         });
+      }
+      const zipPath = _path.default.join(projectPath, 'dist');
+      _fsExtra.default.ensureDirSync(zipPath);
+      _fsExtra.default.emptyDirSync(zipPath);
+      // 根据deviceList进行打包
+      for (const item of deviceList) {
+        // 所有zip包都需要app信息
+        item.aspectList.push('app');
+        // 将路由转为真实路径
+        const buildPaths = item.aspectList.map(name => _path.default.join(projectPath, output, name));
+        const filePath = XtsFollowWorks.getFilePath(projectPath, 'dist', item.device);
+        try {
+          await _XtsFileLaneUtils.default.zipProject(buildPaths, filePath);
+        } catch (error) {}
+      }
+    } else {
+      _sharedUtils.ColorConsole.throw('not find manifest.json');
     }
-    /**
-     * 根据项目路径，打包文件夹名和传入的压缩包名，生成压缩文件zip路径
-     * @param projectPath
-     * @param outputDir
-     * @param zipName
-     * @returns
-     */
-    static getFilePath(projectPath, outputDir = 'dist', zipName, ext = 'zip') {
-        zipName = zipName ? `${zipName}.${ext}` : `${path_1.default.basename(projectPath)}.${ext}`;
-        const zipPath = path_1.default.join(projectPath, outputDir);
-        return path_1.default.join(zipPath, zipName);
-    }
+  }
+  /**
+   * 根据项目路径，打包文件夹名和传入的压缩包名，生成压缩文件zip路径
+   * @param projectPath
+   * @param outputDir
+   * @param zipName
+   * @returns
+   */
+  static getFilePath(projectPath) {
+    let outputDir = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'dist';
+    let zipName = arguments.length > 2 ? arguments[2] : undefined;
+    let ext = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'zip';
+    zipName = zipName ? `${zipName}.${ext}` : `${_path.default.basename(projectPath)}.${ext}`;
+    const zipPath = _path.default.join(projectPath, outputDir);
+    return _path.default.join(zipPath, zipName);
+  }
 }
-exports.default = XtsFollowWorks;
+var _default = exports.default = XtsFollowWorks;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.0.2",
+  "version": "2.0.3-beta.10",
   "description": "The process tool for packaging aiot projects.",
   "keywords": [
     "aiotpack"
@@ -19,16 +19,16 @@
     "test": "node ./__tests__/aiotpack.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/generator": "2.0.2",
-    "@aiot-toolkit/parser": "2.0.2",
-    "@aiot-toolkit/shared-utils": "2.0.2",
+    "@aiot-toolkit/generator": "2.0.3-beta.10",
+    "@aiot-toolkit/parser": "2.0.3-beta.10",
+    "@aiot-toolkit/shared-utils": "2.0.3-beta.10",
     "@hap-toolkit/aaptjs": "^2.0.0",
     "@rspack/core": "^1.0.0",
     "aiot-parse5": "^1.0.0",
     "archiver": "^7.0.1",
     "babel-loader": "^9.1.3",
     "fast-glob": "^3.3.2",
-    "file-lane": "2.0.2",
+    "file-lane": "2.0.3-beta.10",
     "file-loader": "^6.2.0",
     "fs-extra": "^11.2.0",
     "jsrsasign": "^11.1.0",
@@ -45,5 +45,5 @@
     "@types/jsrsasign": "^10.5.12",
     "@types/webpack-sources": "^3.2.3"
   },
-  "gitHead": "8ca4bf2ed7bcf11911e5c514696951bdba4fc12d"
+  "gitHead": "e591934b19bc474453ce11b63f0c8bb0d8eb8bd9"
 }