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

package/lib/compiler/javascript/vela/utils/signature/Signer.js

@@ -1,28 +1,30 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const crypto_1 = __importDefault(require("crypto"));
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _crypto = _interopRequireDefault(require("crypto"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Signer
  */
 class Signer {
-    static setRemoteCryptoSignFunction(fn) {
-        Signer._cryptoSignFunction = fn;
-    }
-    static getRemoteCryptoSignFunction() {
-        return Signer._cryptoSignFunction;
-    }
-    /**
-     * 使用RSA-SHA256
-     * @param buffer
-     * @param prikey
-     */
-    static defaultCryptoSignFunction(buffer, prikey) {
-        const signer = crypto_1.default.createSign('RSA-SHA256');
-        signer.update(buffer);
-        return signer.sign(prikey);
-    }
+  static setRemoteCryptoSignFunction(fn) {
+    Signer._cryptoSignFunction = fn;
+  }
+  static getRemoteCryptoSignFunction() {
+    return Signer._cryptoSignFunction;
+  }
+  /**
+   * 使用RSA-SHA256
+   * @param buffer
+   * @param prikey
+   */
+  static defaultCryptoSignFunction(buffer, prikey) {
+    const signer = _crypto.default.createSign('RSA-SHA256');
+    signer.update(buffer);
+    return signer.sign(prikey);
+  }
 }
-exports.default = Signer;
+var _default = exports.default = Signer;

package/lib/compiler/javascript/vela/utils/webpackLoader/addColSourceMap.js

@@ -1,56 +1,51 @@
 "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 parser_1 = require("@aiot-toolkit/parser");
-function addColSourceMap(source, map) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const callback = this.async();
-        if (!map) {
-            callback(null, source, map);
-        }
-        let { consumer, tempGenerator } = yield parser_1.SourceMapUtil.createConsumerAndGenerator(JSON.stringify(map));
-        let recordLine = -1;
-        consumer.eachMapping((mapping) => {
-            if (mapping.source === consumer.sources[consumer.sources.length - 1]) {
-                if (recordLine < mapping.generatedLine &&
-                    (mapping.generatedColumn !== 0 || mapping.originalColumn !== 0)) {
-                    tempGenerator.addMapping({
-                        generated: {
-                            line: mapping.generatedLine,
-                            column: 0
-                        },
-                        original: {
-                            line: mapping.originalLine,
-                            column: 0
-                        },
-                        source: mapping.source,
-                        name: ''
-                    });
-                }
-                recordLine = mapping.generatedLine;
-            }
-            tempGenerator.addMapping({
-                generated: {
-                    line: mapping.generatedLine,
-                    column: mapping.generatedColumn
-                },
-                original: {
-                    line: mapping.originalLine,
-                    column: mapping.originalColumn
-                },
-                source: mapping.source,
-                name: mapping.name
-            });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _parser = require("@aiot-toolkit/parser");
+async function addColSourceMap(source, map) {
+  const callback = this.async();
+  if (!map) {
+    callback(null, source, map);
+  }
+  let {
+    consumer,
+    tempGenerator
+  } = await _parser.SourceMapUtil.createConsumerAndGenerator(JSON.stringify(map));
+  let recordLine = -1;
+  consumer.eachMapping(mapping => {
+    if (mapping.source === consumer.sources[consumer.sources.length - 1]) {
+      if (recordLine < mapping.generatedLine && (mapping.generatedColumn !== 0 || mapping.originalColumn !== 0)) {
+        tempGenerator.addMapping({
+          generated: {
+            line: mapping.generatedLine,
+            column: 0
+          },
+          original: {
+            line: mapping.originalLine,
+            column: 0
+          },
+          source: mapping.source,
+          name: ''
         });
-        callback(null, source, JSON.parse(tempGenerator.toString()));
+      }
+      recordLine = mapping.generatedLine;
+    }
+    tempGenerator.addMapping({
+      generated: {
+        line: mapping.generatedLine,
+        column: mapping.generatedColumn
+      },
+      original: {
+        line: mapping.originalLine,
+        column: mapping.originalColumn
+      },
+      source: mapping.source,
+      name: mapping.name
     });
+  });
+  callback(null, source, JSON.parse(tempGenerator.toString()));
 }
-exports.default = addColSourceMap;
+var _default = exports.default = addColSourceMap;

package/lib/compiler/javascript/vela/utils/webpackLoader/extractMapData.js

@@ -1,20 +1,24 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _fs = _interopRequireDefault(require("fs"));
+var _path = _interopRequireDefault(require("path"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function extractMapData(source, map) {
-    const enterFilePath = this.resourcePath;
-    // 获取当前文件夹和文件名
-    const dirName = path_1.default.dirname(enterFilePath);
-    const fileName = path_1.default.basename(enterFilePath);
-    // 取到对应的map文件内容
-    const mapFilePath = path_1.default.join(dirName, fileName + '.map');
-    if (fs_1.default.existsSync(mapFilePath)) {
-        map = fs_1.default.readFileSync(mapFilePath, { encoding: 'utf-8' });
-    }
-    this.callback(null, source, map && JSON.parse(map));
+  const enterFilePath = this.resourcePath;
+  // 获取当前文件夹和文件名
+  const dirName = _path.default.dirname(enterFilePath);
+  const fileName = _path.default.basename(enterFilePath);
+  // 取到对应的map文件内容
+  const mapFilePath = _path.default.join(dirName, fileName + '.map');
+  if (_fs.default.existsSync(mapFilePath)) {
+    map = _fs.default.readFileSync(mapFilePath, {
+      encoding: 'utf-8'
+    });
+  }
+  this.callback(null, source, map && JSON.parse(map));
 }
-exports.default = extractMapData;
+var _default = exports.default = extractMapData;

package/lib/config/UxConfig.js

@@ -1,179 +1,151 @@
 "use strict";
-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 fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const JsLoader_1 = __importDefault(require("../loader/ux/JsLoader"));
-const PngLoader_1 = __importDefault(require("../loader/ux/PngLoader"));
-const AppUxLoader_1 = __importDefault(require("../loader/ux/vela/AppUxLoader"));
-const HmlLoader_1 = __importDefault(require("../loader/ux/vela/HmlLoader"));
-const UxLoader_1 = __importDefault(require("../loader/ux/vela/UxLoader"));
-const UxLoader_2 = __importDefault(require("../loader/ux/android/UxLoader"));
-const UxBeforeWorks_1 = __importDefault(require("../beforeWorks/ux/UxBeforeWorks"));
-const UxAfterWorks_1 = __importDefault(require("../afterWorks/ux/UxAfterWorks"));
-const UxAfterCompile_1 = __importDefault(require("../afterCompile/ux/UxAfterCompile"));
-const UxBeforeCompile_1 = __importDefault(require("../beforeCompile/ux/UxBeforeCompile"));
-const BeforeCompileUtils_1 = __importDefault(require("../utils/BeforeCompileUtils"));
-const IChangedFile_1 = require("file-lane/lib/interface/IChangedFile");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _parser = require("@aiot-toolkit/parser");
+var _sharedUtils = require("@aiot-toolkit/shared-utils");
+var _fs = _interopRequireDefault(require("fs"));
+var _path = _interopRequireDefault(require("path"));
+var _JsLoader = _interopRequireDefault(require("../loader/ux/JsLoader"));
+var _PngLoader = _interopRequireDefault(require("../loader/ux/PngLoader"));
+var _AppUxLoader = _interopRequireDefault(require("../loader/ux/vela/AppUxLoader"));
+var _HmlLoader = _interopRequireDefault(require("../loader/ux/vela/HmlLoader"));
+var _UxLoader = _interopRequireDefault(require("../loader/ux/vela/UxLoader"));
+var _UxLoader2 = _interopRequireDefault(require("../loader/ux/android/UxLoader"));
+var _UxBeforeWorks = _interopRequireDefault(require("../beforeWorks/ux/UxBeforeWorks"));
+var _UxAfterWorks = _interopRequireDefault(require("../afterWorks/ux/UxAfterWorks"));
+var _UxAfterCompile = _interopRequireDefault(require("../afterCompile/ux/UxAfterCompile"));
+var _UxBeforeCompile = _interopRequireDefault(require("../beforeCompile/ux/UxBeforeCompile"));
+var _BeforeCompileUtils = _interopRequireDefault(require("../utils/BeforeCompileUtils"));
+var _IChangedFile = require("file-lane/lib/interface/IChangedFile");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class UxConfig {
-    constructor(projectPath) {
-        this.projectPath = projectPath;
-        /**
-         * 1. 取项目中所有的真实文件
-         *  1.1 无entryFileList时
-         *  1.2 有entryFileList且文件列表中有 与其他文件相关 的文件时
-         *  1.3 有entryFileList且文件列表中有文件为 删除 操作时
-         * 2. 返回符合条件的文件列表
-         *  2.1 有entryFileList且文件列表中 只有 不影响其他文件 的文件时
-         * @param entryFileList
-         * @returns
-         */
-        this.collectFile = (entryFileList) => {
-            // 取项目中所有的真实文件
-            const getProjectFiles = () => {
-                const projectPath = this.projectPath;
-                let files = shared_utils_1.FileUtil.readAlldirSync(projectPath, undefined, this.exclude);
-                return files;
-            };
-            // 2.
-            if (entryFileList) {
-                let isGetAll = entryFileList.every((item) => item.type === IChangedFile_1.HandlerType.UNLINK || !/\.(ux|json|js)$/.test(item.path));
-                if (!isGetAll) {
-                    return entryFileList
-                        .filter((filePath) => shared_utils_1.FileUtil.include(filePath.path, undefined, this.exclude))
-                        .map((item) => item.path);
-                }
-            }
-            // 1.
-            return getProjectFiles();
-        };
-        this.exclude = [
-            '**/node_modules{,/**}',
-            '**/dist{,/**}',
-            '**/build{,/**}',
-            '**/.git{,/**}',
-            (filePath) => {
-                // 如果 是 script， style文件，且同路径下存在同名 hml，则忽略
-                const { ext, name } = path_1.default.parse(filePath);
-                if (![...parser_1.ExtensionConfig.SCRIPTS, ...parser_1.ExtensionConfig.STYLES].includes(ext)) {
-                    return false;
-                }
-                const hmlPath = shared_utils_1.FileUtil.updateFileName(filePath, `${name}${parser_1.ExtensionConfig.HML}`);
-                if (fs_1.default.existsSync(hmlPath)) {
-                    return true;
-                }
-                return false;
-            }
-        ];
-        this.beforeWorks = [UxBeforeWorks_1.default.cleanOutput];
-        this.beforeCompile = [
-            UxBeforeCompile_1.default.validateManifest,
-            UxBeforeCompile_1.default.validateSitemap,
-            BeforeCompileUtils_1.default.clean,
-            BeforeCompileUtils_1.default.getEntries,
-            BeforeCompileUtils_1.default.getGlobalVar
-        ];
-        this.afterCompile = [
-            {
-                worker: UxAfterCompile_1.default.symlinkNodeModule,
-                workerDescribe: 'Create a soft link to the node_modules folder'
-            },
-            {
-                worker: UxAfterCompile_1.default.webpack,
-                workerDescribe: 'Compile the project using webpack'
-            },
-            {
-                worker: UxAfterCompile_1.default.copyResource,
-                workerDescribe: 'Copy resource files'
-            },
-            {
-                worker: UxAfterCompile_1.default.jsc,
-                workerDescribe: 'Generate jsc bytecode'
-            },
-            {
-                worker: UxAfterCompile_1.default.protobuf,
-                workerDescribe: 'Generate protobuf json'
-            },
-            {
-                worker: UxAfterCompile_1.default.toRpk,
-                workerDescribe: 'Package the project into an RPK file'
-            },
-            {
-                worker: UxAfterCompile_1.default.generateDiff,
-                workerDescribe: 'Generate diff json'
-            },
-            {
-                worker: UxAfterCompile_1.default.moveBackResult,
-                workerDescribe: 'Migrate temporary project'
-            }
-        ];
-        this.afterWorks = [UxAfterWorks_1.default.cleanOutput];
-        this.watchIgnores = [/node_modules/, /build/, /dist/];
+  constructor(projectPath) {
+    this.projectPath = projectPath;
+  }
+  /**
+   * 1. 取项目中所有的真实文件
+   *  1.1 无entryFileList时
+   *  1.2 有entryFileList且文件列表中有 与其他文件相关 的文件时
+   *  1.3 有entryFileList且文件列表中有文件为 删除 操作时
+   * 2. 返回符合条件的文件列表
+   *  2.1 有entryFileList且文件列表中 只有 不影响其他文件 的文件时
+   * @param entryFileList
+   * @returns
+   */
+  collectFile = entryFileList => {
+    // 取项目中所有的真实文件
+    const getProjectFiles = () => {
+      const projectPath = this.projectPath;
+      let files = _sharedUtils.FileUtil.readAlldirSync(projectPath, undefined, this.exclude);
+      return files;
+    };
+    // 2.
+    if (entryFileList) {
+      let isGetAll = entryFileList.every(item => item.type === _IChangedFile.HandlerType.UNLINK || !/\.(ux|json|js)$/.test(item.path));
+      if (!isGetAll) {
+        return entryFileList.filter(filePath => _sharedUtils.FileUtil.include(filePath.path, undefined, this.exclude)).map(item => item.path);
+      }
     }
-    get output() {
-        const name = path_1.default.basename(this.projectPath);
-        const result = `../.temp_${name}`;
-        return result;
+    // 1.
+    return getProjectFiles();
+  };
+  exclude = ['**/node_modules{,/**}', '**/dist{,/**}', '**/build{,/**}', '**/.git{,/**}', filePath => {
+    // 如果 是 script， style文件，且同路径下存在同名 hml，则忽略
+    const {
+      ext,
+      name
+    } = _path.default.parse(filePath);
+    if (![..._parser.ExtensionConfig.SCRIPTS, ..._parser.ExtensionConfig.STYLES].includes(ext)) {
+      return false;
     }
-    /**
-     * 通过项目类型，返回模块配置
-     */
-    get module() {
-        const isVela = this.getProjectType() === shared_utils_1.ProjectType.VELA_UX;
-        return isVela
-            ? {
-                rules: [
-                    {
-                        test: ['app.ux'],
-                        loader: [AppUxLoader_1.default]
-                    },
-                    {
-                        test: [/.+\.ux$/],
-                        exclude: [/app\.ux/],
-                        loader: [UxLoader_1.default]
-                    },
-                    {
-                        test: [/.+\.hml$/],
-                        loader: [HmlLoader_1.default, UxLoader_1.default]
-                    },
-                    {
-                        test: [/.+\.js$/],
-                        loader: [JsLoader_1.default]
-                    },
-                    {
-                        test: [/.+\.9.png/],
-                        loader: [PngLoader_1.default]
-                    }
-                ]
-            }
-            : {
-                rules: [
-                    {
-                        test: [/.+\.ux$/],
-                        loader: [UxLoader_2.default]
-                    },
-                    {
-                        test: [/.+\.js$/],
-                        loader: [JsLoader_1.default]
-                    },
-                    {
-                        test: [/.+\.9.png/],
-                        loader: [PngLoader_1.default]
-                    }
-                ]
-            };
-    }
-    /**
-     * 判断项目类型
-     *
-     * 目前的办法是通过 manifest.json 的 deviceTypeList 是否有 watch 判断
-     */
-    getProjectType() {
-        return shared_utils_1.ProjectType.getProjectType(this.projectPath);
+    const hmlPath = _sharedUtils.FileUtil.updateFileName(filePath, `${name}${_parser.ExtensionConfig.HML}`);
+    if (_fs.default.existsSync(hmlPath)) {
+      return true;
     }
+    return false;
+  }];
+  get output() {
+    const name = _path.default.basename(this.projectPath);
+    const result = `../.temp_${name}`;
+    return result;
+  }
+  beforeWorks = (() => [_UxBeforeWorks.default.cleanOutput])();
+  beforeCompile = (() => [_UxBeforeCompile.default.validateManifest, _UxBeforeCompile.default.validateSitemap, _BeforeCompileUtils.default.clean, _BeforeCompileUtils.default.getEntries, _BeforeCompileUtils.default.getGlobalVar])();
+  afterCompile = (() => [{
+    worker: _UxAfterCompile.default.symlinkNodeModule,
+    workerDescribe: 'Create a soft link to the node_modules folder'
+  }, {
+    worker: _UxAfterCompile.default.webpack,
+    workerDescribe: 'Compile the project using webpack'
+  }, {
+    worker: _UxAfterCompile.default.copyResource,
+    workerDescribe: 'Copy resource files'
+  }, {
+    worker: _UxAfterCompile.default.jsc,
+    workerDescribe: 'Generate jsc bytecode'
+  }, {
+    worker: _UxAfterCompile.default.protobuf,
+    workerDescribe: 'Generate protobuf json'
+  }, {
+    worker: _UxAfterCompile.default.toRpk,
+    workerDescribe: 'Package the project into an RPK file'
+  }, {
+    worker: _UxAfterCompile.default.generateDiff,
+    workerDescribe: 'Generate diff json'
+  }, {
+    worker: _UxAfterCompile.default.moveBackResult,
+    workerDescribe: 'Migrate temporary project'
+  }])();
+  afterWorks = (() => [_UxAfterWorks.default.cleanOutput])();
+  watchIgnores = [/node_modules/, /build/, /dist/];
+
+  /**
+   * 通过项目类型，返回模块配置
+   */
+  get module() {
+    const isVela = this.getProjectType() === _sharedUtils.ProjectType.VELA_UX;
+    return isVela ? {
+      rules: [{
+        test: ['app.ux'],
+        loader: [_AppUxLoader.default]
+      }, {
+        test: [/.+\.ux$/],
+        exclude: [/app\.ux/],
+        loader: [_UxLoader.default]
+      }, {
+        test: [/.+\.hml$/],
+        loader: [_HmlLoader.default, _UxLoader.default]
+      }, {
+        test: [/.+\.js$/],
+        loader: [_JsLoader.default]
+      }, {
+        test: [/.+\.9.png/],
+        loader: [_PngLoader.default]
+      }]
+    } : {
+      rules: [{
+        test: [/.+\.ux$/],
+        loader: [_UxLoader2.default]
+      }, {
+        test: [/.+\.js$/],
+        loader: [_JsLoader.default]
+      }, {
+        test: [/.+\.9.png/],
+        loader: [_PngLoader.default]
+      }]
+    };
+  }
+
+  /**
+   * 判断项目类型
+   *
+   * 目前的办法是通过 manifest.json 的 deviceTypeList 是否有 watch 判断
+   */
+  getProjectType() {
+    return _sharedUtils.ProjectType.getProjectType(this.projectPath);
+  }
 }
-exports.default = UxConfig;
+var _default = exports.default = UxConfig;

package/lib/config/XtsConfig.js

@@ -1,46 +1,36 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const entryTemplate_1 = require("../afterCompile/xts/entryTemplate");
-const generateRpk_1 = require("../afterCompile/xts/generateRpk");
-const ts2wasm_1 = require("../afterCompile/xts/ts2wasm");
-const XtsLoader_1 = __importDefault(require("../loader/xts/XtsLoader"));
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _entryTemplate = require("../afterCompile/xts/entryTemplate");
+var _generateRpk = require("../afterCompile/xts/generateRpk");
+var _ts2wasm = require("../afterCompile/xts/ts2wasm");
+var _XtsLoader = _interopRequireDefault(require("../loader/xts/XtsLoader"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * XtsConfig
  */
 class XtsConfig {
-    constructor(projectPath) {
-        this.projectPath = projectPath;
-        this.exclude = [
-            '**/node_modules{,/**}',
-            '**/dist{,/**}',
-            '**/build{,/**}',
-            '**/.git{,/**}',
-            '**/.wasmUnpacked{,/**}'
-        ];
-        this.output = 'build';
-        this.module = {
-            rules: [
-                {
-                    test: [/\.xts$/],
-                    loader: [XtsLoader_1.default]
-                }
-            ]
-        };
-        this.beforeCompile = [];
-        this.afterCompile = [
-            {
-                worker: entryTemplate_1.generateEntryFile
-            },
-            {
-                worker: ts2wasm_1.ts2wasm
-            },
-            {
-                worker: generateRpk_1.generateRpk
-            }
-        ];
-    }
+  constructor(projectPath) {
+    this.projectPath = projectPath;
+  }
+  exclude = ['**/node_modules{,/**}', '**/dist{,/**}', '**/build{,/**}', '**/.git{,/**}', '**/.wasmUnpacked{,/**}'];
+  output = 'build';
+  module = (() => ({
+    rules: [{
+      test: [/\.xts$/],
+      loader: [_XtsLoader.default]
+    }]
+  }))();
+  beforeCompile = [];
+  afterCompile = (() => [{
+    worker: _entryTemplate.generateEntryFile
+  }, {
+    worker: _ts2wasm.ts2wasm
+  }, {
+    worker: _generateRpk.generateRpk
+  }])();
 }
-exports.default = XtsConfig;
+var _default = exports.default = XtsConfig;