@aiot-toolkit/aiotpack 2.0.5-beta.10 → 2.0.5-beta.13

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

@@ -39,5 +39,21 @@ 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>;
 }
 export default UxAfterCompile;

package/lib/afterCompile/ux/UxAfterCompile.js

@@ -16,8 +16,10 @@ 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");
 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
@@ -361,5 +363,104 @@ 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 {
+      config,
+      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: config.projectPath,
+          signMode: 'BUILD',
+          enableCustomComponent: true
+        });
+        // 1.3
+        _process.stdout.write = originalStdout;
+        // 2.
+        context.liteCards.forEach(card => {
+          // hap-toolkit的产物在项目的build文件夹下
+          const fromPath = _path.default.join(config.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);
+    }
+  };
 }
 var _default = exports.default = UxAfterCompile;

package/lib/compiler/javascript/vela/interface/IManifest.d.ts

@@ -1,4 +1,13 @@
 import { Dictionary } from '@aiot-toolkit/shared-utils';
+export declare const LITE_CARD_TYPE = "lite";
+interface IWidget {
+    name: string;
+    component: string;
+    minCardPlatformVersion: Number;
+    providerUri: string;
+    sizes: string[];
+    type?: string;
+}
 /**
  * vela manifest文件对应的数据结构
  */
@@ -16,6 +25,7 @@ export default interface IManifest {
         designWidth?: string | number;
     };
     router: {
+        widgets?: Record<string, IWidget>;
         entry: string;
         pages: Dictionary<{
             component?: string;
@@ -28,3 +38,4 @@ export default interface IManifest {
 export interface IFeatures {
     name: string;
 }
+export {};

package/lib/compiler/javascript/vela/interface/IManifest.js

@@ -1 +1,11 @@
-"use strict";
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.LITE_CARD_TYPE = void 0;
+const LITE_CARD_TYPE = exports.LITE_CARD_TYPE = 'lite';
+
+/**
+ * vela manifest文件对应的数据结构
+ */

package/lib/compiler/javascript/vela/utils/UxCompileUtil.js

@@ -8,6 +8,7 @@ var _sharedUtils = require("@aiot-toolkit/shared-utils");
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 var _path = _interopRequireDefault(require("path"));
 var _EntryType = _interopRequireDefault(require("../enum/EntryType"));
+var _IManifest = require("../interface/IManifest");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class UxCompileUtil {
   // 摘要文件夹
@@ -80,6 +81,10 @@ class UxCompileUtil {
           throw new Error(`Compilation failed: please confirm that '${routePath}' configured by router.pages in manifest.json is the directory name`);
         }
         const conf = confs[routePath];
+        //轻卡无需打包
+        if (conf.type === _IManifest.LITE_CARD_TYPE) {
+          return;
+        }
         const entryKey = _path.default.join(routePath, conf.component);
         const filePath = this.resolveFile(_path.default.join(codeDir, entryKey));
         if (!filePath) {

package/lib/config/UxConfig.js

@@ -89,6 +89,9 @@ class UxConfig {
   }, {
     worker: _UxAfterCompile.default.protobuf,
     workerDescribe: 'Generate protobuf json'
+  }, {
+    worker: _UxAfterCompile.default.compileLiteCard,
+    workerDescribe: 'compile lite card'
   }, {
     worker: _UxAfterCompile.default.toRpk,
     workerDescribe: 'Package the project into an RPK file'
@@ -98,6 +101,9 @@ class UxConfig {
   }, {
     worker: _UxAfterCompile.default.moveBackResult,
     workerDescribe: 'Migrate temporary project'
+  }, {
+    worker: _UxAfterCompile.default.resourceCheck,
+    workerDescribe: 'Check resource'
   }])();
   afterWorks = (() => [_UxAfterWorks.default.cleanOutput])();
   watchIgnores = [/node_modules/, /build/, /dist/];

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

@@ -5,11 +5,18 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _UxLoaderUtils = _interopRequireDefault(require("../../../utils/ux/UxLoaderUtils"));
+var _path = _interopRequireDefault(require("path"));
+var _parser = require("@aiot-toolkit/parser");
 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}`)) || [];
     for (const file of files) {
+      // 轻卡ux不转换
+      if (liteCardList.includes(file.path)) {
+        continue;
+      }
       // 转换每个文件
       const {
         files: compiledFiles,

package/lib/utils/BeforeCompileUtils.d.ts

@@ -6,6 +6,8 @@ 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

@@ -10,6 +10,7 @@ var _fsExtra = _interopRequireDefault(require("fs-extra"));
 var _path = _interopRequireDefault(require("path"));
 var _TranslateCache = _interopRequireDefault(require("@aiot-toolkit/parser/lib/ux/translate/vela/TranslateCache"));
 var _UxFileUtils = _interopRequireDefault(require("./ux/UxFileUtils"));
+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');
 
@@ -19,6 +20,8 @@ const BinaryPlugin = require('@aiot-toolkit/parser/lib/ux/translate/vela/protobu
 class BeforeCompileUtils {
   /**
    * 获取ux项目的路由入口
+   * context.entries中存放ux页面路由
+   * context.liteCards中存放轻卡路由
    * @param context
    * @param fileList
    * @returns
@@ -34,14 +37,17 @@ class BeforeCompileUtils {
     const srcPath = _path.default.join(projectPath, compilerOption.sourceRoot);
     // 判断路径是否真实存在
     const manifestContent = _UxFileUtils.default.getManifestInfo(projectPath);
-    // 存储entries
+    // 存储页面entries
     let entryList = [];
+    // 存储轻卡路由
+    let liteCardList = [];
     const {
       router
     } = manifestContent;
     if (router) {
       const {
-        pages
+        pages,
+        widgets
       } = router;
       if (pages) {
         Object.keys(pages).map(page => {
@@ -60,11 +66,27 @@ class BeforeCompileUtils {
         // 没有pages配置
         _sharedUtils.ColorConsole.throw(`### manifest ### No pages configuration`);
       }
+      //获取轻卡路由
+      if (widgets) {
+        Object.keys(widgets).map(card => {
+          const cardContent = widgets[card];
+          if (cardContent.type === _IManifest.LITE_CARD_TYPE) {
+            const cardPath = _path.default.join(srcPath, card, cardContent.component + _parser.ExtensionConfig.UX);
+            if (_fsExtra.default.existsSync(cardPath)) {
+              liteCardList.push(card + _path.default.posix.sep + cardContent.component);
+            } else {
+              // 报错
+              _sharedUtils.ColorConsole.throw(`### manifest ### lite card path '${cardPath}' does not exist`);
+            }
+          }
+        });
+      }
     } else {
       // 没有router配置
       _sharedUtils.ColorConsole.throw(`### manifest ### No router configuration`);
     }
     context['entries'] = entryList;
+    context['liteCards'] = liteCardList;
     return Promise.resolve();
   };
   static clean = async params => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.0.5-beta.10",
+  "version": "2.0.5-beta.13",
   "description": "The process tool for packaging aiot projects.",
   "keywords": [
     "aiotpack"
@@ -19,18 +19,19 @@
     "test": "node ./__tests__/aiotpack.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/generator": "2.0.5-beta.10",
-    "@aiot-toolkit/parser": "2.0.5-beta.10",
-    "@aiot-toolkit/shared-utils": "2.0.5-beta.10",
+    "@aiot-toolkit/generator": "2.0.5-beta.13",
+    "@aiot-toolkit/parser": "2.0.5-beta.13",
+    "@aiot-toolkit/shared-utils": "2.0.5-beta.13",
     "@hap-toolkit/aaptjs": "^2.0.0",
     "@rspack/core": "^1.1.8",
     "aiot-parse5": "^1.0.2",
     "archiver": "^7.0.1",
     "babel-loader": "^9.1.3",
     "fast-glob": "^3.3.2",
-    "file-lane": "2.0.5-beta.10",
+    "file-lane": "2.0.5-beta.13",
     "file-loader": "^6.2.0",
     "fs-extra": "^11.2.0",
+    "hap-toolkit": "^2.0.0",
     "jsrsasign": "^11.1.0",
     "jszip": "^3.10.1",
     "lodash": "^4.17.21",
@@ -46,5 +47,5 @@
     "@types/jsrsasign": "^10.5.12",
     "@types/webpack-sources": "^3.2.3"
   },
-  "gitHead": "b2403dbd071d5a6ae33b27f49c6f47ba95861477"
+  "gitHead": "45bca4420e8a8708733eccea32bf928b4821f4d5"
 }