@aiot-toolkit/aiotpack 2.0.6-beta.8 → 2.1.0-prender.1

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

@@ -14,6 +14,7 @@ var _BuildNameFormatType = _interopRequireDefault(require("../enum/BuildNameForm
 var _Package = _interopRequireDefault(require("../model/Package"));
 var _UxCompileUtil = _interopRequireDefault(require("./UxCompileUtil"));
 var _SignUtil = _interopRequireDefault(require("./signature/SignUtil"));
+var _VruUtil = require("./VruUtil");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Zip 用于将打包成功的 build 目录按特定规则压缩成 rpk
@@ -66,17 +67,122 @@ class ZipUtil {
       _sharedUtils.ColorConsole.error(`The build file is missing, stop generating the application package, please check carefully`);
       return;
     }
+    const signConfig = await _SignUtil.default.getProjectSignConfig(param);
+    const rpkFileName = this.getFileName(param, config, 'rpk');
+
+    // VRU mode: produce wrapped RPK (manifest + logo + CERT + inner-vru)
+    if (param.enableVru) {
+      const wrappedRpkBuffer = await this.createWrappedReleaseRpk(param, config, files, signConfig);
+      return await this.generateDistFile(wrappedRpkBuffer, param, rpkFileName);
+    }
 
-    // 2
+    // Flat mode (default): all build files directly in RPK
     const {
       fullPackage
     } = await this.createPackagesDefinition(param, config, files);
-
-    // 生产出带签名的rpk文件buffer
-    const signConfig = await _SignUtil.default.getProjectSignConfig(param);
     const rpkBuffer = await ZipUtil.buildProjectAndOutput(fullPackage, signConfig);
-    // 3
-    return this.generateDistFile(rpkBuffer, param, this.getFileName(param, config, 'rpk'));
+    return await this.generateDistFile(rpkBuffer, param, rpkFileName);
+  }
+
+  /**
+   * Build the blueos-pack compatible "wrapped release" RPK.
+   * Outer RPK (zip) contains:
+   *   - manifest.json (top-level metadata)
+   *   - logo.<ext> (icon - kept as png since VUG conversion is out of scope)
+   *   - META-INF/CERT (signature)
+   *   - <package>.vru (multi-file VRU containing all build artifacts)
+   */
+  static async createWrappedReleaseRpk(param, config, files, signConfig) {
+    const {
+      projectPath,
+      outputPath
+    } = param;
+    const buildDir = _path.default.join(projectPath, outputPath);
+
+    // 1. Pack all build files into VRU
+    const vruEntries = [];
+    for (const f of files) {
+      // Skip top-level manifest.json and CERT — those go in outer rpk
+      if (f === 'manifest.json' || f === ZipUtil.CERT_PATH) continue;
+      const absPath = _path.default.join(buildDir, f);
+      vruEntries.push({
+        name: f,
+        data: _fsExtra.default.readFileSync(absPath)
+      });
+    }
+    // Add packageInfo.json for build metadata
+    const packageInfo = {
+      originType: 'native',
+      toolkit: 'aiot-toolkit',
+      buildTime: new Date().toISOString().slice(0, 19).replace('T', ' '),
+      node: process.version,
+      platform: process.platform,
+      arch: process.arch
+    };
+    vruEntries.push({
+      name: 'packageInfo.json',
+      data: Buffer.from(JSON.stringify(packageInfo, null, 2), 'utf-8')
+    });
+    // Sort entries alphabetically (matches blueos-pack ordering)
+    vruEntries.sort((a, b) => a.name.localeCompare(b.name));
+    const vruBuffer = _VruUtil.VruUtil.pack(vruEntries, config.package);
+
+    // 2. Build the outer RPK
+    const outerPackage = new _Package.default({
+      filePrefix: config.package,
+      fileSuffix: 'rpk',
+      standalone: true,
+      comment: JSON.stringify(this.createComment(param))
+    });
+
+    // Add manifest.json
+    const manifestPath = _path.default.join(buildDir, 'manifest.json');
+    if (_fsExtra.default.existsSync(manifestPath)) {
+      const manifestBuf = _fsExtra.default.readFileSync(manifestPath);
+      outerPackage.addResource({
+        fileBuildPath: 'manifest.json',
+        fileContentBuffer: manifestBuf,
+        fileContentDigest: _sharedUtils.CommonUtil.calcDataDigest(manifestBuf)
+      });
+    }
+
+    // Add icon (as-is, no VUG conversion)
+    if (config.icon) {
+      const iconPath = _path.default.join(buildDir, config.icon.replace(/^\//, ''));
+      if (_fsExtra.default.existsSync(iconPath)) {
+        const iconBuf = _fsExtra.default.readFileSync(iconPath);
+        const iconExt = _path.default.extname(iconPath) || '.png';
+        outerPackage.addResource({
+          fileBuildPath: `logo${iconExt}`,
+          fileContentBuffer: iconBuf,
+          fileContentDigest: _sharedUtils.CommonUtil.calcDataDigest(iconBuf)
+        });
+      }
+    }
+
+    // Add inner VRU
+    outerPackage.addResource({
+      fileBuildPath: _VruUtil.VruUtil.getVruName(config.package),
+      fileContentBuffer: vruBuffer,
+      fileContentDigest: _sharedUtils.CommonUtil.calcDataDigest(vruBuffer)
+    });
+
+    // Add CERT if present
+    const certAbsPath = _path.default.join(buildDir, ZipUtil.CERT_PATH);
+    if (_fsExtra.default.existsSync(certAbsPath)) {
+      let certBuf = _fsExtra.default.readFileSync(certAbsPath);
+      const metaZip = await _jszip.default.loadAsync(certBuf);
+      certBuf = await metaZip.generateAsync({
+        ...ZipUtil.ZIP_OPTION,
+        comment: null
+      });
+      outerPackage.addResource({
+        fileBuildPath: ZipUtil.CERT_PATH,
+        fileContentBuffer: certBuf,
+        fileContentDigest: _sharedUtils.CommonUtil.calcDataDigest(certBuf)
+      });
+    }
+    return await ZipUtil.buildProjectAndOutput(outerPackage, signConfig);
   }
   static getFileName(param, config, ext) {
     const {

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

@@ -20,7 +20,7 @@ async function _default(source) {
     projectPath: this.rootContext,
     onLog: log => onLog?.([log]),
     projectType: _sharedUtils.ProjectType.VELA_UX
-  }, compileParam, context).translate({
+  }, compileParam, context, true).translate({
     content: source
   }, []);
   callback(null, result.targetTree.getFullText());

package/lib/config/UxConfig.d.ts

@@ -5,6 +5,7 @@ import PngLoader from '../loader/ux/PngLoader';
 import AppUxLoader from '../loader/ux/vela/AppUxLoader';
 import HmlLoader from '../loader/ux/vela/HmlLoader';
 import UxLoader from '../loader/ux/vela/UxLoader';
+import AndroidUxLoader from '../loader/ux/android/UxLoader';
 import UxBeforeWorks from '../beforeWorks/ux/UxBeforeWorks';
 import UxAfterWorks from '../afterWorks/ux/UxAfterWorks';
 import { IChangedFile } from 'file-lane/lib/interface/IChangedFile';
@@ -28,13 +29,15 @@ declare class UxConfig implements IFileLaneConfig<IJavascriptCompileOption> {
     beforeCompile: import("file-lane").PreWork<IJavascriptCompileOption>[];
     afterCompile: ({
         worker: import("file-lane").FollowWork<IJavascriptCompileOption>;
+        workDescribe: string;
         workerDescribe?: undefined;
     } | {
         worker: import("file-lane").FollowWork<IJavascriptCompileOption>;
         workerDescribe: string;
+        workDescribe?: undefined;
     })[];
     afterWorks: (typeof UxAfterWorks.cleanOutput)[];
-    watchIgnores: RegExp[];
+    watchIgnores: string[];
     /**
      * 通过项目类型，返回模块配置
      */
@@ -46,11 +49,7 @@ declare class UxConfig implements IFileLaneConfig<IJavascriptCompileOption> {
         } | {
             test: RegExp[];
             exclude: RegExp[];
-            loader: (typeof UxLoader)[];
-        } | {
-            test: RegExp[];
             loader: (typeof HmlLoader | typeof UxLoader)[];
-            exclude?: undefined;
         } | {
             test: RegExp[];
             loader: (typeof JsLoader)[];
@@ -60,6 +59,14 @@ declare class UxConfig implements IFileLaneConfig<IJavascriptCompileOption> {
             loader: (typeof PngLoader)[];
             exclude?: undefined;
         })[];
+    } | {
+        rules: ({
+            test: RegExp[];
+            loader: (typeof AndroidUxLoader)[];
+        } | {
+            test: RegExp[];
+            loader: (typeof PngLoader)[];
+        })[];
     };
     /**
      * 判断项目类型

package/lib/config/UxConfig.js

@@ -75,13 +75,17 @@ 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
+    worker: _UxAfterCompile.default.writeGitIgnore,
+    workDescribe: 'Write .gitignore'
   }, {
     worker: _UxAfterCompile.default.symlinkNodeModule,
     workerDescribe: 'Create a soft link to the node_modules folder'
   }, {
     worker: _UxAfterCompile.default.compileJavascript,
     workerDescribe: 'Compile javascript project'
+  }, {
+    worker: _UxAfterCompile.default.prerender,
+    workerDescribe: 'Prerender pages to template.json + css.json'
   }, {
     worker: _UxAfterCompile.default.copyResource,
     workerDescribe: 'Copy resource files'
@@ -111,7 +115,7 @@ class UxConfig {
     workerDescribe: 'Check resource'
   }])();
   afterWorks = (() => [_UxAfterWorks.default.cleanOutput])();
-  watchIgnores = [/node_modules/, /build/, /dist/];
+  watchIgnores = ['**/node_modules/**', '**/build/**', '**/dist/**'];
 
   /**
    * 通过项目类型，返回模块配置
@@ -123,11 +127,8 @@ class UxConfig {
         test: ['app.ux'],
         loader: [_AppUxLoader.default]
       }, {
-        test: [/.+\.ux$/],
+        test: [/.+\.(ux|hml)$/],
         exclude: [/app\.ux/],
-        loader: [_UxLoader.default]
-      }, {
-        test: [/.+\.hml$/],
         loader: [_HmlLoader.default, _UxLoader.default]
       }, {
         test: [/.+\.js$/],

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

@@ -1,11 +1,20 @@
 import { IFileLaneContext, IFileParam, ILoader } from 'file-lane';
 import IJavascriptCompileOption from '../../compiler/javascript/interface/IJavascriptCompileOption';
+import { ILog } from '@aiot-toolkit/shared-utils';
+import FileLaneCompilation from 'file-lane/lib/FileLaneCompilation';
 /**
  * JsLoader
  */
 declare class JsLoader implements ILoader {
     context: IFileLaneContext;
     compilerOption: IJavascriptCompileOption;
+    compilation: FileLaneCompilation;
+    logs: ILog[];
+    /**
+     * 解析文件内容
+     * @param files files 待处理的文件数组
+     * @returns 处理后的文件数组
+     */
     parser(files: IFileParam<any>[]): Promise<IFileParam<any>[]>;
 }
 export default JsLoader;

package/lib/loader/ux/JsLoader.js

@@ -6,13 +6,28 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _parser = require("@aiot-toolkit/parser");
 var _sharedUtils = require("@aiot-toolkit/shared-utils");
+var _UxLoaderUtils = _interopRequireDefault(require("../../utils/ux/UxLoaderUtils"));
+var _path = _interopRequireDefault(require("path"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * JsLoader
  */
 class JsLoader {
+  logs = [];
+  /**
+   * 解析文件内容
+   * @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({
@@ -22,17 +37,41 @@ class JsLoader {
       } else {
         const options = {
           filePath: item.path,
-          projectPath: this.context.projectPath,
+          projectPath,
           content: item.content.toString(),
           projectType: _sharedUtils.ProjectType.getProjectType(this.context.projectPath),
-          onLog
+          onLog: log => {
+            this.logs.push(log);
+          }
         };
-        result.push({
-          path: item.path,
-          content: (await new _parser.ScriptToTypescript(options, this.compilerOption, this.context).translate({
-            content: new _parser.ScriptParser(options).parser(item.content.toString()).ast.content
-          }, [])).targetTree.getFullText()
+        const scriptTree = await new _parser.ScriptToTypescript(options, this.compilerOption, this.context).translate({
+          content: new _parser.ScriptParser(options).parser(item.content.toString()).ast.content
+        }, []);
+        const isService = _UxLoaderUtils.default.isServiceFile(item.path, {
+          compilation: this.compilation,
+          compilerOption: this.compilerOption,
+          context: this.context
         });
+        if (isService) {
+          result.push({
+            path: item.path,
+            content: _UxLoaderUtils.default.createServiceWrapper(scriptTree.targetTree).filter(Boolean).join('\n')
+          });
+        } else {
+          const isWidgetProvider = widgetProvider?.includes(_path.default.relative(_path.default.join(projectPath, sourceRoot), item.path).replace(/\\/g, '/'));
+          let content = scriptTree.targetTree.getFullText();
+          if (isWidgetProvider) {
+            const {
+              newScriptTree,
+              scriptSourceMap
+            } = _parser.SourceMapUtil.splitSourceMap(scriptTree.targetTree);
+            content = _parser.SourceMapUtil.concatSourceMap(`${newScriptTree.getFullText()}\n$app_exports$.default = exports["default"]\n`, scriptSourceMap);
+          }
+          result.push({
+            path: item.path,
+            content: content
+          });
+        }
       }
     }
     return result;

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

@@ -9,16 +9,16 @@ declare class HmlLoader implements ILoader {
     /**
      * 包裹 hml 文件
      *
-     * # 路径
-     * 如果存在同路径的 ux 后缀，报错；否则转换为同路径的 ux 后缀
-     *
      * # 内容
-     * 1. 给hml的内容加上<template></template>
-     * 2. 如果存在同路径同名的 script文件，则加到<script></script>中
-     * 3. 如果存在同路径同名的 style文件，则加到<style></style>中
+     * 1. 全文模式(存在template、script、style任一节点)，保留原内容不变
+     * 2. 否则，则进行如下包装
+     *    1. hml的内容: import放到最前，其它内容使用<template></template>包裹
+     *    2. 如果存在同路径同名的 script文件，则加到<script></script>中
+     *    3. 如果存在同路径同名的 style文件，则加到<style></style>中
      *
      * @param file
      */
     private wrapHml;
+    private nodesToString;
 }
 export default HmlLoader;

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

@@ -7,6 +7,9 @@ exports.default = void 0;
 var _path = _interopRequireDefault(require("path"));
 var _fs = _interopRequireDefault(require("fs"));
 var _parser = require("@aiot-toolkit/parser");
+var parse5 = _interopRequireWildcard(require("aiot-parse5"));
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * HmlLoader
@@ -21,13 +24,12 @@ class HmlLoader {
   /**
    * 包裹 hml 文件
    *
-   * # 路径
-   * 如果存在同路径的 ux 后缀，报错；否则转换为同路径的 ux 后缀
-   *
    * # 内容
-   * 1. 给hml的内容加上<template></template>
-   * 2. 如果存在同路径同名的 script文件，则加到<script></script>中
-   * 3. 如果存在同路径同名的 style文件，则加到<style></style>中
+   * 1. 全文模式(存在template、script、style任一节点)，保留原内容不变
+   * 2. 否则，则进行如下包装
+   *    1. hml的内容: import放到最前，其它内容使用<template></template>包裹
+   *    2. 如果存在同路径同名的 script文件，则加到<script></script>中
+   *    3. 如果存在同路径同名的 style文件，则加到<style></style>中
    *
    * @param file
    */
@@ -36,32 +38,47 @@ class HmlLoader {
       path,
       content
     } = file;
-    const uxExt = _parser.ExtensionConfig.UX;
+    const uxAst = parse5.parseFragment(content?.toString() || '', {
+      scriptingEnabled: false,
+      sourceCodeLocationInfo: true
+    });
+    const fullMode = uxAst.childNodes.some(node => {
+      return ['template', 'script', 'style'].includes(node.nodeName);
+    });
+    if (fullMode) {
+      return file;
+    }
     const getFilePath = ext => {
       const pathParsed = _path.default.parse(path);
       pathParsed.ext = ext;
       pathParsed.base = pathParsed.name + ext;
       return _path.default.format(pathParsed);
     };
-    const uxPath = getFilePath(uxExt);
-    if (_fs.default.existsSync(uxPath)) {
-      throw new Error(`${uxPath} already exists`);
-    }
     const scriptExts = _parser.ExtensionConfig.SCRIPTS;
     const styleExts = _parser.ExtensionConfig.STYLES;
     const scriptPath = scriptExts.map(item => getFilePath(item)).find(item => _fs.default.existsSync(item));
     const stylePath = styleExts.map(item => getFilePath(item)).find(item => _fs.default.existsSync(item));
-    let uxContent = ['<template>', content, '</template>'].join('\n');
+    const importNodes = uxAst.childNodes.filter(node => node.nodeName === 'import');
+    const otherNodes = uxAst.childNodes.filter(node => node.nodeName !== 'import');
+    let uxContent = this.nodesToString(importNodes);
+    uxContent += ['<template>', this.nodesToString(otherNodes), '</template>'].join('\n');
     if (scriptPath) {
       uxContent += ['<script>', _fs.default.readFileSync(scriptPath, 'utf-8'), '</script>'].join('\n');
     }
     if (stylePath) {
-      uxContent += ['<style>', _fs.default.readFileSync(stylePath, 'utf-8'), '</style>'].join('\n');
+      const styleExt = _path.default.extname(stylePath).toLowerCase();
+      uxContent += [`<style lang="${styleExt.slice(1)}">`, _fs.default.readFileSync(stylePath, 'utf-8'), '</style>'].join('\n');
     }
     return {
       path,
       content: uxContent
     };
   }
+  nodesToString(nodes) {
+    return parse5.serialize({
+      nodeName: '#document-fragment',
+      childNodes: nodes
+    });
+  }
 }
 var _default = exports.default = HmlLoader;

package/lib/prerender/PrerenderVM.d.ts

@@ -0,0 +1,86 @@
+import { ILog } from '@aiot-toolkit/shared-utils';
+/** 预渲染 DOM 节点 */
+export interface PrerenderNode {
+    type: string;
+    attr?: Record<string, any>;
+    class?: string;
+    style?: Record<string, string>;
+    styleObjectId?: number;
+    children?: PrerenderNode[];
+    events?: Record<string, string>;
+    bind?: number;
+    $repeat?: string;
+    repeat?: any[];
+    repeat_items?: PrerenderNode[];
+    import?: string;
+}
+/** 绑定标记：文本/属性绑定 */
+export interface BindingMarker {
+    $value: string;
+    bind: 1;
+    _staticValue?: any;
+    [key: string]: any;
+}
+/** 循环标记 */
+export interface RepeatMarker {
+    $repeat: string;
+    repeat: any[];
+}
+/** 事件标记 */
+export interface EventMarker {
+    [key: `$${string}`]: string;
+}
+/**
+ * PrerenderVM - 在 Node.js VM 沙箱中执行编译后的模板函数，收集 DOM 树
+ */
+export default class PrerenderVM {
+    private components;
+    private styleMap;
+    private bindCounter;
+    private styleSerializer;
+    private accessedKeys;
+    /** 创建 data Proxy，拦截访问并返回绑定标记（支持嵌套和数组） */
+    createDataProxy(data: Record<string, any>, parentPath?: string): Record<string, any>;
+    /** 获取已访问的 key 列表 */
+    getAccessedKeys(): string[];
+    /** Track binding markers accessed during a function call */
+    private _bindingAccess;
+    /** Create a binding marker with toString for string concatenation */
+    private createBindingMarker;
+    /** 文本绑定标记 */
+    static createTextBinding(key: string): BindingMarker;
+    /** 属性绑定标记 */
+    static createAttrBinding(attr: string, key: string): Record<string, any>;
+    /** 循环标记 */
+    static createRepeatMarker(listName: string): RepeatMarker;
+    /** 事件标记 */
+    static createEventMarker(event: string, handler: string): EventMarker;
+    /**
+     * 执行编译后的 JS，收集组件定义
+     */
+    execute(jsCode: string, onLog?: (logs: ILog[]) => void): {
+        tree: PrerenderNode | null;
+        styles: Record<number, any>;
+    };
+    private unwrapCode;
+    private createSandbox;
+    private collectStyles;
+    private normalizeStyleSheet;
+    private createMockVM;
+    private createNode;
+    private createConditionalNode;
+    private createForNode;
+    private createBlockNode;
+    private executeTemplate;
+    private parseInlineStyle;
+    private extractBindingExpression;
+    /** Replace $item.xxx references in event handler strings with actual values */
+    private bakeItemRefsInEvents;
+    /**
+     * Get all registered sub-component templates (excluding the bootstrapped main component)
+     */
+    getSubComponentTemplates(mainName?: string): Map<string, {
+        tree: PrerenderNode | null;
+        styles: Record<number, any>;
+    }>;
+}