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

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

@@ -1,4 +1,11 @@
 declare function uxToTemplateJson(templateNode: any, styleObjectId?: number, styleSheet?: any, importMap?: Record<string, string>, pageDir?: string, componentsMap?: Record<string, string>): any;
+/**
+ * `for="x in expr"` / `for="(k, v) in expr"` declare loop variable names that the
+ * children reference verbatim (no `this.` prefix). If `repeat` loses `value`, runtime
+ * falls back to naming the item `$item` and every `x.*` reference in the subtree
+ * resolves to undefined — the rows render empty with no error.
+ */
+declare function assertRepeatVariablePreserved(root: any, pageDir?: string): void;
 /**
  * Normalize a media query condition text from CSS Level 4 syntax to Level 3.
  *
@@ -14,6 +21,6 @@ declare function uxToTemplateJson(templateNode: any, styleObjectId?: number, sty
 declare function normalizeMediaQuery(condition: string): string;
 declare function parseStyleArray(code: string): Record<string, any>;
 /** Convert CSS text to css.json format */
-export { uxToTemplateJson, parseStyleArray, normalizeMediaQuery };
+export { uxToTemplateJson, parseStyleArray, normalizeMediaQuery, assertRepeatVariablePreserved };
 /** Compute styleObjectId hash from a string (same algorithm as blueos-pack) */
 export declare function getStyleObjectId(name: string): number;

package/lib/compiler/javascript/TemplateCompiler.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.assertRepeatVariablePreserved = assertRepeatVariablePreserved;
 exports.getStyleObjectId = getStyleObjectId;
 exports.normalizeMediaQuery = normalizeMediaQuery;
 exports.parseStyleArray = parseStyleArray;
@@ -238,6 +239,7 @@ function uxToTemplateJson(templateNode, styleObjectId, styleSheet, importMap, pa
   const result = elementToJson(rootEl, styleSheet, importMap, undefined, pageDir);
   assertNoRelativeAssetPaths(result, pageDir);
   assertNoDelimitersInEvents(result, pageDir);
+  assertRepeatVariablePreserved(result, pageDir);
   const componentsForRoot = componentsMap && Object.keys(componentsMap).length ? componentsMap : importMap;
   if (componentsForRoot && Object.keys(componentsForRoot).length) {
     result.components = {
@@ -262,6 +264,16 @@ function uxToTemplateJson(templateNode, styleObjectId, styleSheet, importMap, pa
 // 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$]*\])*$/;
 
+// `for="x in expr"` declares a loop variable, so the variable names must survive in
+// `repeat.{key,value}`. The whole binding therefore stays inside `repeat.$exp`, which
+// holds a dotted path verbatim and anything else as a function string. `$repeat` is
+// reserved for the variable-less `for="{{expr}}"` form, where runtime names the item
+// `$item` itself.
+const dottedPathRE = /^[a-zA-Z_$][\w$.]*$/;
+function forRepeatExp(expr) {
+  return dottedPathRE.test(expr) ? expr : `function () { return ${addThisPrefix(expr)}; }`;
+}
+
 // 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
@@ -430,6 +442,30 @@ function assertNoDelimitersInEvents(root, pageDir) {
     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'));
   }
 }
+
+/**
+ * `for="x in expr"` / `for="(k, v) in expr"` declare loop variable names that the
+ * children reference verbatim (no `this.` prefix). If `repeat` loses `value`, runtime
+ * falls back to naming the item `$item` and every `x.*` reference in the subtree
+ * resolves to undefined — the rows render empty with no error.
+ */
+function assertRepeatVariablePreserved(root, pageDir) {
+  const offenders = [];
+  const walk = node => {
+    if (!node || typeof node !== 'object') return;
+    const repeat = node.repeat;
+    if (repeat && !Array.isArray(repeat) && typeof repeat === 'object') {
+      if (typeof repeat.value !== 'string' || !repeat.value) {
+        offenders.push(`<${node.type ?? '?'} repeat.$exp="${repeat['$exp']}">`);
+      }
+    }
+    if (Array.isArray(node.children)) node.children.forEach(walk);
+  };
+  walk(root);
+  if (offenders.length) {
+    throw new Error(`[template] ${offenders.length} repeat binding(s) lost the declared loop variable` + `${pageDir ? ` in ${pageDir}` : ''}:\n` + offenders.map(o => `  ${o}`).join('\n'));
+  }
+}
 function tryEvalStaticShowLiteral(expr) {
   if (/^'[^']*'$/.test(expr) || /^"[^"]*"$/.test(expr)) {
     const inner = expr.slice(1, -1);
@@ -829,28 +865,18 @@ function elementToJson(el, styleSheet, importMap, scopeVars, pageDir) {
       if (inMatch) {
         // for="(key, value) in expr" syntax
         const expr = inMatch[3].trim();
-        if (/^[a-zA-Z_$][\w$.]*$/.test(expr)) {
-          node['repeat'] = {
-            '$exp': expr,
-            key: inMatch[1],
-            value: inMatch[2]
-          };
-        } else {
-          node['$repeat'] = `function () { return ${addThisPrefix(expr)}; }`;
-          node['repeat'] = [];
-        }
+        node['repeat'] = {
+          '$exp': forRepeatExp(expr),
+          key: inMatch[1],
+          value: inMatch[2]
+        };
       } else if (simpleInMatch) {
         // for="value in expr" syntax
         const expr = simpleInMatch[2].trim();
-        if (/^[a-zA-Z_$][\w$.]*$/.test(expr)) {
-          node['repeat'] = {
-            '$exp': expr,
-            value: simpleInMatch[1]
-          };
-        } else {
-          node['$repeat'] = `function () { return ${addThisPrefix(expr)}; }`;
-          node['repeat'] = [];
-        }
+        node['repeat'] = {
+          '$exp': forRepeatExp(expr),
+          value: simpleInMatch[1]
+        };
       } else if (pathTestRE.test(forVal)) {
         node['$repeat'] = forVal;
         node['repeat'] = [];

package/package.json

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