@aiot-toolkit/aiotpack 2.1.0-prender.6 → 2.1.0-prender.8

package/lib/compiler/javascript/TemplateCompiler.js

@@ -281,6 +281,50 @@ function addThisPrefix(expr, extraReserved) {
     }).join('');
   }
 }
+function emitTextValueAttr(rawText) {
+  const text = rawText.trim();
+  if (!/\{\{[\s\S]*?\}\}/.test(text)) {
+    return {
+      attr: {
+        value: text.replace(/\s*\n\s*/g, ' ')
+      },
+      needsBind: false
+    };
+  }
+  const parts = text.split(/(\{\{[\s\S]*?\}\})/);
+  const exprs = parts.filter(Boolean).map(p => {
+    const m = p.match(/^\{\{([\s\S]*?)\}\}$/);
+    if (m) return addThisPrefix(m[1].trim());
+    return `'${p.replace(/'/g, "\\'")}'`;
+  });
+  if (exprs.length === 1 && pathTestRE.test(exprs[0].replace(/^this\./, ''))) {
+    return {
+      attr: {
+        $value: exprs[0].replace(/^this\./, '')
+      },
+      needsBind: true
+    };
+  }
+  if (exprs.length === 1) {
+    return {
+      attr: {
+        $value: `function () { return ${exprs[0]}; }`
+      },
+      needsBind: true
+    };
+  }
+  const wrapped = exprs.map(e => {
+    if (e.startsWith("'") || e.startsWith('"')) return e;
+    if (/(\|\||&&|\?\s|\+)/.test(e) && !e.startsWith('(')) return `(${e})`;
+    return e;
+  });
+  return {
+    attr: {
+      $value: `function () { return '' + ${wrapped.join(' + ')}; }`
+    },
+    needsBind: true
+  };
+}
 function elementToJson(el, styleSheet, importMap, scopeVars, pageDir) {
   const tagName = el.tagName === 'img' ? 'image' : el.tagName;
   const node = {
@@ -491,8 +535,11 @@ function elementToJson(el, styleSheet, importMap, scopeVars, pageDir) {
       hasBind = true;
     } else {
       let staticVal = value ? value.replace(/ {2,}/g, ' ') : '';
-      // Normalize relative path attrs (src, href) to absolute paths from src root
-      if (staticVal && (name === 'src' || name === 'href') && !staticVal.startsWith('/') && !/^[a-z]+:/.test(staticVal) && 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 = [];
@@ -509,34 +556,9 @@ function elementToJson(el, styleSheet, importMap, scopeVars, pageDir) {
   for (const child of el.childNodes || []) {
     const textElements = new Set(['text', 'span', 'a', 'input', 'qrcode', 'barcode', 'marquee', 'arc-text', 'option', 'button', 'label', 'textarea', 'richtext']);
     if (child.value?.trim() && !child.tagName && !(el.childNodes || []).some(c => c.tagName) && textElements.has(tagName)) {
-      // Collapse whitespace for static text; dynamic text is trimmed separately
-      const text = child.value;
-      if (/\{\{.*\}\}/.test(text)) {
-        // Build function expression from template literal
-        // Trim surrounding whitespace before splitting (vivo ignores indentation whitespace)
-        const trimmedText = text.trim();
-        const parts = trimmedText.split(/(\{\{[\s\S]*?\}\})/);
-        const exprs = parts.filter(Boolean).map(p => {
-          const m = p.match(/^\{\{([\s\S]*?)\}\}$/);
-          if (m) return addThisPrefix(m[1].trim());
-          return `'${p.replace(/'/g, "\\'")}'`;
-        });
-        if (exprs.length === 1 && pathTestRE.test(exprs[0].replace(/^this\./, ''))) {
-          attrObj['$value'] = exprs[0].replace(/^this\./, '');
-        } else if (exprs.length === 1) {
-          attrObj['$value'] = `function () { return ${exprs[0]}; }`;
-        } else {
-          const wrappedExprs = exprs.map(e => {
-            if (e.startsWith("'") || e.startsWith('"')) return e;
-            if (/(\|\||&&|\?\s|\+)/.test(e) && !e.startsWith('(')) return `(${e})`;
-            return e;
-          });
-          attrObj['$value'] = `function () { return '' + ${wrappedExprs.join(' + ')}; }`;
-        }
-        hasBind = true;
-      } else {
-        attrObj['value'] = text.replace(/\s*\n\s*/g, ' ');
-      }
+      const emitted = emitTextValueAttr(child.value);
+      Object.assign(attrObj, emitted.attr);
+      if (emitted.needsBind) hasBind = true;
     }
   }
   // Output in vivo order: attr → bind → class → events → import → style → children
@@ -572,13 +594,19 @@ function elementToJson(el, styleSheet, importMap, scopeVars, pageDir) {
   }
   if (Object.keys(events).length) node.events = events;
   // Inline style from styleSheet (class selector + tag selector) + static portion of style="..."
+  // Inline style from styleSheet (class selector + tag selector) + static portion of style="...".
   // Only base (non-@media) selectors are inlined; @media rules are applied at runtime by SDK.
+  // Class rules apply in stylesheet declaration order (later declarations override earlier),
+  // NOT in class-attribute order.
   if (styleSheet) {
     const merged = {};
     if (styleSheet[el.tagName]) Object.assign(merged, styleSheet[el.tagName]);
     if (className && !hasDynClass) {
-      for (const cls of className.split(/\s+/)) {
-        if (cls && styleSheet[`.${cls}`]) Object.assign(merged, styleSheet[`.${cls}`]);
+      const classSet = new Set(className.split(/\s+/).filter(Boolean));
+      for (const key of Object.keys(styleSheet)) {
+        if (key.length > 1 && key.startsWith('.') && classSet.has(key.slice(1))) {
+          Object.assign(merged, styleSheet[key]);
+        }
       }
     }
     Object.assign(merged, staticInlineStyle);
@@ -597,14 +625,12 @@ function elementToJson(el, styleSheet, importMap, scopeVars, pageDir) {
     if (child.tagName) {
       childNodes.push(elementToJson(child, styleSheet, importMap, scopeVars, pageDir));
     } else if (isMixedContent && child.value?.trim()) {
-      // Wrap text nodes in <span> for mixed content
-      const text = child.value.replace(/[ \t]*\n[ \t]*/g, ' ').replace(/ {2,}/g, ' ');
+      const emitted = emitTextValueAttr(child.value);
       const spanNode = {
         type: 'span',
-        attr: {
-          value: text
-        }
+        attr: emitted.attr
       };
+      if (emitted.needsBind) spanNode.bind = 1;
       childNodes.push(spanNode);
     }
   }

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

@@ -10,4 +10,8 @@ declare class ViteCompiler implements ICompiler {
     compile(param: IJavascriptCompileOption): Promise<void>;
     clean(param: ICompileParam & IJavascriptCompileOption): Promise<void>;
 }
+declare function stripDeadDefProp(code: string): string;
+export declare const __test: {
+    stripDeadDefProp: typeof stripDeadDefProp;
+};
 export default ViteCompiler;

package/lib/compiler/javascript/ViteCompiler.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.default = exports.__test = void 0;
 var _TemplateCompiler = require("./TemplateCompiler");
 var _path = _interopRequireDefault(require("path"));
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
@@ -208,6 +208,16 @@ class ViteCompiler {
               external: id => id.startsWith('@app-module/') || /^@(system|service|android|hap)\./.test(id),
               output: {
                 globals: id => `$app_require$("@app-module/${id.replace(/^@(system|service|android|hap|app-module)\./, '')}")`
+              },
+              onwarn(warning, defaultHandler) {
+                // Rolldown silently emits `(void 0)()` for namespace-member accesses whose
+                // name is not exported by the target module — leaves runtime with an opaque
+                // TypeError instead of the source identifier. Escalate to a build error so
+                // the source location surfaces before ship.
+                if (warning.code === 'IMPORT_IS_UNDEFINED') {
+                  throw new Error(`[toolkit] ${warning.message ?? 'IMPORT_IS_UNDEFINED'} — this would silently emit (void 0)() at the call site.`);
+                }
+                defaultHandler(warning);
               }
             },
             commonjsOptions: {
@@ -228,6 +238,30 @@ class ViteCompiler {
             }
           },
           plugins: [{
+            name: 'image-asset-string',
+            enforce: 'pre',
+            load(id) {
+              // require("./x.png") in .ux <script> must resolve to a path string,
+              // matching webpack file-loader / vivo blueos-pack semantics. Without
+              // this hook rolldown treats each image as an ES module and emits
+              // `(init_x(), __toCommonJS(x_exports))` — the site assigns
+              // `{ default: fn }` to src and runtime cannot render.
+              const match = id.match(/\.(png|jpe?g|gif|svg|webp|bmp|ico)(\?.*)?$/i);
+              if (!match) return null;
+              const filePath = id.replace(/\?.*$/, '');
+              if (!_fsExtra.default.existsSync(filePath)) return null;
+              const relFromSrc = _path.default.relative(srcPath, filePath).split(_path.default.sep).join('/');
+              // Assets outside src/ (typically node_modules) fall through to the
+              // default asset handler — the caller is responsible for their path
+              // resolution. Vivo blueos-pack + webpack file-loader use rpk-root
+              // absolute paths (`/common/...`, `/dynamicAssets/name-hash.png`);
+              // runtime <image src> resolves against the rpk root, so relative
+              // `./common/...` from a nested page directory would misdirect.
+              if (relFromSrc.startsWith('..')) return null;
+              const runtimePath = '/' + relFromSrc;
+              return `module.exports = ${JSON.stringify(runtimePath)};`;
+            }
+          }, {
             name: "cjs-shim",
             enforce: "pre",
             load(id) {
@@ -249,6 +283,26 @@ class ViteCompiler {
                 map: null
               } : null;
             }
+          }, {
+            name: 'namespace-preserve',
+            enforce: 'pre',
+            transform(code, id) {
+              if (!/import\s*\*\s*as\s+\w+\s+from/.test(code)) return null;
+              // Rolldown resolves `import * as L from './x'; L.foo()` at compile time —
+              // if `foo` isn't exported by `./x` the call collapses to `(void 0)()` and
+              // the source identifier is lost. Rewriting the alias to a runtime variable
+              // (with webpack-style default-interop) preserves the identifier so runtime
+              // errors point at the actual source name.
+              const out = code.replace(/import\s*\*\s*as\s+(\w+)\s+from\s+(['"][^'"]+['"])/g, (_m, local, src) => {
+                const ns = `__${local}_ns`,
+                  key = `__${local}_key`;
+                return `import * as ${ns} from ${src}; const ${key} = 'default'; const ${local} = ${ns}[${key}] != null ? ${ns}[${key}] : ${ns};`;
+              });
+              return out !== code ? {
+                code: out,
+                map: null
+              } : null;
+            }
           }, {
             name: 'ux-loader',
             resolveId(source, importer) {
@@ -432,10 +486,13 @@ class ViteCompiler {
         });
       }
     }
-    if (entryAttempted > 0 && entryFailures.length === entryAttempted) {
+    if (entryFailures.length > 0) {
+      // Any per-entry failure fails the whole build — silently shipping an rpk with
+      // one page missing is exactly the class of bug that lets `(void 0)()` /
+      // empty jsc / dropped app.js leak to users.
       const sample = entryFailures.slice(0, 3).map(f => `  ${f.entry}: ${f.error}`).join('\n');
       const more = entryFailures.length > 3 ? `\n  ...and ${entryFailures.length - 3} more` : '';
-      throw new Error(`vite build failed for all ${entryAttempted} entry page(s); no JS was emitted.\n` + `First failures:\n${sample}${more}`);
+      throw new Error(`vite build failed for ${entryFailures.length}/${entryAttempted} entry page(s).\n` + `Failures:\n${sample}${more}`);
     }
     // Second pass: compile ALL .ux files that weren't entry pages
     // Each .ux file gets its own template.json + css.json + js
@@ -531,6 +588,10 @@ class ViteCompiler {
     _UxCompileUtil.default.clean([outputPath, releasePath].map(item => _path.default.resolve(projectPath, item)));
   }
 }
+function stripDeadDefProp(code) {
+  const withoutDefine = code.replace(/var __defProp = Object\.defineProperty;\n?/g, '');
+  return /\b__defProp\s*\(/.test(withoutDefine) ? code : withoutDefine;
+}
 function wrapOutput(code, entryName, isApp) {
   const componentName = _path.default.parse(entryName).name;
   const defineId = isApp ? '@app-component/app' : `@app-component/${componentName}`;
@@ -561,8 +622,10 @@ function wrapOutput(code, entryName, isApp) {
   // Remove rolldown region comments
   code = code.replace(/\/\/#region[^\n]*\n/g, '');
   code = code.replace(/\/\/#endregion[^\n]*/g, '');
-  // Remove rolldown runtime helpers (not needed in final output)
-  code = code.replace(/var __defProp = Object\.defineProperty;\n?/g, '');
+  // Remove rolldown runtime helpers. __defProp is only dead when nothing else calls it;
+  // when the CJS→ESM interop chain (__toCommonJS / __copyProps / __publicField) survives
+  // tree-shaking, __defProp is referenced by those helpers and must stay.
+  code = stripDeadDefProp(code);
   code = code.replace(/var __exportAll = [\s\S]*?return target;\s*\};\n?/g, '');
   // Inline __exportAll calls: __exportAll({key: () => value, ...}) -> {key: value, ...}
   // Match __exportAll(...) or /* @__PURE__ */ __exportAll(...)
@@ -603,4 +666,7 @@ $app_define$("${defineId}", [], function($app_require$, $app_exports$, $app_modu
 $app_bootstrap$("${bootstrapId}");
 `;
 }
+const __test = exports.__test = {
+  stripDeadDefProp
+};
 var _default = exports.default = ViteCompiler;

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

@@ -20,6 +20,7 @@ class Jsc {
       projectPath,
       buildPath
     } = this;
+    const beforeJsCount = Jsc.listFiles(buildPath, '.js').length;
     return _sharedUtils.CommonUtil.requireNodeModule(projectPath, `@aiot-toolkit/jsc`).then(async module => {
       this.logBeforeInvoke();
       const start = Date.now();
@@ -32,6 +33,15 @@ class Jsc {
       }
       this.logAfterInvoke(elapsed);
     }).then(() => {
+      // aiotjsc silently exits 0 on Windows when the buildPath contains CJK chars
+      // (win32_aiotjsc.exe uses ANSI POSIX APIs) — leaves 0 .jsc while the delete step
+      // below removes all .js, shipping an empty VRU. Fail loud before the deletion
+      // runs so the source path issue surfaces at build time.
+      const afterJscCount = Jsc.listFiles(buildPath, '.jsc').length;
+      if (beforeJsCount > 0 && afterJscCount < beforeJsCount) {
+        _sharedUtils.ColorConsole.throw(`[jsc] silent failure: expected at least ${beforeJsCount} .jsc file(s) but got ${afterJscCount}. ` + `Most common cause on Windows: buildPath contains non-ASCII characters ` + `(rename the project directory to ASCII-only and rebuild).`);
+        return Promise.reject(new Error(`[jsc] produced ${afterJscCount} of ${beforeJsCount} expected .jsc files`));
+      }
       if (deleteJs) {
         return _sharedUtils.FileUtil.del(`${buildPath}/**/*.js`);
       }

package/package.json

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