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

package/lib/index.js

@@ -1,42 +1,89 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.skipList = exports.UxFileUtils = exports.setServerPort = exports.CompileMode = exports.JavascriptDefaultCompileOption = exports.UxConfig = exports.XtsConfig = void 0;
-const XtsConfig_1 = __importDefault(require("./config/XtsConfig"));
-exports.XtsConfig = XtsConfig_1.default;
-const JavascriptDefaultCompileOption_1 = __importStar(require("./compiler/javascript/JavascriptDefaultCompileOption"));
-exports.JavascriptDefaultCompileOption = JavascriptDefaultCompileOption_1.default;
-Object.defineProperty(exports, "setServerPort", { enumerable: true, get: function () { return JavascriptDefaultCompileOption_1.setServerPort; } });
-const UxConfig_1 = __importDefault(require("./config/UxConfig"));
-exports.UxConfig = UxConfig_1.default;
-const CompileMode_1 = __importDefault(require("./compiler/enum/CompileMode"));
-exports.CompileMode = CompileMode_1.default;
-const UxFileUtils_1 = __importDefault(require("./utils/ux/UxFileUtils"));
-exports.UxFileUtils = UxFileUtils_1.default;
-const ICompileOptions_1 = require("./interface/ICompileOptions");
-Object.defineProperty(exports, "skipList", { enumerable: true, get: function () { return ICompileOptions_1.skipList; } });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "CompileMode", {
+  enumerable: true,
+  get: function () {
+    return _CompileMode.default;
+  }
+});
+Object.defineProperty(exports, "IJavascriptCompileOption", {
+  enumerable: true,
+  get: function () {
+    return _IJavascriptCompileOption.default;
+  }
+});
+Object.defineProperty(exports, "IManifest", {
+  enumerable: true,
+  get: function () {
+    return _IManifest.default;
+  }
+});
+Object.defineProperty(exports, "IQuickAppConfig", {
+  enumerable: true,
+  get: function () {
+    return _IQuickAppConfig.default;
+  }
+});
+Object.defineProperty(exports, "ISkipList", {
+  enumerable: true,
+  get: function () {
+    return _ICompileOptions.ISkipList;
+  }
+});
+Object.defineProperty(exports, "IXtsCompileOptions", {
+  enumerable: true,
+  get: function () {
+    return _ICompileOptions.IXtsCompileOptions;
+  }
+});
+Object.defineProperty(exports, "JavascriptDefaultCompileOption", {
+  enumerable: true,
+  get: function () {
+    return _JavascriptDefaultCompileOption.default;
+  }
+});
+Object.defineProperty(exports, "UxConfig", {
+  enumerable: true,
+  get: function () {
+    return _UxConfig.default;
+  }
+});
+Object.defineProperty(exports, "UxFileUtils", {
+  enumerable: true,
+  get: function () {
+    return _UxFileUtils.default;
+  }
+});
+Object.defineProperty(exports, "XtsConfig", {
+  enumerable: true,
+  get: function () {
+    return _XtsConfig.default;
+  }
+});
+Object.defineProperty(exports, "setServerPort", {
+  enumerable: true,
+  get: function () {
+    return _JavascriptDefaultCompileOption.setServerPort;
+  }
+});
+Object.defineProperty(exports, "skipList", {
+  enumerable: true,
+  get: function () {
+    return _ICompileOptions.skipList;
+  }
+});
+var _XtsConfig = _interopRequireDefault(require("./config/XtsConfig"));
+var _JavascriptDefaultCompileOption = _interopRequireWildcard(require("./compiler/javascript/JavascriptDefaultCompileOption"));
+var _UxConfig = _interopRequireDefault(require("./config/UxConfig"));
+var _CompileMode = _interopRequireDefault(require("./compiler/enum/CompileMode"));
+var _IJavascriptCompileOption = _interopRequireDefault(require("./compiler/javascript/interface/IJavascriptCompileOption"));
+var _IQuickAppConfig = _interopRequireDefault(require("./compiler/javascript/vela/interface/IQuickAppConfig"));
+var _UxFileUtils = _interopRequireDefault(require("./utils/ux/UxFileUtils"));
+var _IManifest = _interopRequireDefault(require("./compiler/javascript/vela/interface/IManifest"));
+var _ICompileOptions = require("./interface/ICompileOptions");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }

package/lib/interface/ICompileOptions.js

@@ -1,4 +1,7 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.skipList = void 0;
-exports.skipList = ['xts2ts', 'install', 'ts2wasm', 'package'];
+const skipList = exports.skipList = ['xts2ts', 'install', 'ts2wasm', 'package'];

package/lib/interface/IDeviceList.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+"use strict";

package/lib/loader/ux/JsLoader.js

@@ -1,36 +1,38 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const parser_1 = require("@aiot-toolkit/parser");
-const shared_utils_1 = require("@aiot-toolkit/shared-utils");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _parser = require("@aiot-toolkit/parser");
+var _sharedUtils = require("@aiot-toolkit/shared-utils");
 /**
  * JsLoader
  */
 class JsLoader {
-    parser(files) {
-        const onLog = () => { };
-        return files.map((item) => {
-            if (!item.content) {
-                return {
-                    path: item.path,
-                    content: item.content
-                };
-            }
-            const options = {
-                filePath: item.path,
-                projectPath: this.context.projectPath,
-                content: item.content.toString(),
-                projectType: shared_utils_1.ProjectType.getProjectType(this.context.projectPath),
-                onLog
-            };
-            return {
-                path: item.path,
-                content: new parser_1.ScriptToTypescript(options, this.compilerOption, this.context)
-                    .translate({
-                    content: new parser_1.ScriptParser(options).parser(item.content.toString()).ast.content
-                }, [])
-                    .targetTree.getFullText()
-            };
-        });
-    }
+  parser(files) {
+    const onLog = () => {};
+    return files.map(item => {
+      if (!item.content) {
+        return {
+          path: item.path,
+          content: item.content
+        };
+      }
+      const options = {
+        filePath: item.path,
+        projectPath: this.context.projectPath,
+        content: item.content.toString(),
+        projectType: _sharedUtils.ProjectType.getProjectType(this.context.projectPath),
+        onLog
+      };
+      return {
+        path: item.path,
+        content: new _parser.ScriptToTypescript(options, this.compilerOption, this.context).translate({
+          content: new _parser.ScriptParser(options).parser(item.content.toString()).ast.content
+        }, []).targetTree.getFullText()
+      };
+    });
+  }
 }
-exports.default = JsLoader;
+var _default = exports.default = JsLoader;

package/lib/loader/ux/PngLoader.js

@@ -1,64 +1,58 @@
 "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 path_1 = __importDefault(require("path"));
-const PngUtils_1 = __importDefault(require("../../utils/PngUtils"));
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _sharedUtils = require("@aiot-toolkit/shared-utils");
+var _path = _interopRequireDefault(require("path"));
+var _PngUtils = _interopRequireDefault(require("../../utils/PngUtils"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const aaptjs = require('@hap-toolkit/aaptjs');
+
 /**
  * PngLoader
  */
 class PngLoader {
-    parser(files) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const resultFiles = [];
-            for (const file of files) {
-                const { path: filePath, content } = file;
-                const { name, ext } = path_1.default.parse(filePath);
-                const fullName = `${name}${ext}`;
-                //判断文本，空文本则结束该文件处理
-                if (!content) {
-                    shared_utils_1.ColorConsole.warn(`The file '${fullName}' under the path '${filePath}' has no content `);
-                    return [];
-                }
-                // 判断传入的.png资源是不是.9.png资源
-                if (shared_utils_1.FileUtil.match(filePath, /.+\.9\.png$/)) {
-                    yield this.compile9Png(filePath);
-                }
-                else {
-                    resultFiles.push(file);
-                }
-            }
-            return resultFiles;
-        });
+  async parser(files) {
+    const resultFiles = [];
+    for (const file of files) {
+      const {
+        path: filePath,
+        content
+      } = file;
+      const {
+        name,
+        ext
+      } = _path.default.parse(filePath);
+      const fullName = `${name}${ext}`;
+      //判断文本，空文本则结束该文件处理
+      if (!content) {
+        _sharedUtils.ColorConsole.warn(`The file '${fullName}' under the path '${filePath}' has no content `);
+        return [];
+      }
+      // 判断传入的.png资源是不是.9.png资源
+      if (_sharedUtils.FileUtil.match(filePath, /.+\.9\.png$/)) {
+        await this.compile9Png(filePath);
+      } else {
+        resultFiles.push(file);
+      }
     }
-    compile9Png(filePath) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // 判断.9.png是否经过编码处理
-            if (!PngUtils_1.default.isEncode9Png(filePath)) {
-                // 将.9.png资源使用@hap-toolkit/aaptjs处理
-                const outputFile = PngUtils_1.default.convertOutputPath(filePath, this.context);
-                try {
-                    yield aaptjs.singleCrunch(filePath, outputFile);
-                }
-                catch (error) {
-                    shared_utils_1.ColorConsole.throw(`.9.png resource file processing failed`);
-                }
-            }
-        });
+    return resultFiles;
+  }
+  async compile9Png(filePath) {
+    // 判断.9.png是否经过编码处理
+    if (!_PngUtils.default.isEncode9Png(filePath)) {
+      // 将.9.png资源使用@hap-toolkit/aaptjs处理
+      const outputFile = _PngUtils.default.convertOutputPath(filePath, this.context);
+      try {
+        await aaptjs.singleCrunch(filePath, outputFile);
+      } catch (error) {
+        _sharedUtils.ColorConsole.throw(`.9.png resource file processing failed`);
+      }
     }
+  }
 }
 ;
 PngLoader.raw = true;
-exports.default = PngLoader;
+var _default = exports.default = PngLoader;

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

@@ -1,38 +1,37 @@
 "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 AndroidUx_1 = __importDefault(require("../../../utils/ux/android/AndroidUx"));
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _path = _interopRequireDefault(require("path"));
+var _AndroidUx = _interopRequireDefault(require("../../../utils/ux/android/AndroidUx"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * UxLoader
  */
 class UxLoader {
-    parser(files) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const result = [];
-            const { projectPath } = this.context;
-            for (let item of files) {
-                const { files, logs } = yield new AndroidUx_1.default().compileUx({
-                    context: this.context,
-                    file: item,
-                    compilerOption: this.compilerOption
-                });
-                this.logs = logs.map((item) => (Object.assign(Object.assign({}, item), { filePath: item.filePath ? path_1.default.relative(projectPath, item.filePath) : '' })));
-                result.push(...files);
-            }
-            return result;
-        });
+  async parser(files) {
+    const result = [];
+    const {
+      projectPath
+    } = this.context;
+    for (let item of files) {
+      const {
+        files,
+        logs
+      } = await new _AndroidUx.default().compileUx({
+        context: this.context,
+        file: item,
+        compilerOption: this.compilerOption
+      });
+      this.logs = logs.map(item => ({
+        ...item,
+        filePath: item.filePath ? _path.default.relative(projectPath, item.filePath) : ''
+      }));
+      result.push(...files);
     }
+    return result;
+  }
 }
-exports.default = UxLoader;
+var _default = exports.default = UxLoader;

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

@@ -1,31 +1,30 @@
 "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 }; }
 /**
  * 处理app.ux的Loader
  * AppUxLoader
  */
 class AppUxLoader {
-    parser(files) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { projectPath } = this.context;
-            const { files: resultFiles, logs } = yield UxLoaderUtils_1.default.compileAppUxToJavascript(files[0], this.context, this.compilerOption);
-            this.logs = logs.map((item) => (Object.assign(Object.assign({}, item), { filePath: item.filePath ? path_1.default.relative(projectPath, item.filePath) : '' })));
-            return resultFiles;
-        });
-    }
+  async parser(files) {
+    const {
+      projectPath
+    } = this.context;
+    const {
+      files: resultFiles,
+      logs
+    } = await _UxLoaderUtils.default.compileAppUxToJavascript(files[0], this.context, this.compilerOption);
+    this.logs = logs.map(item => ({
+      ...item,
+      filePath: item.filePath ? _path.default.relative(projectPath, item.filePath) : ''
+    }));
+    return resultFiles;
+  }
 }
-exports.default = AppUxLoader;
+var _default = exports.default = AppUxLoader;

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

@@ -1,63 +1,67 @@
 "use strict";
-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 fs_1 = __importDefault(require("fs"));
-const parser_1 = require("@aiot-toolkit/parser");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _path = _interopRequireDefault(require("path"));
+var _fs = _interopRequireDefault(require("fs"));
+var _parser = require("@aiot-toolkit/parser");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * HmlLoader
  */
 class HmlLoader {
-    parser(files) {
-        return files.map((file) => {
-            return this.wrapHml(file);
-        });
+  parser(files) {
+    return files.map(file => {
+      return this.wrapHml(file);
+    });
+  }
+
+  /**
+   * 包裹 hml 文件
+   *
+   * # 路径
+   * 如果存在同路径的 ux 后缀，报错；否则转换为同路径的 ux 后缀
+   *
+   * # 内容
+   * 1. 给hml的内容加上<template></template>
+   * 2. 如果存在同路径同名的 script文件，则加到<script></script>中
+   * 3. 如果存在同路径同名的 style文件，则加到<style></style>中
+   *
+   * @param file
+   */
+  wrapHml(file) {
+    const {
+      path,
+      content
+    } = file;
+    const uxExt = _parser.ExtensionConfig.UX;
+    const getFilePath = ext => {
+      const pathParsed = _path.default.parse(path);
+      pathParsed.ext = ext;
+      pathParsed.base = pathParsed.name + ext;
+      return _path.default.format(pathParsed);
+    };
+    const uxPath = getFilePath(uxExt);
+    if (_fs.default.existsSync(uxPath)) {
+      throw new Error(`${uxPath} already exists`);
     }
-    /**
-     * 包裹 hml 文件
-     *
-     * # 路径
-     * 如果存在同路径的 ux 后缀，报错；否则转换为同路径的 ux 后缀
-     *
-     * # 内容
-     * 1. 给hml的内容加上<template></template>
-     * 2. 如果存在同路径同名的 script文件，则加到<script></script>中
-     * 3. 如果存在同路径同名的 style文件，则加到<style></style>中
-     *
-     * @param file
-     */
-    wrapHml(file) {
-        const { path, content } = file;
-        const uxExt = parser_1.ExtensionConfig.UX;
-        const getFilePath = (ext) => {
-            const pathParsed = path_1.default.parse(path);
-            pathParsed.ext = ext;
-            pathParsed.base = pathParsed.name + ext;
-            return path_1.default.format(pathParsed);
-        };
-        const uxPath = getFilePath(uxExt);
-        if (fs_1.default.existsSync(uxPath)) {
-            throw new Error(`${uxPath} already exists`);
-        }
-        const scriptExts = parser_1.ExtensionConfig.SCRIPTS;
-        const styleExts = parser_1.ExtensionConfig.STYLES;
-        const scriptPath = scriptExts
-            .map((item) => getFilePath(item))
-            .find((item) => fs_1.default.existsSync(item));
-        const stylePath = styleExts.map((item) => getFilePath(item)).find((item) => fs_1.default.existsSync(item));
-        let uxContent = ['<template>', content, '</template>'].join('\n');
-        if (scriptPath) {
-            uxContent += ['<script>', fs_1.default.readFileSync(scriptPath, 'utf-8'), '</script>'].join('\n');
-        }
-        if (stylePath) {
-            uxContent += ['<style>', fs_1.default.readFileSync(stylePath, 'utf-8'), '</style>'].join('\n');
-        }
-        return {
-            path,
-            content: uxContent
-        };
+    const scriptExts = _parser.ExtensionConfig.SCRIPTS;
+    const styleExts = _parser.ExtensionConfig.STYLES;
+    const scriptPath = scriptExts.map(item => getFilePath(item)).find(item => _fs.default.existsSync(item));
+    const stylePath = styleExts.map(item => getFilePath(item)).find(item => _fs.default.existsSync(item));
+    let uxContent = ['<template>', content, '</template>'].join('\n');
+    if (scriptPath) {
+      uxContent += ['<script>', _fs.default.readFileSync(scriptPath, 'utf-8'), '</script>'].join('\n');
     }
+    if (stylePath) {
+      uxContent += ['<style>', _fs.default.readFileSync(stylePath, 'utf-8'), '</style>'].join('\n');
+    }
+    return {
+      path,
+      content: uxContent
+    };
+  }
 }
-exports.default = HmlLoader;
+var _default = exports.default = HmlLoader;