@aiot-toolkit/aiotpack 2.0.3-beta.7 → 2.0.3-beta.8

package/lib/compiler/javascript/vela/utils/Jsc.js

@@ -1,39 +1,36 @@
 "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());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const shared_utils_1 = require("@aiot-toolkit/shared-utils");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _sharedUtils = require("@aiot-toolkit/shared-utils");
 /**
  * Jsc
  */
 class Jsc {
-    constructor(projectPath, buildPath) {
-        this.projectPath = projectPath;
-        this.buildPath = buildPath;
-    }
-    jsc() {
-        const { projectPath, buildPath } = this;
-        return shared_utils_1.CommonUtil.requireNodeModule(projectPath, `@aiot-toolkit/jsc`)
-            .then((module) => __awaiter(this, void 0, void 0, function* () {
-            const msg = yield module.default(buildPath);
-            if (msg) {
-                shared_utils_1.ColorConsole.success({ word: 'jsc command' }, msg);
-            }
-        }))
-            .then(() => {
-            return shared_utils_1.FileUtil.del(`${buildPath}/**/*.js`);
-        })
-            .catch((error) => {
-            shared_utils_1.ColorConsole.throw(error.message);
-            return Promise.reject(error);
-        });
-    }
+  constructor(projectPath, buildPath) {
+    this.projectPath = projectPath;
+    this.buildPath = buildPath;
+  }
+  jsc() {
+    const {
+      projectPath,
+      buildPath
+    } = this;
+    return _sharedUtils.CommonUtil.requireNodeModule(projectPath, `@aiot-toolkit/jsc`).then(async module => {
+      const msg = await module.default(buildPath);
+      if (msg) {
+        _sharedUtils.ColorConsole.success({
+          word: 'jsc command'
+        }, msg);
+      }
+    }).then(() => {
+      return _sharedUtils.FileUtil.del(`${buildPath}/**/*.js`);
+    }).catch(error => {
+      _sharedUtils.ColorConsole.throw(error.message);
+      return Promise.reject(error);
+    });
+  }
 }
-exports.default = Jsc;
+var _default = exports.default = Jsc;

package/lib/compiler/javascript/vela/utils/UxCompileUtil.js

@@ -1,142 +1,164 @@
 "use strict";
-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 EntryType_1 = __importDefault(require("../enum/EntryType"));
+
+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 _EntryType = _interopRequireDefault(require("../enum/EntryType"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class UxCompileUtil {
-    static clean(dirList) {
-        if (!dirList) {
-            return;
-        }
-        dirList.forEach((item) => {
-            if (fs_extra_1.default.existsSync(item)) {
-                if (fs_extra_1.default.statSync(item).isFile()) {
-                    fs_extra_1.default.unlinkSync(item);
-                }
-                else {
-                    fs_extra_1.default.rmSync(item, { recursive: true, force: true });
-                }
-            }
-        });
+  // 摘要文件夹
+  static DIGEST_ZIP_DIR = 'META-INF';
+  static clean(dirList) {
+    if (!dirList) {
+      return;
     }
-    /**
-     * 从项目配置文件中解析出入口文件
-     * @param config 项目配置文件的内容，应为json对象
-     * @param codeDir 源码目录
-     * @param projectPath 项目目录
-     * @returns {[入口名]:源文件路径}
-     */
-    static resolveEntries(config, codeDir, projectPath) {
-        const { router } = config;
-        if (!router) {
-            throw Error('No routing configured in manifest.json！');
-        }
-        const appFile = this.resolveFile(path_1.default.join(codeDir, 'app'));
-        if (!fs_extra_1.default.existsSync(appFile)) {
-            shared_utils_1.ColorConsole.throw(`App file does not exist`);
+    dirList.forEach(item => {
+      if (_fsExtra.default.existsSync(item)) {
+        if (_fsExtra.default.statSync(item).isFile()) {
+          _fsExtra.default.unlinkSync(item);
+        } else {
+          _fsExtra.default.rmSync(item, {
+            recursive: true,
+            force: true
+          });
         }
-        const { pages = {}, widgets = {}, floatingWindows = {} } = router;
-        const confsList = [
-            {
-                confs: pages,
-                type: EntryType_1.default.PAGE
-            },
-            {
-                confs: floatingWindows,
-                type: EntryType_1.default.FLOAT
-            },
-            {
-                confs: widgets,
-                type: EntryType_1.default.CARD
-            }
-        ];
-        // 1. 添加app
-        const result = {
-            app: `./${path_1.default.relative(projectPath, appFile)}?uxType=${EntryType_1.default.APP}`
-        };
-        // 2. 添加 route 配置的文件
-        confsList.forEach((item) => {
-            const { confs, type } = item;
-            Object.keys(confs).forEach((routePath) => {
-                if (/^\//.test(routePath)) {
-                    throw new Error(`Compilation failed: please confirm that '${routePath}' configured by router.pages in manifest.json is the directory name`);
-                }
-                const conf = confs[routePath];
-                const entryKey = path_1.default.join(routePath, conf.component);
-                const filePath = this.resolveFile(path_1.default.join(codeDir, entryKey));
-                if (!filePath) {
-                    throw new Error(`Compilation failed: please confirm that the file path ${entryKey} configured in manifest.json exists`);
-                }
-                let sourceFile = `./${path_1.default.relative(projectPath, filePath)}?uxType=${type}`;
-                sourceFile = sourceFile.replace(/\\/g, '/');
-                result[entryKey] = sourceFile;
-            });
-        });
-        // 3. 添加 workers
-        const { workers } = config;
-        if (workers && workers.entries && Array.isArray(workers.entries)) {
-            workers.entries
-                .filter((worker) => worker.file)
-                .forEach((worker) => {
-                result[worker.file.replace(/\.js$/, '')] = './src/' + worker.file;
-            });
-        }
-        // 4. 添加 services
-        const { services } = config;
-        // 数组格式
-        if (Array.isArray(services)) {
-            services.forEach((item) => {
-                const { name, path } = item;
-                if (name && path) {
-                    result['services/' + name] = './src/' + path + `?uxType=${EntryType_1.default.APP}`;
-                }
-            });
+      }
+    });
+  }
+
+  /**
+   * 从项目配置文件中解析出入口文件
+   * @param config 项目配置文件的内容，应为json对象
+   * @param codeDir 源码目录
+   * @param projectPath 项目目录
+   * @returns {[入口名]:源文件路径}
+   */
+  static resolveEntries(config, codeDir, projectPath) {
+    const {
+      router
+    } = config;
+    if (!router) {
+      throw Error('No routing configured in manifest.json！');
+    }
+    const appFile = this.resolveFile(_path.default.join(codeDir, 'app'));
+    if (!_fsExtra.default.existsSync(appFile)) {
+      _sharedUtils.ColorConsole.throw(`App file does not exist`);
+    }
+    const {
+      pages = {},
+      widgets = {},
+      floatingWindows = {}
+    } = router;
+    const confsList = [{
+      confs: pages,
+      type: _EntryType.default.PAGE
+    }, {
+      confs: floatingWindows,
+      type: _EntryType.default.FLOAT
+    }, {
+      confs: widgets,
+      type: _EntryType.default.CARD
+    }];
+
+    // 1. 添加app
+    const result = {
+      app: `./${_path.default.relative(projectPath, appFile)}?uxType=${_EntryType.default.APP}`
+    };
+
+    // 2. 添加 route 配置的文件
+    confsList.forEach(item => {
+      const {
+        confs,
+        type
+      } = item;
+      Object.keys(confs).forEach(routePath => {
+        if (/^\//.test(routePath)) {
+          throw new Error(`Compilation failed: please confirm that '${routePath}' configured by router.pages in manifest.json is the directory name`);
         }
-        // 字典格式
-        else {
-            for (const key in services) {
-                if (Object.hasOwnProperty.call(services, key)) {
-                    result['services/' + key] = './src/' + services[key].path + `?uxType=${EntryType_1.default.APP}`;
-                }
-            }
+        const conf = confs[routePath];
+        const entryKey = _path.default.join(routePath, conf.component);
+        const filePath = this.resolveFile(_path.default.join(codeDir, entryKey));
+        if (!filePath) {
+          throw new Error(`Compilation failed: please confirm that the file path ${entryKey} configured in manifest.json exists`);
         }
-        return result;
+        let sourceFile = `./${_path.default.relative(projectPath, filePath)}?uxType=${type}`;
+        sourceFile = sourceFile.replace(/\\/g, '/');
+        result[entryKey] = sourceFile;
+      });
+    });
+
+    // 3. 添加 workers
+    const {
+      workers
+    } = config;
+    if (workers && workers.entries && Array.isArray(workers.entries)) {
+      workers.entries.filter(worker => worker.file).forEach(worker => {
+        result[worker.file.replace(/\.js$/, '')] = './src/' + worker.file;
+      });
     }
-    /**
-     * 通过无后缀的文件名路径获取存在的文件路径
-     *
-     * @example
-     * const path = resolveFile('/project/a')
-     * // path = '/project/a.ux'
-     * @param filePath
-     */
-    static resolveFile(filePath) {
-        const extensionList = this.getExtensionList();
-        for (const item of extensionList) {
-            const currentPath = `${filePath}${item}`;
-            if (fs_extra_1.default.existsSync(currentPath)) {
-                return currentPath;
-            }
+
+    // 4. 添加 services
+    const {
+      services
+    } = config;
+    // 数组格式
+    if (Array.isArray(services)) {
+      services.forEach(item => {
+        const {
+          name,
+          path
+        } = item;
+        if (name && path) {
+          result['services/' + name] = './src/' + path + `?uxType=${_EntryType.default.APP}`;
         }
-        return '';
+      });
     }
-    /**
-     * 获取ux文件支持的后缀列表
-     * @param withDot
-     * @returns
-     */
-    static getExtensionList(withDot = true) {
-        const result = ['ux', 'hml'];
-        if (withDot) {
-            return result.map((item) => `.${item}`);
+    // 字典格式
+    else {
+      for (const key in services) {
+        if (Object.hasOwnProperty.call(services, key)) {
+          result['services/' + key] = './src/' + services[key].path + `?uxType=${_EntryType.default.APP}`;
         }
-        return result;
+      }
+    }
+    return result;
+  }
+
+  /**
+   * 通过无后缀的文件名路径获取存在的文件路径
+   *
+   * @example
+   * const path = resolveFile('/project/a')
+   * // path = '/project/a.ux'
+   * @param filePath
+   */
+  static resolveFile(filePath) {
+    const extensionList = this.getExtensionList();
+    for (const item of extensionList) {
+      const currentPath = `${filePath}${item}`;
+      if (_fsExtra.default.existsSync(currentPath)) {
+        return currentPath;
+      }
+    }
+    return '';
+  }
+
+  /**
+   * 获取ux文件支持的后缀列表
+   * @param withDot
+   * @returns
+   */
+  static getExtensionList() {
+    let withDot = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+    const result = ['ux', 'hml'];
+    if (withDot) {
+      return result.map(item => `.${item}`);
     }
+    return result;
+  }
 }
-// 摘要文件夹
-UxCompileUtil.DIGEST_ZIP_DIR = 'META-INF';
-exports.default = UxCompileUtil;
+var _default = exports.default = UxCompileUtil;