@aiot-toolkit/aiotpack 2.1.0-prender.12 → 2.1.0-prender.14

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

@@ -231,11 +231,19 @@ 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);
+  assertNoRelativeAssetPaths(result, pageDir);
+  assertNoDelimitersInEvents(result, 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 = {};
@@ -253,6 +261,185 @@ 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$]*\])*$/;
+
+// Attributes whose value is a resource path and therefore must be rewritten from
+// `./x` / `../x` (relative to the owning .ux file) to an rpk-root absolute path.
+// Runtime resolves <image src> against the rpk root, so a relative path emitted
+// from a nested component directory never resolves and falls back to a placeholder.
+const PATH_ATTRS = new Set(['src', 'href', 'alt']);
+const ARROW_RE = /=>/;
+
+/**
+ * Canonical event key for an `@x` / `onx` attribute.
+ *
+ * Every event name the platform defines is a lowercase single word
+ * (`click`, `longpress`, `touchstart`, `animationiteration`, ... — 72 of them
+ * across vela and android, none camelCase or hyphenated), and the parser's own
+ * `translateEventName` just drops the prefix. Camel-casing the remainder turned
+ * `on-long-press` into `LongPress`, which matches no event and silently never
+ * fires, so separators are removed and the name lowercased instead.
+ */
+function normalizeEventName(name) {
+  const stripped = name.startsWith('@') ? name.slice(1) : name.replace(/^on/, '');
+  return stripped.replace(/[-_]/g, '').toLowerCase();
+}
+
+/**
+ * Strip one wrapping `{{ ... }}` from an attribute value.
+ *
+ * Only the outer pair is removed, and only when it actually wraps the whole
+ * value — `{{()=>{ x() }}}` must yield `()=>{ x() }`, so a global
+ * `replace(/\{\{|\}\}/g, '')` is wrong: it would also eat the arrow body's
+ * braces. A value that merely contains an interpolation (`a {{b}} c`) is left
+ * alone; callers that need that do their own splitting.
+ */
+function stripTemplateDelimiters(value) {
+  let v = (value ?? '').trim();
+  if (!v.startsWith('{{') || !v.endsWith('}}')) return v;
+  const inner = v.slice(2, -2);
+  // Reject `{{a}} + {{b}}`, where the opening pair closes before the end.
+  let depth = 0;
+  for (let i = 0; i < inner.length; i++) {
+    if (inner[i] === '{') depth++;else if (inner[i] === '}') {
+      depth--;
+      if (depth < 0) return v;
+    }
+  }
+  return depth === 0 ? inner.trim() : v;
+}
+function isRelAssetPath(v) {
+  return v.startsWith('./') || v.startsWith('../');
+}
+function resolveRelFromPageDir(rel, pageDir) {
+  // A trailing slash is significant when the path is a prefix fragment of a
+  // concatenated expression ('./assets/full/' + lang + '.png') — dropping it
+  // would yield '/.../fullcn.png'.
+  const trailing = rel.endsWith('/') ? '/' : '';
+  const segments = pageDir.split('/').filter(Boolean).concat(rel.split('/'));
+  const stack = [];
+  for (const seg of segments) {
+    if (seg === '..') stack.pop();else if (seg && seg !== '.') stack.push(seg);
+  }
+  return '/' + stack.join('/') + trailing;
+}
+
+/**
+ * Rewrite relative resource-path string literals inside a generated expression.
+ * Dynamic `src="{{'./assets/' + lang + '.png'}}"` compiles to a `$src` function
+ * body, so the path lives in a literal rather than a plain attribute value — the
+ * static-attribute rewrite never sees it. Only literals starting with ./ or ../
+ * are touched, so suffix fragments like '.png' pass through untouched.
+ */
+function rewriteRelPathLiterals(exprSrc, pageDir) {
+  let out = '';
+  let i = 0;
+  while (i < exprSrc.length) {
+    const ch = exprSrc[i];
+    if (ch !== "'" && ch !== '"') {
+      out += ch;
+      i++;
+      continue;
+    }
+    const quote = ch;
+    let j = i + 1;
+    let raw = '';
+    let closed = false;
+    while (j < exprSrc.length) {
+      const c = exprSrc[j];
+      if (c === '\\') {
+        raw += c + (exprSrc[j + 1] ?? '');
+        j += 2;
+        continue;
+      }
+      if (c === quote) {
+        closed = true;
+        break;
+      }
+      raw += c;
+      j++;
+    }
+    if (!closed) {
+      out += exprSrc.slice(i);
+      break;
+    }
+    const unescaped = raw.replace(/\\(['"\\])/g, '$1');
+    if (isRelAssetPath(unescaped)) {
+      const abs = resolveRelFromPageDir(unescaped, pageDir);
+      out += quote + abs.replace(/\\/g, '\\\\').replace(new RegExp(quote, 'g'), '\\' + quote) + quote;
+    } else {
+      out += quote + raw + quote;
+    }
+    i = j + 1;
+  }
+  return out;
+}
+const REL_LITERAL_IN_EXPR_RE = /(['"])\.\.?\//;
+
+/**
+ * Fail the build when a template still carries a relative resource path, in a
+ * static attr or inside a `$`-bound expression's literals. Runtime resolves
+ * these against the rpk root, silently falling back to a placeholder image —
+ * far harder to diagnose on-device than a pack-time error.
+ */
+function assertNoRelativeAssetPaths(root, pageDir) {
+  const offenders = [];
+  const walk = node => {
+    if (!node || typeof node !== 'object') return;
+    const attr = node.attr;
+    if (attr && typeof attr === 'object') {
+      for (const [key, val] of Object.entries(attr)) {
+        if (typeof val !== 'string') continue;
+        const bare = key.startsWith('$') ? key.slice(1) : key;
+        if (!PATH_ATTRS.has(bare)) continue;
+        const bad = key.startsWith('$') ? REL_LITERAL_IN_EXPR_RE.test(val) : isRelAssetPath(val);
+        if (bad) offenders.push(`<${node.type ?? '?'} ${key}="${val}">`);
+      }
+    }
+    if (Array.isArray(node.children)) node.children.forEach(walk);
+  };
+  walk(root);
+  if (offenders.length) {
+    throw new Error(`[template] ${offenders.length} relative resource path(s) survived rewriting` + `${pageDir ? ` in ${pageDir}` : ' (no pageDir supplied)'}. Runtime resolves src/href ` + `against the rpk root, so these render a placeholder instead of the asset:\n` + offenders.map(o => `  ${o}`).join('\n'));
+  }
+}
+
+/**
+ * Fail the build when an event value still carries template delimiters. Runtime
+ * cannot recover: the `$`-prefixed form fails to compile (logged, event skipped)
+ * and the bare form is looked up as a method literally named `{{fn}}` (silent).
+ * Either way the handler is dead, so catching it at pack time is the only way
+ * the breakage is visible before the device.
+ */
+function assertNoDelimitersInEvents(root, pageDir) {
+  const offenders = [];
+  const walk = node => {
+    if (!node || typeof node !== 'object') return;
+    const events = node.events;
+    if (events && typeof events === 'object') {
+      for (const [key, val] of Object.entries(events)) {
+        if (typeof val !== 'string') continue;
+        if (val.includes('{{') || val.includes('}}')) {
+          offenders.push(`<${node.type ?? '?'} ${key}="${val}">`);
+        }
+      }
+    }
+    if (Array.isArray(node.children)) node.children.forEach(walk);
+  };
+  walk(root);
+  if (offenders.length) {
+    throw new Error(`[template] ${offenders.length} event handler(s) still contain template delimiters` + `${pageDir ? ` in ${pageDir}` : ''}. Runtime cannot compile or resolve these, so the ` + `events are silently dead:\n` + offenders.map(o => `  ${o}`).join('\n'));
+  }
+}
+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.
  *
@@ -572,11 +759,18 @@ function elementToJson(el, styleSheet, importMap, scopeVars, pageDir) {
     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/, '');
-      const evtName = rawEvtName.replace(/-([a-z])/g, (_, c) => c.toUpperCase());
-      // Events with parameters use $event format with function wrapper
-      const evtVal = value.trim();
-      if (evtVal.includes('(')) {
+      const evtName = normalizeEventName(name);
+      // Event values may be written bare (@click="fn") or wrapped in template
+      // delimiters (@click="{{fn}}"); both mean the same thing, so strip the
+      // delimiters before classifying. Leaving them in emits `{{fn}}`, which
+      // runtime either fails to compile ($-form) or looks up as a method name
+      // literally called "{{fn}}" (bare form) — a silent dead event either way.
+      const evtVal = stripTemplateDelimiters(value);
+      // An arrow function is already a handler; wrapping it in `function (evt)`
+      // and appending evt to its call would both mis-bind and drop the event arg.
+      if (ARROW_RE.test(evtVal)) {
+        events[`$${evtName}`] = `function (evt) { return (${addThisPrefix(evtVal)})(evt); }`;
+      } else if (evtVal.includes('(')) {
         // Add evt as last parameter
         const withEvt = evtVal.replace(/\)$/, evtVal.includes('()') ? 'evt)' : ', evt)');
         events[`$${evtName}`] = `function (evt) { return ${addThisPrefix(withEvt)}; }`;
@@ -612,13 +806,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') {
@@ -727,11 +928,16 @@ function elementToJson(el, styleSheet, importMap, scopeVars, pageDir) {
     } else if (/\{\{.*\}\}/.test(value)) {
       // Dynamic binding - build expression from mixed static/dynamic parts
       const parts = value.split(/(\{\{[\s\S]*?\}\})/);
-      const exprs = parts.filter(Boolean).map(p => {
+      let exprs = parts.filter(Boolean).map(p => {
         const m = p.match(/^\{\{([\s\S]*?)\}\}$/);
         if (m) return addThisPrefix(m[1].trim());
         return `'${p.replace(/'/g, "\\'")}'`;
       });
+      // Resource-path attrs carry their path inside the expression's string
+      // literals; rewrite those too so dynamic src matches static src form.
+      if (PATH_ATTRS.has(name) && pageDir) {
+        exprs = exprs.map(e => rewriteRelPathLiterals(e, pageDir));
+      }
       const camelName = '$' + name.replace(/-([a-z])/g, (_, c) => c.toUpperCase());
       const plainName = name.replace(/-([a-z])/g, (_, c) => c.toUpperCase());
       // Handle literal values (null, true, false, numbers)
@@ -770,15 +976,8 @@ function elementToJson(el, styleSheet, importMap, scopeVars, pageDir) {
       // Normalize relative path attrs (src, href, alt) to absolute paths from src root.
       // alt can also carry prose (e.g. "blank") — only rewrite when the value starts with
       // ./ or ../ so image alt-text prose passes through untouched.
-      const isRelPath = staticVal.startsWith('./') || staticVal.startsWith('../');
-      if (staticVal && isRelPath && (name === 'src' || name === 'href' || name === 'alt') && pageDir) {
-        // Resolve relative to pageDir, then make absolute from src root
-        const segments = pageDir.split('/').filter(Boolean).concat(staticVal.split('/'));
-        const stack = [];
-        for (const seg of segments) {
-          if (seg === '..') stack.pop();else if (seg && seg !== '.') stack.push(seg);
-        }
-        staticVal = '/' + stack.join('/');
+      if (staticVal && isRelAssetPath(staticVal) && PATH_ATTRS.has(name) && pageDir) {
+        staticVal = resolveRelFromPageDir(staticVal, pageDir);
       }
       attrObj[name.replace(/-([a-z])/g, (_, c) => c.toUpperCase())] = staticVal;
       if (name === 'id') hasBind = true;

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

@@ -11,9 +11,22 @@ declare class ViteCompiler implements ICompiler {
     clean(param: ICompileParam & IJavascriptCompileOption): Promise<void>;
 }
 declare function stripDeadDefProp(code: string): string;
+/**
+ * Build a sub-component's standalone `.js`.
+ *
+ * A component is registered as its own `$app_define$` module and loaded
+ * independently at runtime — the host page bundle does not carry its code. So
+ * everything the component's `<script>` declares at module level has to survive:
+ * feature imports (`import vibrator from "@system.vibrator"`), consts, helpers.
+ * Keeping only the `export default` object literal strips the feature binding and
+ * leaves `vibrator` as a free identifier, which is why the 咪咕/百度地图 keyboard
+ * could no longer vibrate.
+ */
+declare function buildComponentJs(compCode: string, compName: string, compSid: number, relPath: string): string;
 declare function mergeStyleSheets(app: any, page: any): any;
 export declare const __test: {
     stripDeadDefProp: typeof stripDeadDefProp;
     mergeStyleSheets: typeof mergeStyleSheets;
+    buildComponentJs: typeof buildComponentJs;
 };
 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 {};
@@ -397,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');
@@ -405,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;
                     }
                   }
                 }
@@ -444,7 +477,7 @@ class ViteCompiler {
                   const tplPath = _path.default.join(buildPath, `${pageName}.template.json`);
                   _fsExtra.default.ensureDirSync(_path.default.dirname(tplPath));
                   const mergedSheet = mergeStyleSheets(appStyleSheet, styleSheet);
-                  _fsExtra.default.writeJSONSync(tplPath, (0, _TemplateCompiler.uxToTemplateJson)(templateNode, sid, mergedSheet, importMap, _path.default.dirname(pageName)), param.mode === 'production' ? undefined : {
+                  _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
@@ -474,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');
@@ -482,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(),
@@ -509,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, mergeStyleSheets(appStyleSheet, 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`);
@@ -519,11 +554,7 @@ class ViteCompiler {
                       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);
+                    _fsExtra.default.writeFileSync(compJsPath, buildComponentJs(compCode, compName, compSid, compPath));
                   }
                 }
               }
@@ -599,13 +630,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;
           }
         }
       }
@@ -635,7 +669,7 @@ class ViteCompiler {
         // Generate template.json
         if (templateNode) {
           _fsExtra.default.ensureDirSync(_path.default.dirname(outputTpl));
-          _fsExtra.default.writeJSONSync(outputTpl, (0, _TemplateCompiler.uxToTemplateJson)(templateNode, sid, mergeStyleSheets(appStyleSheet, 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
           });
         }
@@ -647,13 +681,15 @@ class ViteCompiler {
           spaces: 2
         });
         // Generate js
-        const exportMatch = compCode.match(/export\s+default\s+([\s\S]*?);?\s*$/);
-        const compObj = exportMatch ? exportMatch[1].trim() : '{}';
         const compName = _path.default.basename(relPath).toLowerCase();
-        const varName = compName.replace(/-/g, '_') + '_default';
         _fsExtra.default.ensureDirSync(_path.default.dirname(outputJs));
-        _fsExtra.default.writeFileSync(outputJs, `let $style$${sid} = {"@info":{"styleObjectId":${sid}}};\nconst $app_style$${sid} = $style$${sid};\nvar ${varName} = ${compObj};\n$app_define$("@app-component/${compName}", [], function($app_require$, $app_exports$, $app_module$) {\n  $app_module$.exports = ${varName}.default || ${varName};\n  $app_module$.exports.style = $app_style$${sid};\n});\n`);
-      } catch {}
+        _fsExtra.default.writeFileSync(outputJs, buildComponentJs(compCode, compName, sid, relPath));
+      } catch (e) {
+        // A component that fails to emit renders but has no behaviour, so don't
+        // swallow the guard errors that report exactly why.
+        if (e?.message?.startsWith('[component]')) throw e;
+        console.warn(`vite: failed to emit component ${relPath}:`, e?.message ?? e);
+      }
     }
   }
   async clean(param) {
@@ -669,6 +705,51 @@ function stripDeadDefProp(code) {
   const withoutDefine = code.replace(/var __defProp = Object\.defineProperty;\n?/g, '');
   return /\b__defProp\s*\(/.test(withoutDefine) ? code : withoutDefine;
 }
+
+/**
+ * Build a sub-component's standalone `.js`.
+ *
+ * A component is registered as its own `$app_define$` module and loaded
+ * independently at runtime — the host page bundle does not carry its code. So
+ * everything the component's `<script>` declares at module level has to survive:
+ * feature imports (`import vibrator from "@system.vibrator"`), consts, helpers.
+ * Keeping only the `export default` object literal strips the feature binding and
+ * leaves `vibrator` as a free identifier, which is why the 咪咕/百度地图 keyboard
+ * could no longer vibrate.
+ */
+function buildComponentJs(compCode, compName, compSid, relPath) {
+  let code = compCode;
+  // The raw `var $app_style$ = [...]` array is superseded by the $app_style$<sid>
+  // @info reference emitted below; css.json already carries the real style data.
+  const styleLit = extractAppStyleLiteral(code);
+  if (styleLit) {
+    const decl = code.match(/var\s+\$app_style\$\s*=\s*/);
+    if (decl) {
+      const start = decl.index;
+      let end = code.indexOf(styleLit, start) + styleLit.length;
+      if (code[end] === ';') end++;
+      code = code.slice(0, start) + code.slice(end);
+    }
+  }
+  // Turn @system.*/@app-module imports into $app_require$ calls, same as entries.
+  code = rewriteSystemImports(code);
+  let defaultExpr = '{}';
+  const edIdx = code.search(/export\s+default\s+/);
+  if (edIdx !== -1) {
+    const kw = code.slice(edIdx).match(/^export\s+default\s+/);
+    defaultExpr = code.slice(edIdx + kw[0].length).trim().replace(/;\s*$/, '') || '{}';
+    code = code.slice(0, edIdx);
+  }
+  // Named exports have no consumer in a $app_define$ module; keep the declaration.
+  code = code.replace(/\bexport\s+(?=(?:const|let|var|function|class|async)\b)/g, '');
+  const leftoverImport = code.match(/^\s*import\s[^\n]*/m);
+  if (leftoverImport) {
+    throw new Error(`[component] ${relPath} has an unresolved ESM import that cannot be emitted into a ` + `standalone $app_define$ module: ${leftoverImport[0].trim()}\n` + `Only @system.*/@service.*/@android.*/@hap.*/@app-module imports are rewritten to ` + `$app_require$. Inline the dependency into the component or move it behind a feature module.`);
+  }
+  const varName = compName.replace(/-/g, '_') + '_default';
+  const moduleCode = code.trim();
+  return [`let $style$${compSid} = {"@info":{"styleObjectId":${compSid}}};`, `const $app_style$${compSid} = $style$${compSid};`, ...(moduleCode ? [moduleCode] : []), `var ${varName} = ${defaultExpr};`, `$app_define$("@app-component/${compName}", [], function($app_require$, $app_exports$, $app_module$) {`, `  $app_module$.exports = ${varName}.default || ${varName};`, `  $app_module$.exports.style = $app_style$${compSid};`, `});`, ''].join('\n');
+}
 function wrapOutput(code, entryName, isApp) {
   const componentName = _path.default.parse(entryName).name;
   const defineId = isApp ? '@app-component/app' : `@app-component/${componentName}`;
@@ -713,6 +794,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*\}/);
@@ -770,6 +874,7 @@ function mergeStyleSheets(app, page) {
 }
 const __test = exports.__test = {
   stripDeadDefProp,
-  mergeStyleSheets
+  mergeStyleSheets,
+  buildComponentJs
 };
 var _default = exports.default = ViteCompiler;

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

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

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

@@ -9,6 +9,17 @@ 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';
+
+// `__ctx` is the page scope whose prototype is `ferryGlobal` (where the runtime
+// registers `runGC` and friends). A bare `global` in legacy page source resolves
+// to QuickJS's real global object, which does NOT carry those APIs — hence
+// `global.runGC()` throws `TypeError: not a function`. Bind `global`/`window`/`self`
+// to `__ctx` so `global.xxx` walks `__ctx → ferryGlobal`. `globalThis` is left
+// untouched (still the real global), so `console` must default from `globalThis`,
+// not `global` — after the rebind `global.console` would look up ferryGlobal.
+const IIFE_WRAP_PREFIX = 'export default (function (__ctx) {\n' + '  const global = __ctx, window = __ctx, self = __ctx;\n' + '  let { requireModule, unRequireModule, $app_define$, $app_bootstrap$, $app_require$,\n' + '        console = globalThis.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 +34,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 +132,60 @@ 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;
+      const wrapped = IIFE_WRAP_PREFIX + body + IIFE_WRAP_SUFFIX;
+      Jsc.assertLegacyGlobalBinding(rel, wrapped);
+      fs.writeFileSync(abs, wrapped, 'utf-8');
+    }
+  }
+
+  // Fail the build if a Component-JS page keeps a bare `global`/`window`/`self`
+  // member access but the wrapper lost its compat alias — otherwise the page
+  // ships and only blows up at runtime (`global.runGC is not a function` →
+  // unhandled promise rejection stuck on the loading page). The alias is emitted
+  // unconditionally by IIFE_WRAP_PREFIX, so this trips only if that prefix
+  // regresses, surfacing the break at pack time instead of on-device.
+  static assertLegacyGlobalBinding(rel, wrapped) {
+    const usesLegacyGlobal = /\b(global|window|self)\s*\./.test(wrapped);
+    if (!usesLegacyGlobal) return;
+    const hasAlias = /\bconst global = __ctx, window = __ctx, self = __ctx;/.test(wrapped);
+    if (!hasAlias) {
+      _sharedUtils.ColorConsole.throw(`[jsc] ${rel} references bare global/window/self but the IIFE wrapper is ` + `missing the \`const global = __ctx, window = __ctx, self = __ctx\` compat ` + `alias. Such a page would throw at runtime (e.g. global.runGC is not a ` + `function) and hang on the loading page.`);
+      throw new Error(`[jsc] ${rel}: missing legacy global compat alias in wrapper`);
+    }
+  }
+  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.12",
+  "version": "2.1.0-prender.14",
   "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.12",
-    "@aiot-toolkit/parser": "2.1.0-prender.12",
-    "@aiot-toolkit/shared-utils": "2.1.0-prender.12",
+    "@aiot-toolkit/generator": "2.1.0-prender.14",
+    "@aiot-toolkit/parser": "2.1.0-prender.14",
+    "@aiot-toolkit/shared-utils": "2.1.0-prender.14",
     "@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.12",
+    "file-lane": "2.1.0-prender.14",
     "file-loader": "^6.2.0",
     "fs-extra": "^11.2.0",
     "jsrsasign": "^11.1.0",