@aiot-toolkit/aiotpack 2.1.0-prender.11 → 2.1.0-prender.13

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

@@ -22,6 +22,16 @@ declare class UxAfterCompile {
      * @param params
      */
     static compressResource: FollowWork<IJavascriptCompileOption>;
+    /**
+     * Relocate manifest.icon into build root so debug and release rpks share the
+     * same asset layout. Rewrites `manifest.icon` + every string reference to the
+     * old icon path inside template.json / css.json / *.js. Files are text-scanned
+     * and quoted-substring matched only (no cross-string boundary rewriting).
+     *
+     * No-op when manifest.icon is already at root, the physical file is missing,
+     * or the destination basename already exists at root.
+     */
+    static relocateManifestIcon: FollowWork<IJavascriptCompileOption>;
     /**
      * 如果是更新触发，则对比临时项目build文件夹 和 项目build文件夹，生成diff.json
      * @param context

package/lib/afterCompile/ux/UxAfterCompile.js

@@ -99,8 +99,12 @@ class UxAfterCompile {
       context,
       compilerOption
     } = params;
-    if (compilerOption && compilerOption.enableJsc === true) {
-      return new _Jsc.default(context.projectPath, _path.default.join(context.projectPath, context.output, compilerOption.outputPath)).jsc();
+    if (compilerOption) {
+      const buildPath = _path.default.join(context.projectPath, context.output, compilerOption.outputPath);
+      _Jsc.default.wrapAllJsWithIife(buildPath);
+      if (compilerOption.enableJsc === true) {
+        return new _Jsc.default(context.projectPath, buildPath).jsc();
+      }
     }
   };
   static toRpk = async params => {
@@ -334,6 +338,78 @@ class UxAfterCompile {
     }
   };
 
+  /**
+   * Relocate manifest.icon into build root so debug and release rpks share the
+   * same asset layout. Rewrites `manifest.icon` + every string reference to the
+   * old icon path inside template.json / css.json / *.js. Files are text-scanned
+   * and quoted-substring matched only (no cross-string boundary rewriting).
+   *
+   * No-op when manifest.icon is already at root, the physical file is missing,
+   * or the destination basename already exists at root.
+   */
+  static relocateManifestIcon = async params => {
+    const {
+      compilerOption,
+      onLog
+    } = params;
+    if (!compilerOption) return;
+    const {
+      projectPath,
+      outputPath
+    } = compilerOption;
+    const buildDir = _path.default.join(projectPath, outputPath);
+    const manifestPath = _path.default.join(buildDir, 'manifest.json');
+    if (!_fsExtra.default.existsSync(manifestPath)) return;
+    const manifest = _fsExtra.default.readJSONSync(manifestPath);
+    const oldIcon = manifest.icon;
+    if (!oldIcon || typeof oldIcon !== 'string') return;
+    const basename = _path.default.basename(oldIcon);
+    const newIcon = '/' + basename;
+    if (oldIcon === newIcon) return;
+    const oldFile = _path.default.join(buildDir, oldIcon.replace(/^\//, ''));
+    const newFile = _path.default.join(buildDir, basename);
+    if (!_fsExtra.default.existsSync(oldFile)) return;
+    if (_fsExtra.default.existsSync(newFile)) {
+      onLog?.([{
+        level: _sharedUtils.Loglevel.WARN,
+        message: [`relocateManifestIcon: skipped — build root already contains ${basename}`]
+      }]);
+      return;
+    }
+    _fsExtra.default.moveSync(oldFile, newFile);
+    manifest.icon = newIcon;
+    _fsExtra.default.writeJSONSync(manifestPath, manifest, {
+      spaces: 2
+    });
+    const variants = [oldIcon, oldIcon.replace(/^\//, '')];
+    const replacements = [];
+    for (const v of variants) {
+      const target = v === oldIcon ? newIcon : basename;
+      replacements.push([JSON.stringify(v), JSON.stringify(target)]);
+      replacements.push([`'${v}'`, `'${target}'`]);
+    }
+    const rewriteFile = fp => {
+      let text;
+      try {
+        text = _fsExtra.default.readFileSync(fp, 'utf-8');
+      } catch {
+        return;
+      }
+      let changed = false;
+      for (const [from, to] of replacements) {
+        if (text.includes(from)) {
+          text = text.split(from).join(to);
+          changed = true;
+        }
+      }
+      if (changed) _fsExtra.default.writeFileSync(fp, text, 'utf-8');
+    };
+    for (const fp of _sharedUtils.FileUtil.readAlldirSync(buildDir)) {
+      if (fp === manifestPath) continue;
+      if (/\.(template\.json|css\.json|js|jsx?)$/.test(fp)) rewriteFile(fp);
+    }
+  };
+
   /**
    * 如果是更新触发，则对比临时项目build文件夹 和 项目build文件夹，生成diff.json
    * @param context

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

@@ -1,4 +1,4 @@
-declare function uxToTemplateJson(templateNode: any, styleObjectId?: number, styleSheet?: any, importMap?: Record<string, string>, pageDir?: string): any;
+declare function uxToTemplateJson(templateNode: any, styleObjectId?: number, styleSheet?: any, importMap?: Record<string, string>, pageDir?: string, componentsMap?: Record<string, string>): any;
 /**
  * Normalize a media query condition text from CSS Level 4 syntax to Level 3.
  *

package/lib/compiler/javascript/TemplateCompiler.js

@@ -35,6 +35,81 @@ function hasApplicableMediaRule(styleSheet, tagName, classTokens) {
   }
   return false;
 }
+// Parse a simple/compound selector like ".a", ".a.b", "text", "text.a", ".a #id"
+// (id treated as a class token for build-time approximation).
+function parseCompoundSelector(part) {
+  const out = {
+    classes: []
+  };
+  const re = /(\.[\w-]+)|(#[\w-]+)|(\*)|([a-zA-Z][\w-]*)/g;
+  let m;
+  let matched = false;
+  while ((m = re.exec(part)) !== null) {
+    matched = true;
+    if (m[1]) out.classes.push(m[1].slice(1));else if (m[2]) out.classes.push(m[2].slice(1));else if (m[4]) out.tag = m[4];
+  }
+  return matched ? out : null;
+}
+function matchesCompound(comp, tag, classes) {
+  if (comp.tag && comp.tag !== tag) return false;
+  for (const c of comp.classes) if (!classes.has(c)) return false;
+  return true;
+}
+
+// Match a CSS selector against an element + its ancestor chain (root...parent).
+// Supports descendant, child (>), and compound (.a.b) selectors. Sibling
+// combinators (+, ~) require sibling context and are treated as non-match here.
+function selectorMatchesElement(selector, tag, classes, ancestors) {
+  const parts = [];
+  const combinators = [];
+  let cur = '';
+  for (let i = 0; i < selector.length; i++) {
+    const ch = selector[i];
+    if (ch === '>' || ch === '+' || ch === '~') {
+      if (cur.trim()) parts.push(cur.trim());
+      combinators.push(ch);
+      cur = '';
+    } else if (ch === ' ' || ch === '\t') {
+      if (cur.trim()) {
+        parts.push(cur.trim());
+        combinators.push(' ');
+        cur = '';
+      }
+    } else {
+      cur += ch;
+    }
+  }
+  if (cur.trim()) parts.push(cur.trim());
+  if (parts.length === 0) return false;
+  const rightMost = parseCompoundSelector(parts[parts.length - 1]);
+  if (!rightMost) return false;
+  if (!matchesCompound(rightMost, tag, classes)) return false;
+  let idx = ancestors.length - 1;
+  for (let i = parts.length - 2; i >= 0; i--) {
+    const combinator = combinators[i];
+    const simple = parseCompoundSelector(parts[i]);
+    if (!simple) return false;
+    if (combinator === ' ') {
+      let found = false;
+      while (idx >= 0) {
+        if (matchesCompound(simple, ancestors[idx].tag, ancestors[idx].classes)) {
+          idx--;
+          found = true;
+          break;
+        }
+        idx--;
+      }
+      if (!found) return false;
+    } else if (combinator === '>') {
+      if (idx < 0) return false;
+      if (!matchesCompound(simple, ancestors[idx].tag, ancestors[idx].classes)) return false;
+      idx--;
+    } else {
+      return false;
+    }
+  }
+  return true;
+}
 
 // vivo blueos-pack's aggressive camelCase applied to transition-property values.
 // Every letter that follows a non-letter character (separator or digit) is upper-cased,
@@ -156,11 +231,17 @@ function normalizeCssTransform(input) {
   }
   return matched ? JSON.stringify(out) : null;
 }
-function uxToTemplateJson(templateNode, styleObjectId, styleSheet, importMap, pageDir) {
+function uxToTemplateJson(templateNode, styleObjectId, styleSheet, importMap, pageDir, componentsMap) {
   const children = templateNode.content?.childNodes || templateNode.childNodes || [];
   const rootEl = children.find(n => n.tagName && n.nodeName !== '#text');
   if (!rootEl) return {};
   const result = elementToJson(rootEl, styleSheet, importMap, undefined, pageDir);
+  const componentsForRoot = componentsMap && Object.keys(componentsMap).length ? componentsMap : importMap;
+  if (componentsForRoot && Object.keys(componentsForRoot).length) {
+    result.components = {
+      ...componentsForRoot
+    };
+  }
   // Insert styleObjectId before children (vivo format)
   if (styleObjectId !== undefined) {
     const ordered = {};
@@ -178,6 +259,16 @@ function uxToTemplateJson(templateNode, styleObjectId, styleSheet, importMap, pa
 /** Add this. prefix to variable references in an expression */
 // blueos-pack's pathTestRE: matches simple paths like a.b.c, a['key'], a[0], a[$idx]
 const pathTestRE = /^[A-Za-z_$][\w$]*(?:\.[\w$]+|\['.*?'\]|\[".*?"\]|\[\d+\]|\[[A-Za-z_$][\w$]*\])*$/;
+function tryEvalStaticShowLiteral(expr) {
+  if (/^'[^']*'$/.test(expr) || /^"[^"]*"$/.test(expr)) {
+    const inner = expr.slice(1, -1);
+    return inner.length > 0;
+  }
+  if (expr === 'undefined' || expr === 'null' || expr === 'NaN') return false;
+  if (expr === 'Infinity') return true;
+  return undefined;
+}
+
 /**
  * Normalize a media query condition text from CSS Level 4 syntax to Level 3.
  *
@@ -469,6 +560,7 @@ function emitTextValueAttr(rawText) {
   };
 }
 function elementToJson(el, styleSheet, importMap, scopeVars, pageDir) {
+  let ancestors = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : [];
   const tagName = el.tagName === 'img' ? 'image' : el.tagName;
   const node = {
     type: tagName
@@ -493,9 +585,7 @@ function elementToJson(el, styleSheet, importMap, scopeVars, pageDir) {
       name = name.slice(1);
       if (!value.includes('{{')) value = `{{${value}}}`;
     }
-    if (name === 'is' && tagName === 'component') {
-      continue; // is attribute handled at runtime
-    } else if (name === 'class') {
+    if (name === 'class') {
       className = value.replace(/\s+/g, ' ').trim();
     } else if (name.startsWith('@') || name.startsWith('on') && name.length > 2) {
       const rawEvtName = name.startsWith('@') ? name.slice(1) : name.replace(/^on/, '');
@@ -538,13 +628,20 @@ function elementToJson(el, styleSheet, importMap, scopeVars, pageDir) {
     } else if (name === 'show') {
       const showVal = value.replace(/\{\{|\}\}/g, '').trim();
       if (showVal === 'true') attrObj['show'] = true;else if (showVal === 'false') attrObj['show'] = false;else {
-        // Try to evaluate as literal
         try {
           const v = JSON.parse(showVal);
           attrObj["show"] = v;
         } catch {
-          attrObj['$show'] = showVal;
-          hasBind = true;
+          const staticVal = tryEvalStaticShowLiteral(showVal);
+          if (staticVal !== undefined) {
+            attrObj['show'] = staticVal;
+          } else if (pathTestRE.test(showVal)) {
+            attrObj['$show'] = showVal;
+            hasBind = true;
+          } else {
+            attrObj['$show'] = `function () { return ${addThisPrefix(showVal)}; }`;
+            hasBind = true;
+          }
         }
       }
     } else if (name === 'for') {
@@ -764,15 +861,15 @@ function elementToJson(el, styleSheet, importMap, scopeVars, pageDir) {
   // @media rules are applied at runtime by SDK, not inlined here.
   // Class rules apply in stylesheet declaration order (later declarations override earlier),
   // NOT in class-attribute order.
-  if (styleSheet) {
-    const staticClassTokens = [];
-    if (className) {
-      const parts = className.split(/(\{\{[\s\S]*?\}\})/).filter(Boolean);
-      for (const p of parts) {
-        if (/^\{\{[\s\S]*?\}\}$/.test(p)) continue;
-        for (const tok of p.trim().split(/\s+/)) if (tok) staticClassTokens.push(tok);
-      }
+  const staticClassTokens = [];
+  if (className) {
+    const parts = className.split(/(\{\{[\s\S]*?\}\})/).filter(Boolean);
+    for (const p of parts) {
+      if (/^\{\{[\s\S]*?\}\}$/.test(p)) continue;
+      for (const tok of p.trim().split(/\s+/)) if (tok) staticClassTokens.push(tok);
     }
+  }
+  if (styleSheet) {
     const hasMedia = hasApplicableMediaRule(styleSheet, el.tagName, staticClassTokens);
     // Skip class-rule merge when the node has any dynamic binding OR any @media
     // rule that applies to it — runtime must resolve class chain against the
@@ -794,11 +891,19 @@ function elementToJson(el, styleSheet, importMap, scopeVars, pageDir) {
       if (Object.keys(inlined).length) node.style = inlined;
     } else {
       const merged = {};
-      if (styleSheet[el.tagName]) Object.assign(merged, styleSheet[el.tagName]);
-      if (staticClassTokens.length) {
-        const classSet = new Set(staticClassTokens);
-        for (const key of Object.keys(styleSheet)) {
-          if (key.length > 1 && key.startsWith('.') && classSet.has(key.slice(1))) {
+      const classSet = new Set(staticClassTokens);
+      for (const key of Object.keys(styleSheet)) {
+        if (key.startsWith('@')) continue;
+        if (key === el.tagName) {
+          Object.assign(merged, styleSheet[key]);
+          continue;
+        }
+        if (key.length > 1 && key.startsWith('.') && !/[\s>+~.]/.test(key.slice(1))) {
+          if (classSet.has(key.slice(1))) Object.assign(merged, styleSheet[key]);
+          continue;
+        }
+        if (/[\s>+~]/.test(key) || /\.[\w-]+\./.test(key)) {
+          if (selectorMatchesElement(key, el.tagName, classSet, ancestors)) {
             Object.assign(merged, styleSheet[key]);
           }
         }
@@ -823,7 +928,10 @@ function elementToJson(el, styleSheet, importMap, scopeVars, pageDir) {
   const isMixedContent = hasElementChildren && hasTextChildren && (tagName === 'text' || tagName === 'span' || tagName === 'a' || tagName === 'marquee');
   for (const child of el.childNodes || []) {
     if (child.tagName) {
-      childNodes.push(elementToJson(child, styleSheet, importMap, scopeVars, pageDir));
+      childNodes.push(elementToJson(child, styleSheet, importMap, scopeVars, pageDir, [...ancestors, {
+        tag: el.tagName,
+        classes: new Set(staticClassTokens)
+      }]));
     } else if (isMixedContent && child.value?.trim()) {
       const emitted = emitTextValueAttr(child.value);
       const spanNode = {

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

@@ -11,7 +11,9 @@ declare class ViteCompiler implements ICompiler {
     clean(param: ICompileParam & IJavascriptCompileOption): Promise<void>;
 }
 declare function stripDeadDefProp(code: string): string;
+declare function mergeStyleSheets(app: any, page: any): any;
 export declare const __test: {
     stripDeadDefProp: typeof stripDeadDefProp;
+    mergeStyleSheets: typeof mergeStyleSheets;
 };
 export default ViteCompiler;

package/lib/compiler/javascript/ViteCompiler.js

@@ -90,12 +90,43 @@ function rewriteSystemImports(code) {
       replacement: parts.join(' ')
     });
   }
+  // Rewrite CJS require() calls for system modules: require('@system.xxx') → $app_require$("@app-module/system.xxx")
+  collectRequireEdits(ast, edits);
   if (edits.length === 0) return code;
   edits.sort((a, b) => b.start - a.start);
   let out = code;
   for (const e of edits) out = out.slice(0, e.start) + e.replacement + out.slice(e.end);
   return out;
 }
+function collectRequireEdits(node, edits) {
+  if (!node || typeof node !== 'object') return;
+  if (node.type === 'CallExpression' && node.callee?.type === 'Identifier' && node.callee.name === 'require' && node.arguments?.length === 1 && node.arguments[0].type === 'Literal' && typeof node.arguments[0].value === 'string') {
+    const src = node.arguments[0].value;
+    let moduleName = null;
+    if (NS_PREFIX.test(src)) {
+      moduleName = src.replace(NS_PREFIX, '$1.');
+    } else if (src.startsWith(APP_MODULE_PREFIX)) {
+      moduleName = src.slice(APP_MODULE_PREFIX.length);
+    }
+    if (moduleName !== null) {
+      edits.push({
+        start: node.start,
+        end: node.end,
+        replacement: `$app_require$("${APP_MODULE_PREFIX}${moduleName}")`
+      });
+      return;
+    }
+  }
+  for (const key of Object.keys(node)) {
+    if (key === 'start' || key === 'end' || key === 'type') continue;
+    const val = node[key];
+    if (Array.isArray(val)) {
+      for (const child of val) collectRequireEdits(child, edits);
+    } else if (val && typeof val === 'object' && val.type) {
+      collectRequireEdits(val, edits);
+    }
+  }
+}
 function loadUserViteConfig(projectPath, mode) {
   const configPath = _path.default.join(projectPath, 'quickapp.config.js');
   if (!_fsExtra.default.existsSync(configPath)) return {};
@@ -246,6 +277,7 @@ class ViteCompiler {
     }
     const entryFailures = [];
     let entryAttempted = 0;
+    let appStyleSheet = {};
     for (const [entryName, entryValue] of Object.entries(entries)) {
       const entryPath = entryValue.split('?')[0];
       const resolvedEntry = _path.default.resolve(originalProjectPath, entryPath);
@@ -396,6 +428,7 @@ class ViteCompiler {
                 });
                 let templateNode = null;
                 const importMap = {}; // name -> path
+                const componentsMap = {}; // originalName -> path
                 for (const node of doc.childNodes) {
                   if (node.nodeName === 'template') templateNode = node;else if (node.nodeName === 'import') {
                     const nameAttr = node.attrs?.find(a => a.name === 'name');
@@ -404,6 +437,7 @@ class ViteCompiler {
                       const compAbsPath = _path.default.resolve(_path.default.dirname(resolvedEntry), srcAttr.value).replace(/\.ux$/, '');
                       const compPath = _path.default.relative(srcPath, compAbsPath).replace(/\\/g, '/');
                       importMap[nameAttr.value.toLowerCase()] = compPath;
+                      componentsMap[nameAttr.value] = compPath;
                     }
                   }
                 }
@@ -427,6 +461,9 @@ class ViteCompiler {
                 if (styleLiteral) {
                   styleSheet = (0, _TemplateCompiler.parseStyleArray)(styleLiteral);
                 }
+                if (isApp) {
+                  appStyleSheet = styleSheet;
+                }
                 // Write css.json
                 const cssPath = _path.default.join(buildPath, `${isApp ? 'app' : pageName}.css.json`);
                 _fsExtra.default.ensureDirSync(_path.default.dirname(cssPath));
@@ -439,7 +476,8 @@ class ViteCompiler {
                 if (templateNode && !isApp) {
                   const tplPath = _path.default.join(buildPath, `${pageName}.template.json`);
                   _fsExtra.default.ensureDirSync(_path.default.dirname(tplPath));
-                  _fsExtra.default.writeJSONSync(tplPath, (0, _TemplateCompiler.uxToTemplateJson)(templateNode, sid, styleSheet, importMap, _path.default.dirname(pageName)), param.mode === 'production' ? undefined : {
+                  const mergedSheet = mergeStyleSheets(appStyleSheet, styleSheet);
+                  _fsExtra.default.writeJSONSync(tplPath, (0, _TemplateCompiler.uxToTemplateJson)(templateNode, sid, mergedSheet, importMap, _path.default.dirname(pageName), componentsMap), param.mode === 'production' ? undefined : {
                     spaces: 2
                   });
                   // Worklist BFS over nested <import> chain so transitively imported
@@ -469,6 +507,7 @@ class ViteCompiler {
                     });
                     let compTpl = null;
                     const compImportMap = {};
+                    const compComponentsMap = {};
                     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');
@@ -477,6 +516,7 @@ class ViteCompiler {
                           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;
+                          compComponentsMap[n.value] = nestedPath;
                           if (!visited.has(nestedPath)) {
                             worklist.push({
                               compName: n.value.toLowerCase(),
@@ -504,7 +544,7 @@ class ViteCompiler {
                       compStyleSheet = (0, _TemplateCompiler.parseStyleArray)(csm);
                     }
                     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 : {
+                    _fsExtra.default.writeJSONSync(compTplPath, (0, _TemplateCompiler.uxToTemplateJson)(compTpl, compSid, mergeStyleSheets(appStyleSheet, compStyleSheet), compImportMap, _path.default.dirname(compPath), compComponentsMap), param.mode === 'production' ? undefined : {
                       spaces: 2
                     });
                     const compCssPath = _path.default.join(buildPath, `${compPath}.css.json`);
@@ -594,13 +634,16 @@ class ViteCompiler {
       });
       let templateNode = null;
       const importMap = {};
+      const componentsMap = {};
       for (const node of doc.childNodes) {
         if (node.nodeName === 'template') templateNode = node;else if (node.nodeName === 'import') {
           const nameAttr = node.attrs?.find(a => a.name === 'name');
           const srcAttr = node.attrs?.find(a => a.name === 'src');
           if (nameAttr && srcAttr) {
             const compPath = _path.default.resolve(_path.default.dirname(uxFile), srcAttr.value).replace(/\.ux$/, '');
-            importMap[nameAttr.value.toLowerCase()] = _path.default.relative(srcPath, compPath).replace(/\\/g, '/');
+            const rel = _path.default.relative(srcPath, compPath).replace(/\\/g, '/');
+            importMap[nameAttr.value.toLowerCase()] = rel;
+            componentsMap[nameAttr.value] = rel;
           }
         }
       }
@@ -630,7 +673,7 @@ class ViteCompiler {
         // Generate template.json
         if (templateNode) {
           _fsExtra.default.ensureDirSync(_path.default.dirname(outputTpl));
-          _fsExtra.default.writeJSONSync(outputTpl, (0, _TemplateCompiler.uxToTemplateJson)(templateNode, sid, styleSheet, Object.keys(importMap).length ? importMap : undefined, _path.default.dirname(relPath)), param.mode === 'production' ? undefined : {
+          _fsExtra.default.writeJSONSync(outputTpl, (0, _TemplateCompiler.uxToTemplateJson)(templateNode, sid, mergeStyleSheets(appStyleSheet, styleSheet), Object.keys(importMap).length ? importMap : undefined, _path.default.dirname(relPath), Object.keys(componentsMap).length ? componentsMap : undefined), param.mode === 'production' ? undefined : {
             spaces: 2
           });
         }
@@ -708,6 +751,29 @@ function wrapOutput(code, entryName, isApp) {
   });
   // Remove Object.defineProperty for Symbol.toStringTag
   code = code.replace(/\s*Object\.defineProperty\(\w+,\s*Symbol\.toStringTag[^;]*;\s*/g, '');
+  // Rewrite __require("@system.*") → $app_require$("@app-module/system.*") in rolldown output.
+  // Rolldown emits __require when CJS require() survives bundling (aliased require, dynamic
+  // concat, or patterns the pre-transform couldn't catch). Also catch _require() which appears
+  // when the original code does `var _require = require; _require('@system.xxx')`.
+  const sysRequirePattern = /\b_?_?require\(\s*"(@(?:system|service|android|hap)\.[^"]+)"\s*\)/g;
+  code = code.replace(sysRequirePattern, (_, mod) => {
+    const moduleName = mod.replace(/^@(system|service|android|hap)\./, '$1.');
+    return `$app_require$("@app-module/${moduleName}")`;
+  });
+  // Same for @app-module/ prefix
+  code = code.replace(/\b_?_?require\(\s*"(@app-module\/[^"]+)"\s*\)/g, (_, mod) => {
+    const moduleName = mod.slice('@app-module/'.length);
+    return `$app_require$("@app-module/${moduleName}")`;
+  });
+  // Also handle single-quoted variants
+  code = code.replace(/\b_?_?require\(\s*'(@(?:system|service|android|hap)\.[^']+)'\s*\)/g, (_, mod) => {
+    const moduleName = mod.replace(/^@(system|service|android|hap)\./, '$1.');
+    return `$app_require$("@app-module/${moduleName}")`;
+  });
+  // Remove the __require polyfill definition if it's no longer referenced anywhere
+  if (!/\b__require\b/.test(code)) {
+    code = code.replace(/var __require\s*=\s*\/\*[^*]*\*\/\s*\(\(x\)\s*=>[\s\S]*?}\);\n?/g, '');
+  }
   // Extract the default export variable
   let exportVar = '_default';
   const m1 = code.match(/export\s*\{\s*(\w+)\s+as\s+default\s*\}/);
@@ -738,7 +804,33 @@ $app_define$("${defineId}", [], function($app_require$, $app_exports$, $app_modu
 $app_bootstrap$("${bootstrapId}");
 `;
 }
+function mergeStyleSheets(app, page) {
+  if (!app || !Object.keys(app).length) return page;
+  if (!page || !Object.keys(page).length) return app;
+  const merged = {
+    ...app
+  };
+  for (const [k, v] of Object.entries(page)) {
+    if (k === '@KEYFRAMES' || k === '@FONT-FACE') {
+      merged[k] = {
+        ...(merged[k] || {}),
+        ...v
+      };
+    } else if (k === '@MEDIA') {
+      merged[k] = [...(merged[k] || []), ...v];
+    } else if (typeof v === 'object' && v !== null && typeof merged[k] === 'object' && merged[k] !== null) {
+      merged[k] = {
+        ...merged[k],
+        ...v
+      };
+    } else {
+      merged[k] = v;
+    }
+  }
+  return merged;
+}
 const __test = exports.__test = {
-  stripDeadDefProp
+  stripDeadDefProp,
+  mergeStyleSheets
 };
 var _default = exports.default = ViteCompiler;

package/lib/compiler/javascript/vela/utils/Jsc.d.ts

@@ -6,5 +6,8 @@ declare class Jsc {
     private logBeforeInvoke;
     private logAfterInvoke;
     private static listFiles;
+    private assertJscVersion;
+    static wrapAllJsWithIife(buildPath: string): void;
+    private static compareSemver;
 }
 export default Jsc;

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

@@ -9,6 +9,9 @@ var path = _interopRequireWildcard(require("path"));
 var _sharedUtils = require("@aiot-toolkit/shared-utils");
 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; }
+const REQUIRED_JSC_VERSION = '1.0.9';
+const IIFE_WRAP_PREFIX = 'export default (function (__ctx) {\n' + '  let { requireModule, unRequireModule, $app_define$, $app_bootstrap$, $app_require$,\n' + '        console = global.console } = __ctx;\n' + '  let { setTimeout, clearTimeout, setInterval, clearInterval } = __ctx;\n\n';
+const IIFE_WRAP_SUFFIX = '\n});\n';
 class Jsc {
   constructor(projectPath, buildPath) {
     this.projectPath = projectPath;
@@ -23,8 +26,10 @@ class Jsc {
     const beforeJsCount = Jsc.listFiles(buildPath, '.js').length;
     return _sharedUtils.CommonUtil.requireNodeModule(projectPath, `@aiot-toolkit/jsc`).then(async module => {
       this.logBeforeInvoke();
+      this.assertJscVersion();
+      Jsc.wrapAllJsWithIife(buildPath);
       const start = Date.now();
-      const msg = await module.default(buildPath);
+      const msg = await module.default(buildPath, []);
       const elapsed = Date.now() - start;
       if (msg) {
         _sharedUtils.ColorConsole.success({
@@ -119,5 +124,42 @@ class Jsc {
     walk(dir);
     return out;
   }
+  assertJscVersion() {
+    const {
+      projectPath
+    } = this;
+    const jscName = '@aiot-toolkit/jsc';
+    try {
+      const pkgJsonPath = require.resolve(`${jscName}/package.json`, {
+        paths: [projectPath]
+      });
+      const pkg = require(pkgJsonPath);
+      const version = pkg.version || '0.0.0';
+      if (Jsc.compareSemver(version, REQUIRED_JSC_VERSION) < 0) {
+        _sharedUtils.ColorConsole.throw(`[jsc] ${jscName}@${version} is too old — need >= ${REQUIRED_JSC_VERSION}. ` + `Run: npm i ${jscName}@^${REQUIRED_JSC_VERSION}`);
+        throw new Error(`[jsc] ${jscName} must be >= ${REQUIRED_JSC_VERSION}, got ${version}`);
+      }
+    } catch (e) {
+      if (e?.message?.includes(`must be >= ${REQUIRED_JSC_VERSION}`)) throw e;
+    }
+  }
+  static wrapAllJsWithIife(buildPath) {
+    for (const {
+      rel
+    } of Jsc.listFiles(buildPath, '.js')) {
+      const abs = path.join(buildPath, rel);
+      const body = fs.readFileSync(abs, 'utf-8');
+      if (body.startsWith('export default (function (__ctx)')) continue;
+      fs.writeFileSync(abs, IIFE_WRAP_PREFIX + body + IIFE_WRAP_SUFFIX, 'utf-8');
+    }
+  }
+  static compareSemver(a, b) {
+    const parse = v => v.replace(/^[\^~=v]/, '').split(/[.-]/).slice(0, 3).map(p => parseInt(p, 10) || 0);
+    const [a1, a2, a3] = parse(a);
+    const [b1, b2, b3] = parse(b);
+    if (a1 !== b1) return a1 - b1;
+    if (a2 !== b2) return a2 - b2;
+    return a3 - b3;
+  }
 }
 var _default = exports.default = Jsc;

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

@@ -153,8 +153,17 @@ class ZipUtil {
     // basename from manifest.icon (e.g. `/resources/base/media/icon_small.png`
     // → `icon_small.vug` at rpk root) so runtime + IDE previews can look it up
     // by the manifest-declared name.
-    if (config.icon) {
-      const iconPath = _path.default.join(buildDir, config.icon.replace(/^\//, ''));
+    const runtimeIconPath = (() => {
+      const buildManifest = _path.default.join(buildDir, 'manifest.json');
+      if (_fsExtra.default.existsSync(buildManifest)) {
+        try {
+          return _fsExtra.default.readJSONSync(buildManifest).icon;
+        } catch {/* fall through */}
+      }
+      return config.icon;
+    })();
+    if (runtimeIconPath) {
+      const iconPath = _path.default.join(buildDir, runtimeIconPath.replace(/^\//, ''));
       if (_fsExtra.default.existsSync(iconPath)) {
         const iconBuf = _fsExtra.default.readFileSync(iconPath);
         outerPackage.addResource({

package/lib/config/UxConfig.js

@@ -86,6 +86,9 @@ class UxConfig {
   }, {
     worker: _UxAfterCompile.default.copyResource,
     workerDescribe: 'Copy resource files'
+  }, {
+    worker: _UxAfterCompile.default.relocateManifestIcon,
+    workerDescribe: 'Move manifest.icon to build root + rewrite refs'
   }, {
     worker: _UxAfterCompile.default.compressResource,
     workerDescribe: 'Compress resource files'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.1.0-prender.11",
+  "version": "2.1.0-prender.13",
   "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.11",
-    "@aiot-toolkit/parser": "2.1.0-prender.11",
-    "@aiot-toolkit/shared-utils": "2.1.0-prender.11",
+    "@aiot-toolkit/generator": "2.1.0-prender.13",
+    "@aiot-toolkit/parser": "2.1.0-prender.13",
+    "@aiot-toolkit/shared-utils": "2.1.0-prender.13",
     "@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.11",
+    "file-lane": "2.1.0-prender.13",
     "file-loader": "^6.2.0",
     "fs-extra": "^11.2.0",
     "jsrsasign": "^11.1.0",