@aiot-toolkit/aiotpack 2.0.5-widget-provider-beta.2 → 2.0.6-beta.1

package/lib/compiler/javascript/vela/utils/signature/pem/private.pem

@@ -1,51 +1,51 @@
------BEGIN RSA PRIVATE KEY-----
-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
+-----BEGIN RSA PRIVATE KEY-----
+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
 -----END RSA PRIVATE KEY-----

package/lib/compiler/tools/icu/ImageIcu.js

@@ -12,9 +12,9 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 class ImageIcu {
   static EXT = '.bin';
   static INCLUDE_LIST = ['.png', '.jpg', '.jpeg', '.webp', '.bmp'];
-  /**
-   * @private
-   * @returns
+  /**
+   * @private
+   * @returns
    */
   getBinPath() {
     const platform = _os.default.platform();
@@ -26,12 +26,12 @@ class ImageIcu {
     return result;
   }
 
-  /**
-   * 文件转换为 bin 格式
-   * @param {*} resourcePath 源文件
-   * @param {*} folder 产物目录
-   * @param {'lvgl'|'png'} format
-   * @returns
+  /**
+   * 文件转换为 bin 格式
+   * @param {*} resourcePath 源文件
+   * @param {*} folder 产物目录
+   * @param {'lvgl'|'png'} format
+   * @returns
    */
   translate(resourcePath, folder) {
     let format = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'lvgl';
@@ -53,7 +53,7 @@ class ImageIcu {
           recursive: true
         });
       }
-      const command = `${binPath} convert ${resourcePath} -O ${folder} -F ${format} -C i8 -r`;
+      const command = `"${binPath}" convert "${resourcePath}" -O "${folder}" -F ${format} -C i8 -r`;
       const message = (0, _child_process.execSync)(command).toString('utf-8');
       if (message) {
         console.log(`convert error: path=${resourcePath} message=${message}`);
@@ -66,16 +66,16 @@ class ImageIcu {
     }
   }
 
-  /**
-   * 资源转换为 bin 文件路径
-   *
-   * 如果是 png, jpg，jpeg, webp, bmp，则转换为 .bin 后缀；其它类型不处理
-   *
-   * **此方法仅返回转换后的路径， 不会实际转换文件**
-   * @param {string} path
-   * @example assetsToBinPath('images/test.png') // images/test.bin
-   *
-   * @return {string} 可转则返回对应的 bin 路径；否则返回''
+  /**
+   * 资源转换为 bin 文件路径
+   *
+   * 如果是 png, jpg，jpeg, webp, bmp，则转换为 .bin 后缀；其它类型不处理
+   *
+   * **此方法仅返回转换后的路径， 不会实际转换文件**
+   * @param {string} path
+   * @example assetsToBinPath('images/test.png') // images/test.bin
+   *
+   * @return {string} 可转则返回对应的 bin 路径；否则返回''
    */
   static assetsToBinPath(assetsPath) {
     if (!assetsPath) {
@@ -88,11 +88,11 @@ class ImageIcu {
     return '';
   }
 
-  /**
-   * 是否可转换
-   * @param {string} assetsPath
-   * @param {'lvgl'|'png'} format
-   * @returns
+  /**
+   * 是否可转换
+   * @param {string} assetsPath
+   * @param {'lvgl'|'png'} format
+   * @returns
    */
   static canTranslate(assetsPath) {
     let format = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'lvgl';

package/lib/config/UxConfig.d.ts

@@ -25,15 +25,13 @@ declare class UxConfig implements IFileLaneConfig<IJavascriptCompileOption> {
     exclude: (string | ((filePath: string) => boolean))[];
     get output(): string;
     beforeWorks: (typeof UxBeforeWorks.cleanOutput)[];
-    beforeCompile: import("../../../file-lane/lib").PreWork<IJavascriptCompileOption>[];
+    beforeCompile: import("file-lane").PreWork<IJavascriptCompileOption>[];
     afterCompile: ({
-        worker: import("../../../file-lane/lib").FollowWork<IJavascriptCompileOption>;
-        workDescribe: string;
+        worker: import("file-lane").FollowWork<IJavascriptCompileOption>;
         workerDescribe?: undefined;
     } | {
-        worker: import("../../../file-lane/lib").FollowWork<IJavascriptCompileOption>;
+        worker: import("file-lane").FollowWork<IJavascriptCompileOption>;
         workerDescribe: string;
-        workDescribe?: undefined;
     })[];
     afterWorks: (typeof UxAfterWorks.cleanOutput)[];
     watchIgnores: RegExp[];

package/lib/config/UxConfig.js

@@ -25,15 +25,15 @@ class UxConfig {
   constructor(projectPath) {
     this.projectPath = projectPath;
   }
-  /**
-   * 1. 取项目中所有的真实文件
-   *  1.1 无entryFileList时
-   *  1.2 有entryFileList且文件列表中有 与其他文件相关 的文件时
-   *  1.3 有entryFileList且文件列表中有文件为 删除 操作时
-   * 2. 返回符合条件的文件列表
-   *  2.1 有entryFileList且文件列表中 只有 不影响其他文件 的文件时
-   * @param entryFileList
-   * @returns
+  /**
+   * 1. 取项目中所有的真实文件
+   *  1.1 无entryFileList时
+   *  1.2 有entryFileList且文件列表中有 与其他文件相关 的文件时
+   *  1.3 有entryFileList且文件列表中有文件为 删除 操作时
+   * 2. 返回符合条件的文件列表
+   *  2.1 有entryFileList且文件列表中 只有 不影响其他文件 的文件时
+   * @param entryFileList
+   * @returns
    */
   collectFile = entryFileList => {
     // 取项目中所有的真实文件
@@ -75,8 +75,7 @@ class UxConfig {
   beforeWorks = (() => [_UxBeforeWorks.default.cleanOutput])();
   beforeCompile = (() => [_UxBeforeCompile.default.validateManifest, _UxBeforeCompile.default.validateSitemap, _BeforeCompileUtils.default.clean, _BeforeCompileUtils.default.getEntries, _BeforeCompileUtils.default.getGlobalVar])();
   afterCompile = (() => [{
-    worker: _UxAfterCompile.default.writeGitIgnore,
-    workDescribe: 'Write .gitignore'
+    worker: _UxAfterCompile.default.writeGitIgnore
   }, {
     worker: _UxAfterCompile.default.symlinkNodeModule,
     workerDescribe: 'Create a soft link to the node_modules folder'
@@ -114,8 +113,8 @@ class UxConfig {
   afterWorks = (() => [_UxAfterWorks.default.cleanOutput])();
   watchIgnores = [/node_modules/, /build/, /dist/];
 
-  /**
-   * 通过项目类型，返回模块配置
+  /**
+   * 通过项目类型，返回模块配置
    */
   get module() {
     const isVela = this.getProjectType() === _sharedUtils.ProjectType.VELA_UX;
@@ -151,10 +150,10 @@ class UxConfig {
     };
   }
 
-  /**
-   * 判断项目类型
-   *
-   * 目前的办法是通过 manifest.json 的 deviceTypeList 是否有 watch 判断
+  /**
+   * 判断项目类型
+   *
+   * 目前的办法是通过 manifest.json 的 deviceTypeList 是否有 watch 判断
    */
   getProjectType() {
     return _sharedUtils.ProjectType.getProjectType(this.projectPath);

package/lib/loader/ux/JsLoader.d.ts

@@ -6,11 +6,6 @@ import IJavascriptCompileOption from '../../compiler/javascript/interface/IJavas
 declare class JsLoader implements ILoader {
     context: IFileLaneContext;
     compilerOption: IJavascriptCompileOption;
-    /**
-     * 解析文件内容
-     * @param files files 待处理的文件数组
-     * @returns 处理后的文件数组
-     */
     parser(files: IFileParam<any>[]): Promise<IFileParam<any>[]>;
 }
 export default JsLoader;

package/lib/loader/ux/JsLoader.js

@@ -6,27 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _parser = require("@aiot-toolkit/parser");
 var _sharedUtils = require("@aiot-toolkit/shared-utils");
-var _path = _interopRequireDefault(require("path"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-/**
- * JsLoader
+/**
+ * JsLoader
  */
 class JsLoader {
-  /**
-   * 解析文件内容
-   * @param files files 待处理的文件数组
-   * @returns 处理后的文件数组
-   */
   async parser(files) {
     const onLog = () => {};
     const result = [];
-    const {
-      projectPath,
-      widgetProvider
-    } = this.context;
-    const {
-      sourceRoot
-    } = this.compilerOption;
     for (const item of files) {
       if (!item.content) {
         result.push({
@@ -36,28 +22,16 @@ class JsLoader {
       } else {
         const options = {
           filePath: item.path,
-          projectPath,
+          projectPath: this.context.projectPath,
           content: item.content.toString(),
-          projectType: _sharedUtils.ProjectType.getProjectType(projectPath),
+          projectType: _sharedUtils.ProjectType.getProjectType(this.context.projectPath),
           onLog
         };
-        const JSTree = (await new _parser.ScriptToTypescript(options, this.compilerOption, this.context).translate({
-          content: new _parser.ScriptParser(options).parser(item.content.toString()).ast.content
-        }, [])).targetTree;
-        // 切割script中的转换结果和source map
-        const spliteResult = _parser.SourceMapUtil.splitSourceMap(JSTree);
-        let JSContent = spliteResult.newScriptTree.getFullText();
-        // 若为widgetProvider.js文件，则给内容添加包裹
-        if (widgetProvider) {
-          const a = _path.default.relative(_path.default.join(projectPath, sourceRoot), item.path).replace(/\\/g, '/');
-          const isWidgetProvider = widgetProvider.includes(a);
-          if (isWidgetProvider) {
-            JSContent += `$app_exports$.default = exports["default"]`;
-          }
-        }
         result.push({
           path: item.path,
-          content: _parser.SourceMapUtil.concatSourceMap(JSContent, spliteResult.scriptSourceMap)
+          content: (await new _parser.ScriptToTypescript(options, this.compilerOption, this.context).translate({
+            content: new _parser.ScriptParser(options).parser(item.content.toString()).ast.content
+          }, [])).targetTree.getFullText()
         });
       }
     }

package/lib/loader/ux/PngLoader.js

@@ -10,8 +10,8 @@ var _PngUtils = _interopRequireDefault(require("../../utils/PngUtils"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const aaptjs = require('@hap-toolkit/aaptjs');
 
-/**
- * PngLoader
+/**
+ * PngLoader
  */
 class PngLoader {
   async parser(files) {

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

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _AndroidUx = _interopRequireDefault(require("../../../utils/ux/android/AndroidUx"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-/**
- * UxLoader
+/**
+ * UxLoader
  */
 class UxLoader {
   async parser(files) {

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

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _UxLoaderUtils = _interopRequireDefault(require("../../../utils/ux/UxLoaderUtils"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-/**
- * 处理app.ux的Loader
- * AppUxLoader
+/**
+ * 处理app.ux的Loader
+ * AppUxLoader
  */
 class AppUxLoader {
   async parser(files) {

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

@@ -8,8 +8,8 @@ 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
+/**
+ * HmlLoader
  */
 class HmlLoader {
   parser(files) {
@@ -18,18 +18,18 @@ class HmlLoader {
     });
   }
 
-  /**
-   * 包裹 hml 文件
-   *
-   * # 路径
-   * 如果存在同路径的 ux 后缀，报错；否则转换为同路径的 ux 后缀
-   *
-   * # 内容
-   * 1. 给hml的内容加上<template></template>
-   * 2. 如果存在同路径同名的 script文件，则加到<script></script>中
-   * 3. 如果存在同路径同名的 style文件，则加到<style></style>中
-   *
-   * @param file
+  /**
+   * 包裹 hml 文件
+   *
+   * # 路径
+   * 如果存在同路径的 ux 后缀，报错；否则转换为同路径的 ux 后缀
+   *
+   * # 内容
+   * 1. 给hml的内容加上<template></template>
+   * 2. 如果存在同路径同名的 script文件，则加到<script></script>中
+   * 3. 如果存在同路径同名的 style文件，则加到<style></style>中
+   *
+   * @param file
    */
   wrapHml(file) {
     const {

package/lib/utils/BeforeCompileUtils.js

@@ -14,17 +14,17 @@ var _IManifest = require("../compiler/javascript/vela/interface/IManifest");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const BinaryPlugin = require('@aiot-toolkit/parser/lib/ux/translate/vela/protobuf/BinaryPlugin');
 
-/**
- * BeforeCompileUtils
+/**
+ * BeforeCompileUtils
  */
 class BeforeCompileUtils {
-  /**
-   * 获取ux项目的路由入口
-   * context.entries中存放ux页面路由
-   * context.liteCards中存放轻卡路由
-   * @param context
-   * @param fileList
-   * @returns
+  /**
+   * 获取ux项目的路由入口
+   * context.entries中存放ux页面路由
+   * context.liteCards中存放轻卡路由
+   * @param context
+   * @param fileList
+   * @returns
    */
   static getEntries = params => {
     const {
@@ -41,11 +41,8 @@ class BeforeCompileUtils {
     let entryList = [];
     // 存储轻卡路由
     let liteCardList = [];
-    // 存储widgetProvider
-    let widgetProviderList = [];
     const {
-      router,
-      widgetProvider
+      router
     } = manifestContent;
     if (router) {
       const {
@@ -88,24 +85,8 @@ class BeforeCompileUtils {
       // 没有router配置
       _sharedUtils.ColorConsole.throw(`### manifest ### No router configuration`);
     }
-    if (widgetProvider) {
-      const EXTENSION_JS = '.js';
-      for (const providerItem of widgetProvider) {
-        const {
-          path
-        } = providerItem;
-        const itemPath = _path.default.join(srcPath, path + EXTENSION_JS);
-        if (_fsExtra.default.existsSync(itemPath)) {
-          widgetProviderList.push(path + EXTENSION_JS);
-        } else {
-          // 报错
-          _sharedUtils.ColorConsole.throw(`### manifest ### widgetProvider path '${itemPath}' does not exist`);
-        }
-      }
-    }
     context['entries'] = entryList;
     context['liteCards'] = liteCardList;
-    context['widgetProvider'] = widgetProviderList;
     return Promise.resolve();
   };
   static clean = async params => {
@@ -117,14 +98,7 @@ class BeforeCompileUtils {
     if (compilerOption) {
       // 存储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
-        };
-      }) : [];
+      const buildFileList = _fsExtra.default.existsSync(buildPath) ? _sharedUtils.FileUtil.readAlldirSync(buildPath).map(filePath => _path.default.relative(buildPath, filePath)) : [];
       if (compalition) {
         compalition.buildFileList = buildFileList;
       }
@@ -138,9 +112,9 @@ class BeforeCompileUtils {
       output: compilerOption?.outputPath
     };
   };
-  /**
-   * 获取项目的全局样式变量配置
-   * @param context
+  /**
+   * 获取项目的全局样式变量配置
+   * @param context
    */
   static getGlobalVar = params => {
     const {

package/lib/utils/PngUtils.js

@@ -7,14 +7,14 @@ 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
+/**
+ * PngUtils
  */
 class PngUtils {
-  /**
-   * 检测.9.png是否编码
-   * @param filePath
-   * @returns
+  /**
+   * 检测.9.png是否编码
+   * @param filePath
+   * @returns
    */
   static isEncode9Png(filePath) {
     const buff = _fsExtra.default.readFileSync(filePath);
@@ -23,11 +23,11 @@ class PngUtils {
     const encode = buff.subarray(start, end).toString() === 'npTc' || buff.subarray(start, end).toString() === 'npOl';
     return encode;
   }
-  /**
-   * 计算文件转换后的目标路径
-   * @param filePath
-   * @param context
-   * @returns
+  /**
+   * 计算文件转换后的目标路径
+   * @param filePath
+   * @param context
+   * @returns
    */
   static convertOutputPath(filePath, context) {
     const {

package/lib/utils/ux/FileCompare.d.ts

@@ -0,0 +1,12 @@
+interface FileComparisonResult {
+    isEqual: boolean;
+    details: {
+        hash1: string;
+        hash2: string;
+        fileSize1: number;
+        fileSize2: number;
+        comparisonTime: number;
+    };
+}
+export declare function compareFiles(filePath1: string, filePath2: string): FileComparisonResult;
+export {};

package/lib/utils/ux/FileCompare.js

@@ -0,0 +1,47 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.compareFiles = compareFiles;
+var _crypto = require("crypto");
+var _fs = _interopRequireDefault(require("fs"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function compareFiles(filePath1, filePath2) {
+  const startTime = Date.now();
+
+  // 快速检查：文件大小不同则内容必然不同
+  const size1 = _fs.default.statSync(filePath1).size;
+  const size2 = _fs.default.statSync(filePath2).size;
+  if (size1 !== size2) {
+    return {
+      isEqual: false,
+      details: {
+        hash1: '',
+        hash2: '',
+        fileSize1: size1,
+        fileSize2: size2,
+        comparisonTime: Date.now() - startTime
+      }
+    };
+  }
+
+  // 计算两个文件的哈希
+  const hash1 = computeFileHash(filePath1);
+  const hash2 = computeFileHash(filePath2);
+  return {
+    isEqual: hash1 === hash2,
+    details: {
+      hash1,
+      hash2,
+      fileSize1: size1,
+      fileSize2: size2,
+      comparisonTime: Date.now() - startTime
+    }
+  };
+}
+function computeFileHash(filePath) {
+  const fileData = _fs.default.readFileSync(filePath);
+  const hash = (0, _crypto.createHash)('SHA256').update(fileData);
+  return hash.digest('hex');
+}

package/lib/utils/ux/UxFileUtils.d.ts

@@ -1,4 +1,3 @@
-import FileLaneCompilation from 'file-lane/lib/FileLaneCompilation';
 import IManifest from '../../compiler/javascript/vela/interface/IManifest';
 export declare class UxFileUtils {
     static readonly CONFIG_FILE_NAME = "manifest.json";
@@ -39,15 +38,18 @@ export declare class UxFileUtils {
      */
     static validateSitemap(projectPath: string, sourceRoot?: string): void;
     /**
+     * 比较新旧文件列表差异
      * 1. 遍历旧文件列表
-     *  1.1 若文件路径在新文件列表newFileList中，且内容一致时，从newFileList中移除该项
-     *  1.2 若文件路径在新文件列表newFileList中，且内容不一致时，添加到diffList中表示待更新，从newFileList中移除该项
+     *  1.1 若文件路径在新文件列表remainingNewFilest中，且内容一致时，从remainingNewFiles中移除该项
+     *  1.2 若文件路径在新文件列表remainingNewFiles中，且内容不一致时，添加到diffList中表示待更新，从remainingNewFiles中移除该项
      *  1.3 若文件路径不在新文件列表中，表示该文件待删除(热更新时，可以不做删除，删除耗费性能)
-     * 2. 若遍历完旧文件列表后，newFileList长度不为0，表示有文件待新增
-     * @param oldFileList 旧文件列表
-     * @param newFileList 新文件列表
-     * @returns
+     * 2. 若遍历完旧文件列表后，remainingNewFiles长度不为0，表示有文件待新增
+     * @param oldFileList 旧文件路径列表(相对路径)
+     * @param newFileList 新文件路径列表(绝对路径)
+     * @param oldDir 旧文件所在目录(绝对路径)
+     * @param newDir 新文件所在目录(绝对路径)
+     * @returns 返回差异文件路径列表(相对路径)
      */
-    static getDiffJSON(compilation: FileLaneCompilation, newFileList: string[], buildPath: string): string[];
+    static getDiffJSON(oldFileList: string[], newFileList: string[], oldDir: string, newDir: string): string[];
 }
 export default UxFileUtils;