@aiot-toolkit/aiotpack 2.1.0-prender.1 → 2.1.0-prender.2

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

@@ -6,10 +6,6 @@ import IJavascriptCompileOption from '../../compiler/javascript/interface/IJavas
 declare class UxAfterCompile {
     static compileJavascript: FollowWork<IJavascriptCompileOption>;
     static protobuf: FollowWork<IJavascriptCompileOption>;
-    /**
-     * 预渲染：在 VM 沙箱中执行编译后的模板函数，生成 .template.json + .css.json
-     */
-    static prerender: FollowWork<IJavascriptCompileOption>;
     static jsc: FollowWork<IJavascriptCompileOption>;
     static toRpk: FollowWork<IJavascriptCompileOption>;
     /**

package/lib/afterCompile/ux/UxAfterCompile.js

@@ -19,7 +19,6 @@ var _ZipFileUtil = _interopRequireDefault(require("@aiot-toolkit/shared-utils/li
 var _ImageIcu = _interopRequireDefault(require("../../compiler/tools/icu/ImageIcu"));
 var _LiteCard = _interopRequireDefault(require("../../compiler/javascript/vela/utils/LiteCard"));
 var _UxUtil = _interopRequireDefault(require("@aiot-toolkit/parser/lib/ux/utils/UxUtil"));
-var _prerender = require("../../prerender");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const BinaryPlugin = require('@aiot-toolkit/parser/lib/ux/translate/vela/protobuf/BinaryPlugin');
 
@@ -90,70 +89,6 @@ class UxAfterCompile {
       BinaryPlugin.createBinFiles();
     }
   };
-
-  /**
-   * 预渲染：在 VM 沙箱中执行编译后的模板函数，生成 .template.json + .css.json
-   */
-  static prerender = async params => {
-    const {
-      compilerOption,
-      onLog,
-      compilation
-    } = params;
-    if (!compilerOption || compilerOption.enablePrerender === false) {
-      return;
-    }
-
-    // In watch mode, clear prerender caches for changed pages
-    if (compilation && compilation.trigger !== _FileLaneTriggerType.default.START) {
-      const {
-        sourceRoot
-      } = compilerOption;
-      const srcPath = _path.default.join(compilerOption.projectPath, sourceRoot);
-      const changedPages = (compilation.changedFiles || []).filter(f => compilation.entries?.includes(f)).map(f => {
-        const rel = _path.default.relative(srcPath, f).replace(/\\/g, '/');
-        return rel.replace(/\.[^.]+$/, '');
-      });
-      (0, _prerender.watchChange)(changedPages.length > 0 ? changedPages : undefined);
-    }
-    const {
-      projectPath,
-      outputPath,
-      sourceRoot
-    } = compilerOption;
-    const buildPath = _path.default.join(projectPath, outputPath);
-    const manifestPath = _path.default.join(projectPath, sourceRoot, 'manifest.json');
-    if (!_fsExtra.default.existsSync(manifestPath)) {
-      return;
-    }
-    const excludeList = compilerOption.prerenderExclude || [];
-    const manifest = _fsExtra.default.readJSONSync(manifestPath);
-    const pages = Object.keys(manifest.router?.pages || {}).filter(pageName => {
-      if (excludeList.some(pattern => pageName.startsWith(pattern))) {
-        onLog?.([{
-          level: _sharedUtils.Loglevel.INFO,
-          message: [`prerender: skip excluded ${pageName}`]
-        }]);
-        return false;
-      }
-      return true;
-    }).map(pageName => {
-      const pageConf = manifest.router.pages[pageName];
-      const component = pageConf.component || 'index';
-      return `${pageName}/${component}`;
-    });
-    if (!pages.length) {
-      return;
-    }
-    const deviceTypes = manifest.deviceTypeList?.length ? manifest.deviceTypeList : ['default'];
-    await (0, _prerender.prerender)({
-      buildPath,
-      sourcePath: _path.default.join(projectPath, sourceRoot),
-      pages,
-      prerenderSubComp: compilerOption.prerenderSubComp !== false,
-      deviceTypes
-    }, onLog);
-  };
   static jsc = async params => {
     const {
       context,

package/lib/compiler/javascript/ViteCompiler.js

@@ -57,9 +57,9 @@ class ViteCompiler {
               fileName: () => 'output.js'
             },
             rollupOptions: {
-              external: id => id.startsWith('@app-module/') || id.startsWith('@system.'),
+              external: id => id.startsWith('@app-module/') || /^@(system|service|android|hap)\./.test(id),
               output: {
-                globals: id => `$app_require$("@app-module/${id.replace(/^@(system|app-module)\./, '')}")`
+                globals: id => `$app_require$("@app-module/${id.replace(/^@(system|service|android|hap|app-module)\./, '')}")`
               }
             },
             commonjsOptions: {
@@ -88,10 +88,15 @@ class ViteCompiler {
             name: 'system-to-app-require',
             enforce: 'pre',
             transform(code, id) {
-              if (!code.includes('@system.')) return null;
+              if (!/@(system|service|android|hap)\.|@app-module\//.test(code)) return null;
+              const NS = '(system|service|android|hap)';
               let t = code;
-              t = t.replace(/import\s+(\w+)\s+from\s+['"]@system\.([^'"]+)['"]\s*;?/g, 'const $1 = $app_require$("@app-module/system.$2");');
-              t = t.replace(/import\s+\{([^}]+)\}\s+from\s+['"]@system\.([^'"]+)['"]\s*;?/g, 'const {$1} = $app_require$("@app-module/system.$2");');
+              t = t.replace(new RegExp(`import\\s+(\\w+)\\s+from\\s+['"]@${NS}\\.([^'"]+)['"]\\s*;?`, 'g'), 'const $1 = $app_require$("@app-module/$2.$3");');
+              t = t.replace(new RegExp(`import\\s+\\{([^}]+)\\}\\s+from\\s+['"]@${NS}\\.([^'"]+)['"]\\s*;?`, 'g'), 'const {$1} = $app_require$("@app-module/$2.$3");');
+              t = t.replace(/import\s+(\w+)\s+from\s+['"]@app-module\/([^'"]+)['"]\s*;?/g, 'const $1 = $app_require$("@app-module/$2");');
+              t = t.replace(/import\s+\{([^}]+)\}\s+from\s+['"]@app-module\/([^'"]+)['"]\s*;?/g, 'const {$1} = $app_require$("@app-module/$2");');
+              t = t.replace(/import\s+['"]@app-module\/([^'"]+)['"]\s*;?/g, '$app_require$("@app-module/$1");');
+              t = t.replace(new RegExp(`import\\s+['"]@${NS}\\.([^'"]+)['"]\\s*;?`, 'g'), '$app_require$("@app-module/$1.$2");');
               return t !== code ? {
                 code: t,
                 map: null
@@ -164,53 +169,83 @@ class ViteCompiler {
                   _fsExtra.default.writeJSONSync(tplPath, (0, _TemplateCompiler.uxToTemplateJson)(templateNode, sid, styleSheet, importMap, _path.default.dirname(pageName)), param.mode === 'production' ? undefined : {
                     spaces: 2
                   });
-                  // Generate sub-component template.json files
+                  // Worklist BFS over nested <import> chain so transitively imported
+                  // components (entry → compA → compB → compC) also get template.json
+                  const worklist = [];
+                  const visited = new Set();
                   for (const [compName, compPath] of Object.entries(importMap)) {
                     const compUxPath = _path.default.resolve(_path.default.dirname(id), `../../${compPath}.ux`);
-                    if (_fsExtra.default.existsSync(compUxPath)) {
-                      const compContent = _fsExtra.default.readFileSync(compUxPath, 'utf-8');
-                      const compDoc = parse5.parseFragment(compContent, {
-                        scriptingEnabled: false
-                      });
-                      const compTpl = compDoc.childNodes.find(n => n.nodeName === 'template');
-                      if (compTpl) {
-                        const compTplPath = _path.default.join(buildPath, `${compPath}.template.json`);
-                        _fsExtra.default.ensureDirSync(_path.default.dirname(compTplPath));
-                        // Get component styles
-                        const compResult = await _UxLoaderUtils.default.compileUxToJavascript({
-                          path: compUxPath,
-                          content: compContent
-                        }, {
-                          projectPath: originalProjectPath,
-                          sourceRoot
-                        }, false, param, compilation);
-                        let compStyleSheet = {};
-                        const compCode = compResult.files[0]?.content || '';
-                        const csm = compCode.match(/var \$app_style\$ = (\[[\s\S]*?\]);?\s*(?:import|export|var |const |$)/);
-                        if (csm) {
-                          compStyleSheet = (0, _TemplateCompiler.parseStyleArray)(csm[1]);
+                    worklist.push({
+                      compName,
+                      compPath,
+                      compUxPath
+                    });
+                  }
+                  while (worklist.length) {
+                    const {
+                      compName,
+                      compPath,
+                      compUxPath
+                    } = worklist.shift();
+                    if (visited.has(compPath)) continue;
+                    visited.add(compPath);
+                    if (!_fsExtra.default.existsSync(compUxPath)) continue;
+                    const compContent = _fsExtra.default.readFileSync(compUxPath, 'utf-8');
+                    const compDoc = parse5.parseFragment(compContent, {
+                      scriptingEnabled: false
+                    });
+                    let compTpl = null;
+                    const compImportMap = {};
+                    for (const node of compDoc.childNodes) {
+                      if (node.nodeName === 'template') compTpl = node;else if (node.nodeName === 'import') {
+                        const n = node.attrs?.find(a => a.name === 'name');
+                        const s = node.attrs?.find(a => a.name === 'src');
+                        if (n && s) {
+                          const nestedAbsPath = _path.default.resolve(_path.default.dirname(compUxPath), s.value).replace(/\.ux$/, '');
+                          const nestedPath = _path.default.relative(srcPath, nestedAbsPath).replace(/\\/g, '/');
+                          compImportMap[n.value.toLowerCase()] = nestedPath;
+                          if (!visited.has(nestedPath)) {
+                            worklist.push({
+                              compName: n.value.toLowerCase(),
+                              compPath: nestedPath,
+                              compUxPath: _path.default.resolve(_path.default.dirname(compUxPath), s.value)
+                            });
+                          }
                         }
-                        const compSid = (0, _TemplateCompiler.getStyleObjectId)(compPath);
-                        _fsExtra.default.writeJSONSync(compTplPath, (0, _TemplateCompiler.uxToTemplateJson)(compTpl, compSid, compStyleSheet, undefined, _path.default.dirname(compPath)), param.mode === 'production' ? undefined : {
-                          spaces: 2
-                        });
-                        // Generate component css.json
-                        const compCssPath = _path.default.join(buildPath, `${compPath}.css.json`);
-                        _fsExtra.default.writeJSONSync(compCssPath, Object.keys(compStyleSheet).length ? {
-                          [String(compSid)]: compStyleSheet
-                        } : {}, param.mode === 'production' ? undefined : {
-                          spaces: 2
-                        });
-                        // Generate component js (script only)
-                        const compJsPath = _path.default.join(buildPath, `${compPath}.js`);
-                        // Extract the component object from the compiled code
-                        const exportMatch = compCode.match(/export\s+default\s+([\s\S]*?);?\s*$/);
-                        const compObj = exportMatch ? exportMatch[1].trim() : '{}';
-                        const compVarName = compName.replace(/-/g, '_') + '_default';
-                        const compJsContent = `let $style$${compSid} = {"@info":{"styleObjectId":${compSid}}};\nconst $app_style$${compSid} = $style$${compSid};\nvar ${compVarName} = ${compObj};\n$app_define$("@app-component/${compName}", [], function($app_require$, $app_exports$, $app_module$) {\n  $app_module$.exports = ${compVarName}.default || ${compVarName};\n  $app_module$.exports.style = $app_style$${compSid};\n});\n`;
-                        _fsExtra.default.writeFileSync(compJsPath, compJsContent);
                       }
                     }
+                    if (!compTpl) continue;
+                    const compTplPath = _path.default.join(buildPath, `${compPath}.template.json`);
+                    _fsExtra.default.ensureDirSync(_path.default.dirname(compTplPath));
+                    const compResult = await _UxLoaderUtils.default.compileUxToJavascript({
+                      path: compUxPath,
+                      content: compContent
+                    }, {
+                      projectPath: originalProjectPath,
+                      sourceRoot
+                    }, false, param, compilation);
+                    let compStyleSheet = {};
+                    const compCode = compResult.files[0]?.content || '';
+                    const csm = compCode.match(/var \$app_style\$ = (\[[\s\S]*?\]);?\s*(?:import|export|var |const |$)/);
+                    if (csm) {
+                      compStyleSheet = (0, _TemplateCompiler.parseStyleArray)(csm[1]);
+                    }
+                    const compSid = (0, _TemplateCompiler.getStyleObjectId)(compPath);
+                    _fsExtra.default.writeJSONSync(compTplPath, (0, _TemplateCompiler.uxToTemplateJson)(compTpl, compSid, compStyleSheet, compImportMap, _path.default.dirname(compPath)), param.mode === 'production' ? undefined : {
+                      spaces: 2
+                    });
+                    const compCssPath = _path.default.join(buildPath, `${compPath}.css.json`);
+                    _fsExtra.default.writeJSONSync(compCssPath, Object.keys(compStyleSheet).length ? {
+                      [String(compSid)]: compStyleSheet
+                    } : {}, param.mode === 'production' ? undefined : {
+                      spaces: 2
+                    });
+                    const compJsPath = _path.default.join(buildPath, `${compPath}.js`);
+                    const exportMatch = compCode.match(/export\s+default\s+([\s\S]*?);?\s*$/);
+                    const compObj = exportMatch ? exportMatch[1].trim() : '{}';
+                    const compVarName = compName.replace(/-/g, '_') + '_default';
+                    const compJsContent = `let $style$${compSid} = {"@info":{"styleObjectId":${compSid}}};\nconst $app_style$${compSid} = $style$${compSid};\nvar ${compVarName} = ${compObj};\n$app_define$("@app-component/${compName}", [], function($app_require$, $app_exports$, $app_module$) {\n  $app_module$.exports = ${compVarName}.default || ${compVarName};\n  $app_module$.exports.style = $app_style$${compSid};\n});\n`;
+                    _fsExtra.default.writeFileSync(compJsPath, compJsContent);
                   }
                 }
               }

package/lib/compiler/javascript/interface/IJavascriptCompileOption.d.ts

@@ -80,23 +80,6 @@ interface IJavascriptCompileOption extends ICompileParam {
      * @example log,warn
      */
     dropConsole?: boolean | string;
-    /**
-     * 启用预渲染
-     *
-     * 编译后在 VM 沙箱中执行模板函数，生成 .template.json + .css.json
-     * @default true
-     */
-    enablePrerender?: boolean;
-    /**
-     * 是否预渲染子组件（import 引用的组件）
-     * @default true
-     */
-    prerenderSubComp?: boolean;
-    /**
-     * 排除不预渲染的页面路径列表
-     * 支持前缀匹配，如 ['pages/Dynamic'] 会排除 pages/Dynamic/index 等
-     */
-    prerenderExclude?: string[];
     /**
      * 启动页
      */

package/lib/config/UxConfig.js

@@ -83,9 +83,6 @@ class UxConfig {
   }, {
     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'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.1.0-prender.1",
+  "version": "2.1.0-prender.2",
   "description": "The process tool for packaging aiot projects.",
   "keywords": [
     "aiotpack"
@@ -19,16 +19,16 @@
     "test": "node ./__tests__/aiotpack.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/generator": "2.1.0-prender.1",
-    "@aiot-toolkit/parser": "2.1.0-prender.1",
-    "@aiot-toolkit/shared-utils": "2.1.0-prender.1",
+    "@aiot-toolkit/generator": "2.1.0-prender.2",
+    "@aiot-toolkit/parser": "2.1.0-prender.2",
+    "@aiot-toolkit/shared-utils": "2.1.0-prender.2",
     "@hap-toolkit/aaptjs": "^2.0.0",
     "@rspack/core": "^1.3.9",
     "acorn": "^8.16.0",
     "aiot-parse5": "^1.0.2",
     "astring": "^1.9.0",
     "babel-loader": "^9.1.3",
-    "file-lane": "2.1.0-prender.1",
+    "file-lane": "2.1.0-prender.2",
     "file-loader": "^6.2.0",
     "fs-extra": "^11.2.0",
     "jsrsasign": "^11.1.0",
@@ -45,5 +45,5 @@
     "@types/jsrsasign": "^10.5.12",
     "@types/webpack-sources": "^3.2.3"
   },
-  "gitHead": "8bb39a59fbe7a7c22c1167e69d44c78024330cec"
+  "gitHead": "a0849da638ea3a9a6abb95a9cbcad400cbb6903a"
 }

package/lib/prerender/PrerenderVM.d.ts

@@ -1,86 +0,0 @@
-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>;
-    }>;
-}