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

package/lib/loader/ux/vela/UxLoader.js

@@ -1,39 +1,33 @@
 "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 path_1 = __importDefault(require("path"));
-const UxLoaderUtils_1 = __importDefault(require("../../../utils/ux/UxLoaderUtils"));
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _path = _interopRequireDefault(require("path"));
+var _UxLoaderUtils = _interopRequireDefault(require("../../../utils/ux/UxLoaderUtils"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class UxLoader {
-    parser(files) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const resultFiles = [];
-            const { projectPath } = this.context;
-            for (const file of files) {
-                // 转换每个文件
-                const { files: compiledFiles, logs } = yield UxLoaderUtils_1.default.compileUxToJavascript(file, this.context, false, this.compilerOption);
-                this.logs = logs.map((item) => {
-                    var _a;
-                    return Object.assign(Object.assign({}, item), { filePath: ((_a = item.position) === null || _a === void 0 ? void 0 : _a.source)
-                            ? item.position.source
-                            : item.filePath
-                                ? path_1.default.relative(projectPath, item.filePath)
-                                : '' });
-                });
-                resultFiles.push(...compiledFiles);
-            }
-            return resultFiles;
-        });
+  async parser(files) {
+    const resultFiles = [];
+    const {
+      projectPath
+    } = this.context;
+    for (const file of files) {
+      // 转换每个文件
+      const {
+        files: compiledFiles,
+        logs
+      } = await _UxLoaderUtils.default.compileUxToJavascript(file, this.context, false, this.compilerOption);
+      this.logs = logs.map(item => {
+        return {
+          ...item,
+          filePath: item.position?.source ? item.position.source : item.filePath ? _path.default.relative(projectPath, item.filePath) : ''
+        };
+      });
+      resultFiles.push(...compiledFiles);
     }
+    return resultFiles;
+  }
 }
-exports.default = UxLoader;
+var _default = exports.default = UxLoader;

package/lib/loader/xts/XtsLoader.js

@@ -1,48 +1,62 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const generator_1 = require("@aiot-toolkit/generator");
-const parser_1 = require("@aiot-toolkit/parser");
-const shared_utils_1 = require("@aiot-toolkit/shared-utils");
-const path_1 = __importDefault(require("path"));
-const ts_morph_1 = require("ts-morph");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _generator = require("@aiot-toolkit/generator");
+var _parser = require("@aiot-toolkit/parser");
+var _sharedUtils = require("@aiot-toolkit/shared-utils");
+var _path = _interopRequireDefault(require("path"));
+var _tsMorph = require("ts-morph");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * XtsLoader
  */
 class XtsLoader {
-    parser(files) {
-        const project = new ts_morph_1.Project();
-        const resultFiles = [];
-        for (const file in files) {
-            const { path, content } = files[file];
-            const { name, ext } = path_1.default.parse(path);
-            const fullName = `${name}${ext}`;
-            const newFileName = `${name}.ts`;
-            //判断文本，空文本则结束该文件处理
-            if (!content) {
-                shared_utils_1.ColorConsole.warn(`The file '${fullName}' under the path '${path}' has no content `);
-                return [];
-            }
-            const parserResult = new parser_1.XtsParser(project, shared_utils_1.ColorConsole.logger).parser(content.toString(), fullName);
-            const { ast, mapList } = new parser_1.XtsToTypescript(project, shared_utils_1.ColorConsole.logger, this.context, path).translate(parserResult.ast, parserResult.offsetList);
-            const { code, sourcemap } = new generator_1.TypescriptGenerator().generate({
-                sourceFilePath: fullName,
-                targetFilePath: newFileName,
-                ast,
-                mapList
-            });
-            resultFiles.push({
-                path: shared_utils_1.FileUtil.updateFileName(path, newFileName),
-                content: code
-            }, {
-                path: shared_utils_1.FileUtil.updateFileName(path, `${name}.map.ts`),
-                content: sourcemap
-            });
-        }
-        // 返回内容
-        return resultFiles;
+  parser(files) {
+    const project = new _tsMorph.Project();
+    const resultFiles = [];
+    for (const file in files) {
+      const {
+        path,
+        content
+      } = files[file];
+      const {
+        name,
+        ext
+      } = _path.default.parse(path);
+      const fullName = `${name}${ext}`;
+      const newFileName = `${name}.ts`;
+      //判断文本，空文本则结束该文件处理
+      if (!content) {
+        _sharedUtils.ColorConsole.warn(`The file '${fullName}' under the path '${path}' has no content `);
+        return [];
+      }
+      const parserResult = new _parser.XtsParser(project, _sharedUtils.ColorConsole.logger).parser(content.toString(), fullName);
+      const {
+        ast,
+        mapList
+      } = new _parser.XtsToTypescript(project, _sharedUtils.ColorConsole.logger, this.context, path).translate(parserResult.ast, parserResult.offsetList);
+      const {
+        code,
+        sourcemap
+      } = new _generator.TypescriptGenerator().generate({
+        sourceFilePath: fullName,
+        targetFilePath: newFileName,
+        ast,
+        mapList
+      });
+      resultFiles.push({
+        path: _sharedUtils.FileUtil.updateFileName(path, newFileName),
+        content: code
+      }, {
+        path: _sharedUtils.FileUtil.updateFileName(path, `${name}.map.ts`),
+        content: sourcemap
+      });
     }
+    // 返回内容
+    return resultFiles;
+  }
 }
-exports.default = XtsLoader;
+var _default = exports.default = XtsLoader;

package/lib/utils/BeforeCompileUtils.js

@@ -1,115 +1,123 @@
 "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 };
-};
-var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
-const parser_1 = require("@aiot-toolkit/parser");
-const shared_utils_1 = require("@aiot-toolkit/shared-utils");
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const path_1 = __importDefault(require("path"));
-const TranslateCache_1 = __importDefault(require("@aiot-toolkit/parser/lib/ux/translate/vela/TranslateCache"));
-const UxFileUtils_1 = __importDefault(require("./ux/UxFileUtils"));
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _parser = require("@aiot-toolkit/parser");
+var _sharedUtils = require("@aiot-toolkit/shared-utils");
+var _fsExtra = _interopRequireDefault(require("fs-extra"));
+var _path = _interopRequireDefault(require("path"));
+var _TranslateCache = _interopRequireDefault(require("@aiot-toolkit/parser/lib/ux/translate/vela/TranslateCache"));
+var _UxFileUtils = _interopRequireDefault(require("./ux/UxFileUtils"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const BinaryPlugin = require('@aiot-toolkit/parser/lib/ux/translate/vela/protobuf/BinaryPlugin');
+
 /**
  * BeforeCompileUtils
  */
 class BeforeCompileUtils {
-}
-_a = BeforeCompileUtils;
-/**
- * 获取ux项目的路由入口
- * @param context
- * @param fileList
- * @returns
- */
-BeforeCompileUtils.getEntries = (params) => {
-    const { context, compilerOption } = params;
-    const { projectPath } = context;
-    const srcPath = path_1.default.join(projectPath, compilerOption.sourceRoot);
+  /**
+   * 获取ux项目的路由入口
+   * @param context
+   * @param fileList
+   * @returns
+   */
+  static getEntries = params => {
+    const {
+      context,
+      compilerOption
+    } = params;
+    const {
+      projectPath
+    } = context;
+    const srcPath = _path.default.join(projectPath, compilerOption.sourceRoot);
     // 判断路径是否真实存在
-    const manifestContent = UxFileUtils_1.default.getMainfestInfo(projectPath);
+    const manifestContent = _UxFileUtils.default.getMainfestInfo(projectPath);
     // 存储entries
     let entryList = [];
-    const { router } = manifestContent;
+    const {
+      router
+    } = manifestContent;
     if (router) {
-        const { pages } = router;
-        if (pages) {
-            Object.keys(pages).map((page) => {
-                const pageContent = pages[page];
-                const entryDir = path_1.default.join(srcPath, page);
-                const entryPages = parser_1.ExtensionConfig.TEMPLATES.map((item) => `${pageContent.component}${item}`);
-                const entry = entryPages.find((item) => fs_extra_1.default.existsSync(path_1.default.join(entryDir, item)));
-                if (entry) {
-                    entryList.push(path_1.default.join(entryDir, entry));
-                }
-                else {
-                    // 路径不存在
-                    shared_utils_1.ColorConsole.throw(`### manifest ### path '${path_1.default.join(entryDir, entryPages.join(' | '))}' does not exist`);
-                }
-            });
-        }
-        else {
-            // 没有pages配置
-            shared_utils_1.ColorConsole.throw(`### manifest ### No pages configuration`);
-        }
-    }
-    else {
-        // 没有router配置
-        shared_utils_1.ColorConsole.throw(`### manifest ### No router configuration`);
+      const {
+        pages
+      } = router;
+      if (pages) {
+        Object.keys(pages).map(page => {
+          const pageContent = pages[page];
+          const entryDir = _path.default.join(srcPath, page);
+          const entryPages = _parser.ExtensionConfig.TEMPLATES.map(item => `${pageContent.component}${item}`);
+          const entry = entryPages.find(item => _fsExtra.default.existsSync(_path.default.join(entryDir, item)));
+          if (entry) {
+            entryList.push(_path.default.join(entryDir, entry));
+          } else {
+            // 路径不存在
+            _sharedUtils.ColorConsole.throw(`### manifest ### path '${_path.default.join(entryDir, entryPages.join(' | '))}' does not exist`);
+          }
+        });
+      } else {
+        // 没有pages配置
+        _sharedUtils.ColorConsole.throw(`### manifest ### No pages configuration`);
+      }
+    } else {
+      // 没有router配置
+      _sharedUtils.ColorConsole.throw(`### manifest ### No router configuration`);
     }
     context['entries'] = entryList;
     return Promise.resolve();
-};
-BeforeCompileUtils.clean = (params) => __awaiter(void 0, void 0, void 0, function* () {
-    const { context, compilerOption, compalition } = params;
+  };
+  static clean = async params => {
+    const {
+      context,
+      compilerOption,
+      compalition
+    } = params;
     if (compilerOption) {
-        // 存储build中的文件列表
-        const buildPath = path_1.default.join(context.projectPath, compilerOption.outputPath);
-        const buildFileList = fs_extra_1.default.existsSync(buildPath)
-            ? shared_utils_1.FileUtil.readAlldirSync(buildPath).map((filePath) => {
-                const relativePath = path_1.default.relative(buildPath, filePath);
-                const fileContent = fs_extra_1.default.readFileSync(filePath);
-                return { path: relativePath, content: fileContent };
-            })
-            : [];
-        if (compalition) {
-            compalition.buildFileList = buildFileList;
-        }
+      // 存储build中的文件列表
+      const buildPath = _path.default.join(context.projectPath, compilerOption.outputPath);
+      const buildFileList = _fsExtra.default.existsSync(buildPath) ? _sharedUtils.FileUtil.readAlldirSync(buildPath).map(filePath => {
+        const relativePath = _path.default.relative(buildPath, filePath);
+        const fileContent = _fsExtra.default.readFileSync(filePath);
+        return {
+          path: relativePath,
+          content: fileContent
+        };
+      }) : [];
+      if (compalition) {
+        compalition.buildFileList = buildFileList;
+      }
     }
-    context.translateCache = new TranslateCache_1.default();
+    context.translateCache = new _TranslateCache.default();
     BinaryPlugin.reset();
     BinaryPlugin.config = {
-        projectPath: context.projectPath,
-        outputProjectPath: path_1.default.join(context.projectPath, context.output),
-        source: compilerOption === null || compilerOption === void 0 ? void 0 : compilerOption.sourceRoot,
-        output: compilerOption === null || compilerOption === void 0 ? void 0 : compilerOption.outputPath
+      projectPath: context.projectPath,
+      outputProjectPath: _path.default.join(context.projectPath, context.output),
+      source: compilerOption?.sourceRoot,
+      output: compilerOption?.outputPath
     };
-});
-/**
- * 获取项目的全局样式变量配置
- * @param context
- */
-BeforeCompileUtils.getGlobalVar = (params) => {
-    const { context, compilerOption } = params;
-    const { projectPath } = context;
-    const filePath = path_1.default.join(projectPath, (compilerOption === null || compilerOption === void 0 ? void 0 : compilerOption.sourceRoot) || '', 'globalVar.json');
+  };
+  /**
+   * 获取项目的全局样式变量配置
+   * @param context
+   */
+  static getGlobalVar = params => {
+    const {
+      context,
+      compilerOption
+    } = params;
+    const {
+      projectPath
+    } = context;
+    const filePath = _path.default.join(projectPath, compilerOption?.sourceRoot || '', 'globalVar.json');
     let globalVar = {};
     // 判断文件是否存在
-    if (fs_extra_1.default.existsSync(filePath)) {
-        // 存在则取内容，否则内容为空
-        globalVar = fs_extra_1.default.readJSONSync(filePath);
+    if (_fsExtra.default.existsSync(filePath)) {
+      // 存在则取内容，否则内容为空
+      globalVar = _fsExtra.default.readJSONSync(filePath);
     }
     context.globalVar = globalVar;
     return Promise.resolve();
-};
-exports.default = BeforeCompileUtils;
+  };
+}
+var _default = exports.default = BeforeCompileUtils;

package/lib/utils/PngUtils.js

@@ -1,43 +1,49 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-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 _fsExtra = _interopRequireDefault(require("fs-extra"));
+var _path = _interopRequireDefault(require("path"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * PngUtils
  */
 class PngUtils {
-    /**
-     * 检测.9.png是否编码
-     * @param filePath
-     * @returns
-     */
-    static isEncode9Png(filePath) {
-        const buff = fs_extra_1.default.readFileSync(filePath);
-        const start = 37;
-        const end = 41;
-        const encode = buff.subarray(start, end).toString() === 'npTc' ||
-            buff.subarray(start, end).toString() === 'npOl';
-        return encode;
-    }
-    /**
-     * 计算文件转换后的目标路径
-     * @param filePath
-     * @param context
-     * @returns
-     */
-    static convertOutputPath(filePath, context) {
-        const { projectPath, output } = context;
-        const fileRelativePath = path_1.default.relative(projectPath, filePath);
-        const outputPath = path_1.default.join(projectPath, output, fileRelativePath);
-        const outputDir = path_1.default.dirname(outputPath);
-        // 判断输出文件夹是否存在，不存在则循环创建
-        if (!fs_extra_1.default.existsSync(outputDir)) {
-            fs_extra_1.default.mkdirSync(outputDir, { recursive: true });
-        }
-        return outputPath;
+  /**
+   * 检测.9.png是否编码
+   * @param filePath
+   * @returns
+   */
+  static isEncode9Png(filePath) {
+    const buff = _fsExtra.default.readFileSync(filePath);
+    const start = 37;
+    const end = 41;
+    const encode = buff.subarray(start, end).toString() === 'npTc' || buff.subarray(start, end).toString() === 'npOl';
+    return encode;
+  }
+  /**
+   * 计算文件转换后的目标路径
+   * @param filePath
+   * @param context
+   * @returns
+   */
+  static convertOutputPath(filePath, context) {
+    const {
+      projectPath,
+      output
+    } = context;
+    const fileRelativePath = _path.default.relative(projectPath, filePath);
+    const outputPath = _path.default.join(projectPath, output, fileRelativePath);
+    const outputDir = _path.default.dirname(outputPath);
+    // 判断输出文件夹是否存在，不存在则循环创建
+    if (!_fsExtra.default.existsSync(outputDir)) {
+      _fsExtra.default.mkdirSync(outputDir, {
+        recursive: true
+      });
     }
+    return outputPath;
+  }
 }
-exports.default = PngUtils;
+var _default = exports.default = PngUtils;