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

package/README.md

@@ -1,46 +1,46 @@
-# `aiotpack`
-
-最终打包工具，包含各类语言、各类平台的打包配置
-
-## 目录结构
-
-| 目录     | 描述                                                                            |
-| -------- | ------------------------------------------------------------------------------- |
-| config   | FileLane 配置，基于此配置，可完成“源码项目-->目标代码项目-->应用程序”的完整流程 |
-| compiler | 目标语言-->应用程序编译器                                                       |
-| loader   | 源码语言-->目标代码语言                                                         |
-| utils    | 语言、项目无关的辅助工具                                                        |
-
-## config
-
-通过在 FileLane 中配置各项参数，可完成“**源码项目-->目标代码项目-->应用程序**”的完整流程
-
-## compiler
-
-#### 概述
-
-源码已生成目标代码项目，此时需要生成**最终产物--应用程序**。compiler 目录中的代码即为完成此项工作而生。
-
-#### 子目录
-
-compiler 下的每个子目录，对应一种目标语言；每种目标语言在不同平台又可能有不同的生成方式。
-
-因此结构为：`compiler/目标语言/目标平台`，例如：
-
-- `compiler/javascript/vela`--javascript 语言在 vela 平台的生成
-
-#### 添加编译器
-
-1. 按上述目录结构，添加目录
-2. 创建编译器`class XCompiler`, 建议实现实现`ICompiler` 接口，以便以后实现统一的用户端接口
-3. 在需要的位置调用
-
-```js
-new XCompiler().compile({
-  projectPath: '',
-  mode: 'development',
-  platform: 'native'
-})
-```
-
-## loader--各类语言的转换器
+# `aiotpack`
+
+最终打包工具，包含各类语言、各类平台的打包配置
+
+## 目录结构
+
+| 目录     | 描述                                                                            |
+| -------- | ------------------------------------------------------------------------------- |
+| config   | FileLane 配置，基于此配置，可完成“源码项目-->目标代码项目-->应用程序”的完整流程 |
+| compiler | 目标语言-->应用程序编译器                                                       |
+| loader   | 源码语言-->目标代码语言                                                         |
+| utils    | 语言、项目无关的辅助工具                                                        |
+
+## config
+
+通过在 FileLane 中配置各项参数，可完成“**源码项目-->目标代码项目-->应用程序**”的完整流程
+
+## compiler
+
+#### 概述
+
+源码已生成目标代码项目，此时需要生成**最终产物--应用程序**。compiler 目录中的代码即为完成此项工作而生。
+
+#### 子目录
+
+compiler 下的每个子目录，对应一种目标语言；每种目标语言在不同平台又可能有不同的生成方式。
+
+因此结构为：`compiler/目标语言/目标平台`，例如：
+
+- `compiler/javascript/vela`--javascript 语言在 vela 平台的生成
+
+#### 添加编译器
+
+1. 按上述目录结构，添加目录
+2. 创建编译器`class XCompiler`, 建议实现实现`ICompiler` 接口，以便以后实现统一的用户端接口
+3. 在需要的位置调用
+
+```js
+new XCompiler().compile({
+  projectPath: '',
+  mode: 'development',
+  platform: 'native'
+})
+```
+
+## loader--各类语言的转换器

package/lib/afterCompile/ux/UxAfterCompile.d.ts

@@ -4,7 +4,7 @@ import IJavascriptCompileOption from '../../compiler/javascript/interface/IJavas
  * UxAfterCompile
  */
 declare class UxAfterCompile {
-    static webpack: FollowWork<IJavascriptCompileOption>;
+    static compileJavascript: FollowWork<IJavascriptCompileOption>;
     static protobuf: FollowWork<IJavascriptCompileOption>;
     static jsc: FollowWork<IJavascriptCompileOption>;
     static toRpk: FollowWork<IJavascriptCompileOption>;
@@ -15,6 +15,13 @@ declare class UxAfterCompile {
      * @param compilerOption
      */
     static copyResource: FollowWork<IJavascriptCompileOption>;
+    /**
+     * 压缩资源文件
+     * 1. png8
+     * 2. bin
+     * @param params
+     */
+    static compressResource: FollowWork<IJavascriptCompileOption>;
     /**
      * 如果是更新触发，则对比临时项目build文件夹 和 项目build文件夹，生成diff.json
      * @param context
@@ -39,5 +46,25 @@ declare class UxAfterCompile {
      * @param compilerOption
      */
     static symlinkNodeModule: FollowWork<IJavascriptCompileOption>;
+    /**
+     * 编译轻卡ux
+     * 1. 使用hap-toolkit编译项目，编译结果存储在build文件夹
+     *   1.1 重写stdout以捕获hap-toolkit中的正常日志，错误日志正常输出
+     *   1.2 使用hap-toolkit编译项目
+     *   1.3 还原stdout
+     * 2. 取widgets中配置的轻卡内容，将build文件夹中对应的产物复制到临时文件夹
+     * @param params
+     */
+    static compileLiteCard: FollowWork<IJavascriptCompileOption>;
+    /**
+     * 检查资源文件
+     * 1. 检查文件体积是否过大, 如果超出，则提示到真机验证
+     * @param params
+     */
+    static resourceCheck: FollowWork<IJavascriptCompileOption>;
+    /**
+     * 写入.gitignore文件, 忽略临时目录
+     */
+    static writeGitIgnore: FollowWork<IJavascriptCompileOption>;
 }
 export default UxAfterCompile;

package/lib/afterCompile/ux/UxAfterCompile.js

@@ -16,19 +16,23 @@ var _ZipUtil = _interopRequireDefault(require("../../compiler/javascript/vela/ut
 var _UxFileUtils = _interopRequireDefault(require("../../utils/ux/UxFileUtils"));
 var _FileLaneTriggerType = _interopRequireDefault(require("file-lane/lib/enum/FileLaneTriggerType"));
 var _ZipFileUtil = _interopRequireDefault(require("@aiot-toolkit/shared-utils/lib/utils/ZipFileUtil"));
+var _process = require("process");
+var _ImageIcu = _interopRequireDefault(require("../../compiler/tools/icu/ImageIcu"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const BinaryPlugin = require('@aiot-toolkit/parser/lib/ux/translate/vela/protobuf/BinaryPlugin');
+const HapToolkit = require('hap-toolkit');
 
-/**
- * UxAfterCompile
+/**
+ * UxAfterCompile
  */
 class UxAfterCompile {
-  static webpack = async params => {
+  static compileJavascript = async params => {
     const {
       context,
-      compilerOption
+      compilerOption,
+      onLog
     } = params;
-    return new _JavascriptCompiler.default().compile({
+    return new _JavascriptCompiler.default(context, onLog).compile({
       projectPath: _path.default.join(context.projectPath, context.output),
       mode: _CompileMode.default.DEVELOPMENT,
       devtool: false,
@@ -89,22 +93,22 @@ class UxAfterCompile {
     const {
       compilerOption,
       compalition,
-      config
+      context
     } = params;
     if (compilerOption) {
       const fileName = await _ZipUtil.default.createRpk(_path.default.join(compilerOption.projectPath, compilerOption.outputPath), compilerOption);
       if (compalition && fileName) {
-        compalition.info.rpk = _path.default.join(config.projectPath, compilerOption.releasePath, fileName);
+        compalition.info.rpk = _path.default.join(context.projectPath, compilerOption.releasePath, fileName);
       }
       return fileName;
     }
   };
 
-  /**
-   * 复制各类资源文件，例如图片、视频等
-   * @param context
-   * @param config
-   * @param compilerOption
+  /**
+   * 复制各类资源文件，例如图片、视频等
+   * @param context
+   * @param config
+   * @param compilerOption
    */
   static copyResource = async params => {
     const {
@@ -144,18 +148,18 @@ class UxAfterCompile {
         sourceRoot,
         outputPath
       } = compilerOption;
-      const includeList = [/sitemap\.json$/, /i18n(.+)\.json/];
+      const includeList = [/sitemap\.json$/, /i18n(.+)\.json/, /web\/*/];
       const excludeExtList = ['js', 'jsx', 'coffee', 'ts', 'tsx', 'vue', 'css', 'less', 'sass', 'styl', 'html', 'md', 'ux', 'mix', 'DS_Store', 'map'];
       const excludeReg = `\\.(${excludeExtList.join('|')})$`;
       _sharedUtils.FileUtil.copyFiles(_path.default.join(projectPath, sourceRoot), _path.default.join(projectPath, outputPath), new RegExp(excludeReg));
       _sharedUtils.FileUtil.copyFiles(_path.default.join(projectPath, sourceRoot), _path.default.join(projectPath, outputPath), undefined, includeList);
     };
 
-    /**
-     * 写入 manifest.json 文件
-     *
-     * 需要在源码manifest.json基础加一些额外的内容
-     * @param compilerOption
+    /**
+     * 写入 manifest.json 文件
+     *
+     * 需要在源码manifest.json基础加一些额外的内容
+     * @param compilerOption
      */
     const updateManifest = compilerOption => {
       const {
@@ -251,17 +255,48 @@ class UxAfterCompile {
       await genMetaFiles(compilerOption);
     }
   };
-  /**
-   * 如果是更新触发，则对比临时项目build文件夹 和 项目build文件夹，生成diff.json
-   * @param context
-   * @param config
-   * @param compilerOption
+
+  /**
+   * 压缩资源文件
+   * 1. png8
+   * 2. bin
+   * @param params
+   */
+  static compressResource = async params => {
+    const {
+      compilerOption
+    } = params;
+    if (compilerOption) {
+      const {
+        enableImagePng8,
+        projectPath,
+        outputPath
+      } = compilerOption;
+      if (enableImagePng8) {
+        const format = 'png';
+        const files = _sharedUtils.FileUtil.readAlldirSync(_path.default.join(projectPath, outputPath));
+        const compressFiles = files.filter(filePath => _ImageIcu.default.canTranslate(filePath, format));
+        if (compressFiles.length) {
+          const icu = new _ImageIcu.default();
+          compressFiles.forEach(item => {
+            icu.translate(item, _path.default.dirname(item), format);
+          });
+        }
+      }
+    }
+  };
+
+  /**
+   * 如果是更新触发，则对比临时项目build文件夹 和 项目build文件夹，生成diff.json
+   * @param context
+   * @param config
+   * @param compilerOption
    */
   static generateDiff = async params => {
     const {
       compilerOption,
       compalition,
-      config
+      context
     } = params;
     if (!compilerOption || !compalition) {
       return;
@@ -290,18 +325,18 @@ class UxAfterCompile {
         zipFilePath: item
       })));
       compalition.info.diffList = diffList;
-      compalition.info.diffFile = _path.default.join(config.projectPath, compilerOption.releasePath, diffFileName);
+      compalition.info.diffFile = _path.default.join(context.projectPath, compilerOption.releasePath, diffFileName);
     }
   };
 
-  /**
-   * 打包结果移回源码项目，并删除中间项目
-   *
-   * 1. 把 build和rpk 目录从**中间项目**移回**源码项目**
-   * 2. 删除中间项目
-   * @param context
-   * @param config
-   * @param compilerOption
+  /**
+   * 打包结果移回源码项目，并删除中间项目
+   *
+   * 1. 把 build和rpk 目录从**中间项目**移回**源码项目**
+   * 2. 删除中间项目
+   * @param context
+   * @param config
+   * @param compilerOption
    */
   static moveBackResult = async params => {
     const {
@@ -334,11 +369,11 @@ class UxAfterCompile {
     });
   };
 
-  /**
-   * 创建 node_module 软链
-   * @param context
-   * @param config
-   * @param compilerOption
+  /**
+   * 创建 node_module 软链
+   * @param context
+   * @param config
+   * @param compilerOption
    */
   static symlinkNodeModule = async params => {
     const {
@@ -361,5 +396,118 @@ class UxAfterCompile {
       throw new Error(`${error?.toString() || 'unknown error'}. Please check whether the file system of the current disk supports the creation of soft links.`);
     }
   };
+  /**
+   * 编译轻卡ux
+   * 1. 使用hap-toolkit编译项目，编译结果存储在build文件夹
+   *   1.1 重写stdout以捕获hap-toolkit中的正常日志，错误日志正常输出
+   *   1.2 使用hap-toolkit编译项目
+   *   1.3 还原stdout
+   * 2. 取widgets中配置的轻卡内容，将build文件夹中对应的产物复制到临时文件夹
+   * @param params
+   */
+  static compileLiteCard = async params => {
+    const {
+      compilerOption,
+      context
+    } = params;
+    try {
+      if (context?.liteCards?.length > 0 && compilerOption) {
+        const {
+          projectPath,
+          outputPath
+        } = compilerOption;
+        const LITE_OUTPUT_PATH = outputPath;
+        // 1.1
+        const originalStdout = _process.stdout.write;
+        _process.stdout.write = function () {
+          return true;
+        };
+        // 1.2
+        await HapToolkit.compile('native', 'dev', false, {
+          cwd: context.projectPath,
+          signMode: 'BUILD',
+          enableCustomComponent: true
+        });
+        // 1.3
+        _process.stdout.write = originalStdout;
+        // 2.
+        context.liteCards.forEach(card => {
+          // hap-toolkit的产物在项目的build文件夹下
+          const fromPath = _path.default.join(context.projectPath, LITE_OUTPUT_PATH, card);
+          // aiot-toolkit的产物在临时项目的build文件夹下
+          const toPath = _path.default.join(projectPath, LITE_OUTPUT_PATH, card);
+          //确定目标目录存在，若不存在则创建到父目录
+          _fsExtra.default.ensureDirSync(_path.default.dirname(toPath));
+          // 复制文件
+          _fsExtra.default.moveSync(fromPath + '.template.json', toPath + '.template.json', {
+            overwrite: true
+          });
+          _fsExtra.default.moveSync(fromPath + '.css.json', toPath + '.css.json', {
+            overwrite: true
+          });
+        });
+      }
+    } catch (error) {
+      throw new Error(`compile lite card error, ${error?.toString() || 'unknown error'}.`);
+    }
+  };
+  /**
+   * 检查资源文件
+   * 1. 检查文件体积是否过大, 如果超出，则提示到真机验证
+   * @param params
+   */
+  static resourceCheck = async params => {
+    const {
+      context,
+      compilerOption,
+      onLog
+    } = params;
+    if (!compilerOption) {
+      return;
+    }
+
+    // 最大值，单位KB
+    const MAX_SIZE = 1024;
+    const {
+      projectPath
+    } = context;
+    const {
+      outputPath
+    } = compilerOption;
+    const fileList = _sharedUtils.FileUtil.readAlldirSync(_path.default.join(projectPath, outputPath));
+    const largeFileList = fileList.filter(item => {
+      const status = _fsExtra.default.statSync(item);
+      return status.size > MAX_SIZE * 1024;
+    });
+    if (largeFileList.length) {
+      const logs = [];
+      logs.push({
+        level: _sharedUtils.Loglevel.WARN,
+        message: [`the following files is large than`, {
+          word: `${MAX_SIZE}KB`
+        }, `, please check on the`, {
+          word: `real device\r\n`
+        }, {
+          word: largeFileList.map((item, index) => `${index + 1}. ${item}`).join('\r\n ')
+        }]
+      });
+      onLog?.(logs);
+    }
+  };
+
+  /**
+   * 写入.gitignore文件, 忽略临时目录
+   */
+  static writeGitIgnore = async params => {
+    const {
+      context
+    } = params;
+    const {
+      output,
+      projectPath
+    } = context;
+    const gitIgnorePath = _path.default.join(projectPath, output, '.gitignore');
+    _fsExtra.default.writeFileSync(gitIgnorePath, '*');
+  };
 }
 var _default = exports.default = UxAfterCompile;

package/lib/afterWorks/ux/UxAfterWorks.js

@@ -9,7 +9,7 @@ var _fileLane = require("file-lane");
 class UxAfterWorks {
   static async cleanOutput(context) {
     const outputPath = _fileLane.FileLaneUtil.getOutputPath(context);
-    _sharedUtils.FileUtil.del(outputPath);
+    await _sharedUtils.FileUtil.del(outputPath);
   }
 }
 var _default = exports.default = UxAfterWorks;

package/lib/beforeCompile/ux/UxBeforeCompile.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _UxFileUtils = _interopRequireDefault(require("../../utils/ux/UxFileUtils"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-/**
- * UxBeforeCompile
+/**
+ * UxBeforeCompile
  */
 class UxBeforeCompile {
   static validateManifest = async _ref => {

package/lib/compiler/enum/CompileMode.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-/**
- * 编译模式枚举
+/**
+ * 编译模式枚举
  */
 var CompileMode = /*#__PURE__*/function (CompileMode) {
   CompileMode["DEVELOPMENT"] = "development";

package/lib/compiler/javascript/JavascriptCompiler.d.ts

@@ -1,9 +1,23 @@
+import { ILog } from '@aiot-toolkit/shared-utils';
+import { IFileLaneContext } from 'file-lane';
 import ICompileParam from '../interface/ICompileParam';
 import ICompiler from '../interface/ICompiler';
 import IJavascriptCompileOption from './interface/IJavascriptCompileOption';
 declare class JavascriptCompiler implements ICompiler {
+    private readonly context;
+    private readonly onLog?;
     readonly QUICKAPP_CONFIG = "quickapp.config.js";
+    constructor(context: IFileLaneContext, onLog?: ((log: ILog[]) => void) | undefined);
     compile(param: IJavascriptCompileOption): Promise<void>;
+    /**
+     * 压缩插件
+     *
+     * dev模式，只处理console，其它禁用
+     * prod模式，其它使用默认值
+     * @param mode
+     * @returns
+     */
+    private createMinimizerRspackPlugin;
     private createWebpackConfig;
     private getConfigurator;
     clean(param: ICompileParam & IJavascriptCompileOption): Promise<void>;

package/lib/compiler/javascript/JavascriptCompiler.js

@@ -8,12 +8,17 @@ var _sharedUtils = require("@aiot-toolkit/shared-utils");
 var _core = require("@rspack/core");
 var _lodash = _interopRequireDefault(require("lodash"));
 var _path = _interopRequireDefault(require("path"));
+var _CompileMode = _interopRequireDefault(require("../enum/CompileMode"));
 var _AndroidWebpackConfigurator = _interopRequireDefault(require("./android/AndroidWebpackConfigurator"));
 var _VelaWebpackConfigurator = _interopRequireDefault(require("./vela/VelaWebpackConfigurator"));
 var _UxCompileUtil = _interopRequireDefault(require("./vela/utils/UxCompileUtil"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class JavascriptCompiler {
   QUICKAPP_CONFIG = 'quickapp.config.js';
+  constructor(context, onLog) {
+    this.context = context;
+    this.onLog = onLog;
+  }
   async compile(param) {
     return new Promise(async (resolve, reject) => {
       try {
@@ -49,6 +54,65 @@ class JavascriptCompiler {
       }
     });
   }
+
+  /**
+   * 压缩插件
+   *
+   * dev模式，只处理console，其它禁用
+   * prod模式，其它使用默认值
+   * @param mode
+   * @returns
+   */
+  createMinimizerRspackPlugin(compileOption) {
+    const {
+      mode,
+      dropConsole
+    } = compileOption;
+    const translateDropConsole = () => {
+      let dropConsoleValue;
+      if (dropConsole === undefined) {
+        dropConsoleValue = false;
+      } else if (dropConsole === 'true') {
+        dropConsoleValue = true;
+      } else if (dropConsole === 'false') {
+        dropConsoleValue = false;
+      } else {
+        dropConsoleValue = dropConsole;
+      }
+      return dropConsoleValue;
+    };
+    const createCompressValue = dropConsoleValue => {
+      const result = {};
+      if (typeof dropConsoleValue === 'boolean') {
+        result.drop_console = dropConsoleValue;
+      } else if (typeof dropConsoleValue === 'string') {
+        result.pure_funcs = dropConsoleValue.split(',').map(item => item.trim()).filter(Boolean).map(item => `console.${item}`);
+      }
+      return result;
+    };
+    if (mode === _CompileMode.default.DEVELOPMENT) {
+      return new _core.rspack.SwcJsMinimizerRspackPlugin({
+        minimizerOptions: {
+          module: true,
+          minify: false,
+          mangle: false,
+          compress: {
+            defaults: false,
+            ...createCompressValue(translateDropConsole())
+          }
+        }
+      });
+    } else {
+      return new _core.rspack.SwcJsMinimizerRspackPlugin({
+        minimizerOptions: {
+          module: true,
+          compress: {
+            ...createCompressValue(translateDropConsole())
+          }
+        }
+      });
+    }
+  }
   createWebpackConfig(param) {
     const configurator = this.getConfigurator(param);
     if (!configurator) {
@@ -82,17 +146,39 @@ class JavascriptCompiler {
         rules: [{
           test: /\.ux$/,
           // 匹配以 .ux 结尾的文件
+          exclude: /node_modules/,
           use: [{
             loader: _path.default.join(__dirname, '../javascript/vela/utils/webpackLoader/extractMapData.js')
           }]
+        },
+        // node_modules下的ux文件
+        {
+          test: /\.ux$/,
+          include: /node_modules/,
+          use: [{
+            loader: _path.default.join(__dirname, '../javascript/vela/utils/webpackLoader/WebpackUxLoader'),
+            options: {
+              compileParam: param,
+              context: this.context,
+              onLog: this.onLog
+            }
+          }]
+        }, {
+          test: /\.js$/,
+          include: /node_modules/,
+          use: [{
+            loader: _path.default.join(__dirname, '../javascript/vela/utils/webpackLoader/WebpackJsLoader'),
+            options: {
+              compileParam: param,
+              context: this.context,
+              onLog: this.onLog
+            }
+          }]
         }]
       },
       optimization: {
-        minimizer: [new _core.rspack.SwcJsMinimizerRspackPlugin({
-          minimizerOptions: {
-            module: true
-          }
-        })]
+        minimize: true,
+        minimizer: [this.createMinimizerRspackPlugin(param)]
       },
       resolve: {
         extensions: ['.js', '.ts', '.ux']

package/lib/compiler/javascript/android/AndroidWebpackConfigurator.js

@@ -7,8 +7,8 @@ exports.default = void 0;
 var _VelaWebpackConfigurator = _interopRequireDefault(require("../vela/VelaWebpackConfigurator"));
 var _WrapPlugin = _interopRequireDefault(require("./plugin/WrapPlugin"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-/**
- * AndroidWebpackConfigurator
+/**
+ * AndroidWebpackConfigurator
  */
 class AndroidWebpackConfigurator extends _VelaWebpackConfigurator.default {
   createWrapPlugin() {

package/lib/compiler/javascript/android/plugin/WrapPlugin.js

@@ -8,8 +8,8 @@ var _core = require("@rspack/core");
 var _webpackSources = require("webpack-sources");
 var _UxFileUtils = _interopRequireDefault(require("../../../../utils/ux/UxFileUtils"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-/**
- * WrapPlugin
+/**
+ * WrapPlugin
  */
 class WrapPlugin {
   constructor(param) {
@@ -26,11 +26,11 @@ class WrapPlugin {
     });
   }
 
-  /**
-   * 添加包含代码
-   *
-   * 1. 仅 page 文件添加
-   * @param compilation
+  /**
+   * 添加包含代码
+   *
+   * 1. 仅 page 文件添加
+   * @param compilation
    */
   wrap(compilation) {
     // 获取入口文件