@aiot-toolkit/aiotpack 2.0.6-beta.3 → 2.0.6-beta.4

package/lib/afterCompile/ux/UxAfterCompile.js

@@ -100,13 +100,13 @@ class UxAfterCompile {
   static toRpk = async params => {
     const {
       compilerOption,
-      compalition,
+      compilation,
       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(context.projectPath, compilerOption.releasePath, fileName);
+      if (compilation && fileName) {
+        compilation.info.rpk = _path.default.join(context.projectPath, compilerOption.releasePath, fileName);
       }
       return fileName;
     }
@@ -196,13 +196,15 @@ class UxAfterCompile {
       }
 
       // feature
+      // 无需检查的feature
+      const ignoreFeatureList = ['system.router', 'system.configuration', 'system.app'];
       if (translateCache?.featureCache.size) {
         // 消息提示
         // 1. 获取未手动配置的 feature
         // 2. 如果开启自动填充，则 info；否则 warn
         const featureSet = new Set([...Array.from(translateCache.featureCache), ...(content.features || []).map(item => item.name)]);
         const usedList = Array.from(featureSet).filter(Boolean);
-        const unSetList = usedList.filter(featureItem => !content.features?.find(item => item.name === featureItem));
+        const unSetList = usedList.filter(featureItem => !ignoreFeatureList.includes(featureItem) && !content.features?.find(item => item.name === featureItem));
         if (unSetList?.length) {
           const featureMessage = {
             word: `\n${JSON.stringify(unSetList.map(item => ({
@@ -313,13 +315,13 @@ class UxAfterCompile {
   static generateDiff = async params => {
     const {
       compilerOption,
-      compalition,
+      compilation,
       context
     } = params;
-    if (!compilerOption || !compalition) {
+    if (!compilerOption || !compilation) {
       return;
     }
-    if (compalition.trigger === _FileLaneTriggerType.default.START) {
+    if (compilation.trigger === _FileLaneTriggerType.default.START) {
       return;
     }
     // 读取临时项目build文件夹中所有文件路径
@@ -327,7 +329,7 @@ class UxAfterCompile {
     // 待优化，map文件跟随源文件变化，与时间戳有关文件无需对比
     const tempFileList = _sharedUtils.FileUtil.readAlldirSync(tempBuildDir);
     const buildDir = _path.default.join(context.projectPath, compilerOption.outputPath);
-    const diffList = _UxFileUtils.default.getDiffJSON(compalition.buildFileList, tempFileList, buildDir, tempBuildDir);
+    const diffList = _UxFileUtils.default.getDiffJSON(compilation.buildFileList, tempFileList, buildDir, tempBuildDir);
 
     // 所有差异文件，压缩到 .diff.rpk 中
     if (diffList?.length) {
@@ -339,8 +341,8 @@ class UxAfterCompile {
         filePath: _path.default.join(buildFold, item),
         zipFilePath: item
       })));
-      compalition.info.diffList = diffList;
-      compalition.info.diffFile = _path.default.join(context.projectPath, compilerOption.releasePath, diffFileName);
+      compilation.info.diffList = diffList;
+      compilation.info.diffFile = _path.default.join(context.projectPath, compilerOption.releasePath, diffFileName);
     }
   };
 
@@ -420,10 +422,11 @@ class UxAfterCompile {
   static compileLiteCard = async params => {
     const {
       compilerOption,
-      context
+      context,
+      compilation
     } = params;
     try {
-      if (context?.liteCards?.length > 0 && compilerOption) {
+      if (compilation && compilation?.liteCards?.length > 0 && compilerOption) {
         const {
           projectPath: tempProjectPath,
           outputPath: LITE_OUTPUT_PATH
@@ -434,7 +437,7 @@ class UxAfterCompile {
         // 1.
         await new _LiteCard.default(projectPath).compileLiteCard();
         // 2.
-        context.liteCards.forEach(card => {
+        compilation.liteCards.forEach(card => {
           // hap-toolkit的产物在项目的build文件夹下
           const fromPath = _path.default.join(projectPath, LITE_OUTPUT_PATH, card);
           // aiot-toolkit的产物在临时项目的build文件夹下

package/lib/compiler/javascript/vela/utils/webpackLoader/IWebpackLoaderOption.d.ts

@@ -1,11 +1,13 @@
 import { IFileLaneContext } from 'file-lane';
 import IJavascriptCompileOption from '../../../interface/IJavascriptCompileOption';
 import { ILog } from '@aiot-toolkit/shared-utils';
+import FileLaneCompilation from 'file-lane/lib/FileLaneCompilation';
 /**
  * IWebpackLoaderOption
  */
 export default interface IWebpackLoaderOption {
     compileParam: IJavascriptCompileOption;
     context: IFileLaneContext;
+    compilation: FileLaneCompilation;
     onLog: (log: ILog[]) => void;
 }

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

@@ -11,7 +11,8 @@ async function _default(source) {
   const {
     onLog,
     compileParam,
-    context
+    context,
+    compilation
   } = options;
   const callback = this.async();
   const {
@@ -20,7 +21,7 @@ async function _default(source) {
   } = await _UxLoaderUtils.default.compileUxToJavascript({
     path: this.resourcePath,
     content: source
-  }, context, false, compileParam);
+  }, context, false, compileParam, compilation);
   onLog?.(logs);
   callback(null, compiledFiles[0].content, compiledFiles[1].content);
 }

package/lib/loader/ux/android/UxLoader.d.ts

@@ -1,12 +1,14 @@
 import { ILog } from '@aiot-toolkit/shared-utils';
 import { IFileLaneContext, IFileParam, ILoader } from 'file-lane';
 import IJavascriptCompileOption from '../../../compiler/javascript/interface/IJavascriptCompileOption';
+import FileLaneCompilation from 'file-lane/lib/FileLaneCompilation';
 /**
  * UxLoader
  */
 declare class UxLoader implements ILoader {
     context: IFileLaneContext;
     compilerOption: IJavascriptCompileOption;
+    compilation: FileLaneCompilation;
     logs?: ILog[] | undefined;
     parser(files: IFileParam<any>[]): Promise<IFileParam<any>[]>;
 }

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

@@ -19,7 +19,8 @@ class UxLoader {
       } = await new _AndroidUx.default().compileUx({
         context: this.context,
         file: item,
-        compilerOption: this.compilerOption
+        compilerOption: this.compilerOption,
+        compilation: this.compilation
       });
       this.logs = logs;
       result.push(...files);

package/lib/loader/ux/vela/AppUxLoader.d.ts

@@ -1,6 +1,7 @@
 import { ILog } from '@aiot-toolkit/shared-utils';
 import { IFileLaneContext, IFileParam, ILoader } from 'file-lane';
 import IJavascriptCompileOption from '../../../compiler/javascript/interface/IJavascriptCompileOption';
+import FileLaneCompilation from 'file-lane/lib/FileLaneCompilation';
 /**
  * 处理app.ux的Loader
  * AppUxLoader
@@ -8,6 +9,7 @@ import IJavascriptCompileOption from '../../../compiler/javascript/interface/IJa
 declare class AppUxLoader implements ILoader {
     context: IFileLaneContext;
     compilerOption: IJavascriptCompileOption;
+    compilation: FileLaneCompilation;
     logs?: ILog[] | undefined;
     parser(files: IFileParam<any>[]): Promise<IFileParam<any>[]>;
 }

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

@@ -15,7 +15,7 @@ class AppUxLoader {
     const {
       files: resultFiles,
       logs
-    } = await _UxLoaderUtils.default.compileAppUxToJavascript(files[0], this.context, this.compilerOption);
+    } = await _UxLoaderUtils.default.compileAppUxToJavascript(files[0], this.context, this.compilerOption, this.compilation);
     this.logs = logs;
     return resultFiles;
   }

package/lib/loader/ux/vela/UxLoader.d.ts

@@ -1,9 +1,11 @@
 import { IFileLaneContext, IFileParam, ILoader } from 'file-lane';
 import IJavascriptCompileOption from '../../../compiler/javascript/interface/IJavascriptCompileOption';
 import { ILog } from '@aiot-toolkit/shared-utils/lib/interface/ILog';
+import FileLaneCompilation from 'file-lane/lib/FileLaneCompilation';
 declare class UxLoader implements ILoader {
     context: IFileLaneContext;
     compilerOption: IJavascriptCompileOption;
+    compilation: FileLaneCompilation;
     logs?: ILog[] | undefined;
     parser(files: IFileParam<any>[]): Promise<IFileParam<any>[]>;
 }

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

@@ -11,7 +11,7 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 class UxLoader {
   async parser(files) {
     const resultFiles = [];
-    const liteCardList = this.context.liteCards?.map(item => _path.default.join(this.context.projectPath, this.compilerOption.sourceRoot, `${item}${_parser.ExtensionConfig.UX}`)) || [];
+    const liteCardList = this.compilation.liteCards?.map(item => _path.default.join(this.context.projectPath, this.compilerOption.sourceRoot, `${item}${_parser.ExtensionConfig.UX}`)) || [];
     for (const file of files) {
       // 轻卡ux不转换
       if (liteCardList.includes(file.path)) {
@@ -21,7 +21,7 @@ class UxLoader {
       const {
         files: compiledFiles,
         logs
-      } = await _UxLoaderUtils.default.compileUxToJavascript(file, this.context, false, this.compilerOption);
+      } = await _UxLoaderUtils.default.compileUxToJavascript(file, this.context, false, this.compilerOption, this.compilation);
       this.logs = logs.map(item => {
         return {
           ...item,

package/lib/utils/BeforeCompileUtils.d.ts

@@ -6,8 +6,6 @@ import IJavascriptCompileOption from '../compiler/javascript/interface/IJavascri
 declare class BeforeCompileUtils {
     /**
      * 获取ux项目的路由入口
-     * context.entries中存放ux页面路由
-     * context.liteCards中存放轻卡路由
      * @param context
      * @param fileList
      * @returns

package/lib/utils/BeforeCompileUtils.js

@@ -20,8 +20,6 @@ const BinaryPlugin = require('@aiot-toolkit/parser/lib/ux/translate/vela/protobu
 class BeforeCompileUtils {
   /**
    * 获取ux项目的路由入口
-   * context.entries中存放ux页面路由
-   * context.liteCards中存放轻卡路由
    * @param context
    * @param fileList
    * @returns
@@ -29,7 +27,8 @@ class BeforeCompileUtils {
   static getEntries = params => {
     const {
       context,
-      compilerOption
+      compilerOption,
+      compilation
     } = params;
     const {
       projectPath
@@ -85,22 +84,24 @@ class BeforeCompileUtils {
       // 没有router配置
       _sharedUtils.ColorConsole.throw(`### manifest ### No router configuration`);
     }
-    context['entries'] = entryList;
-    context['liteCards'] = liteCardList;
+    if (compilation) {
+      compilation['entries'] = entryList;
+      compilation['liteCards'] = liteCardList;
+    }
     return Promise.resolve();
   };
   static clean = async params => {
     const {
       context,
       compilerOption,
-      compalition
+      compilation
     } = params;
     if (compilerOption) {
       // 存储build中的文件列表
       const buildPath = _path.default.join(context.projectPath, compilerOption.outputPath);
       const buildFileList = _fsExtra.default.existsSync(buildPath) ? _sharedUtils.FileUtil.readAlldirSync(buildPath).map(filePath => _path.default.relative(buildPath, filePath)) : [];
-      if (compalition) {
-        compalition.buildFileList = buildFileList;
+      if (compilation) {
+        compilation.buildFileList = buildFileList;
       }
     }
     context.translateCache = new _TranslateCache.default();

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

@@ -3,6 +3,7 @@ import { ILog } from '@aiot-toolkit/shared-utils';
 import { IFileLaneContext, IFileParam } from 'file-lane';
 import { SourceFile } from 'ts-morph';
 import IJavascriptCompileOption from '../../compiler/javascript/interface/IJavascriptCompileOption';
+import FileLaneCompilation from 'file-lane/lib/FileLaneCompilation';
 /**
  * UxLoaderUtils
  */
@@ -15,7 +16,7 @@ declare class UxLoaderUtils {
      * @param project
      * @returns
      */
-    static compileUxToJavascript(file: IFileParam, context: IFileLaneContext, isAppUx: boolean, compilerOption: IJavascriptCompileOption): Promise<{
+    static compileUxToJavascript(file: IFileParam, context: IFileLaneContext, isAppUx: boolean, compilerOption: IJavascriptCompileOption, compilation: FileLaneCompilation): Promise<{
         files: IFileParam[];
         logs: ILog[];
     }>;
@@ -25,7 +26,7 @@ declare class UxLoaderUtils {
      * @param resultFiles
      * @param context
      */
-    static compileAppUxToJavascript(file: IFileParam, context: IFileLaneContext, compileOption: IJavascriptCompileOption): Promise<{
+    static compileAppUxToJavascript(file: IFileParam, context: IFileLaneContext, compileOption: IJavascriptCompileOption, compilation: FileLaneCompilation): Promise<{
         files: IFileParam[];
         logs: ILog[];
     }>;
@@ -41,7 +42,7 @@ declare class UxLoaderUtils {
      * @param filePath
      * @returns
      */
-    static isPageUx(context: IFileLaneContext, filePath: string): boolean;
+    static isPageUx(compilation: FileLaneCompilation, filePath: string): boolean;
     /**
      * 获取app.ux的内容，且只返回script和style内容
      * @param fileContent

package/lib/utils/ux/UxLoaderUtils.js

@@ -54,7 +54,7 @@ class UxLoaderUtils {
    * @param project
    * @returns
    */
-  static async compileUxToJavascript(file, context, isAppUx, compilerOption) {
+  static async compileUxToJavascript(file, context, isAppUx, compilerOption, compilation) {
     const logs = [];
     const {
       path: filePath,
@@ -77,7 +77,7 @@ class UxLoaderUtils {
     }
 
     // 区分页面组件和子组件
-    const isPageUx = UxLoaderUtils.isPageUx(context, filePath);
+    const isPageUx = UxLoaderUtils.isPageUx(compilation, filePath);
     // 配置转换参数
     const options = {
       projectPath: context.projectPath,
@@ -179,7 +179,7 @@ class UxLoaderUtils {
    * @param resultFiles
    * @param context
    */
-  static async compileAppUxToJavascript(file, context, compileOption) {
+  static async compileAppUxToJavascript(file, context, compileOption, compilation) {
     const {
       path: filePath,
       content
@@ -194,7 +194,7 @@ class UxLoaderUtils {
     const compileResult = await UxLoaderUtils.compileUxToJavascript({
       path: filePath,
       content: appContent
-    }, context, isAppUx, compileOption);
+    }, context, isAppUx, compileOption, compilation);
     return compileResult;
   }
   /**
@@ -213,8 +213,8 @@ class UxLoaderUtils {
    * @param filePath
    * @returns
    */
-  static isPageUx(context, filePath) {
-    return Boolean(context.entries?.includes(filePath));
+  static isPageUx(compilation, filePath) {
+    return Boolean(compilation.entries?.includes(filePath));
   }
   /**
    * 获取app.ux的内容，且只返回script和style内容

package/lib/utils/ux/android/AndroidUx.d.ts

@@ -1,6 +1,7 @@
 import { ILog } from '@aiot-toolkit/shared-utils';
 import { IFileLaneContext, IFileParam } from 'file-lane';
 import IJavascriptCompileOption from '../../../compiler/javascript/interface/IJavascriptCompileOption';
+import FileLaneCompilation from 'file-lane/lib/FileLaneCompilation';
 /**
  * AndroidUx
  */
@@ -18,6 +19,7 @@ declare class AndroidUx {
         context: IFileLaneContext;
         file: IFileParam;
         compilerOption: IJavascriptCompileOption;
+        compilation: FileLaneCompilation;
     }): Promise<{
         files: IFileParam[];
         logs: ILog[];

package/lib/utils/ux/android/AndroidUx.js

@@ -28,7 +28,8 @@ class AndroidUx {
     const {
       context,
       file,
-      compilerOption
+      compilerOption,
+      compilation
     } = params;
     const {
       path: filePath,
@@ -37,7 +38,7 @@ class AndroidUx {
     const {
       projectPath
     } = context;
-    const fileType = this.getFileType(filePath, context);
+    const fileType = this.getFileType(filePath, compilation);
 
     // 无内容的文件，添加空内容警告
     if (!content) {
@@ -84,10 +85,10 @@ class AndroidUx {
       logs
     };
   }
-  getFileType(filePath, context) {
+  getFileType(filePath, compilation) {
     const {
       entries
-    } = context;
+    } = compilation;
     if (_path.default.basename(filePath) === 'app.ux') {
       return 'app';
     } else if (entries.includes(filePath)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.0.6-beta.3",
+  "version": "2.0.6-beta.4",
   "description": "The process tool for packaging aiot projects.",
   "keywords": [
     "aiotpack"
@@ -19,14 +19,14 @@
     "test": "node ./__tests__/aiotpack.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/generator": "2.0.6-beta.3",
-    "@aiot-toolkit/parser": "2.0.6-beta.3",
-    "@aiot-toolkit/shared-utils": "2.0.6-beta.3",
+    "@aiot-toolkit/generator": "2.0.6-beta.4",
+    "@aiot-toolkit/parser": "2.0.6-beta.4",
+    "@aiot-toolkit/shared-utils": "2.0.6-beta.4",
     "@hap-toolkit/aaptjs": "^2.0.0",
     "@rspack/core": "^1.3.9",
     "aiot-parse5": "^1.0.2",
     "babel-loader": "^9.1.3",
-    "file-lane": "2.0.6-beta.3",
+    "file-lane": "2.0.6-beta.4",
     "file-loader": "^6.2.0",
     "fs-extra": "^11.2.0",
     "jsrsasign": "^11.1.0",
@@ -42,5 +42,5 @@
     "@types/jsrsasign": "^10.5.12",
     "@types/webpack-sources": "^3.2.3"
   },
-  "gitHead": "2e2ba4b1d293218736343237d963fe93c5fb27a8"
+  "gitHead": "1acc8279ba3c5995aebe3a97a6b33154086f09d6"
 }