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

package/lib/afterCompile/ux/UxAfterCompile.js

@@ -44,11 +44,16 @@ class UxAfterCompile {
         level: _sharedUtils.Loglevel.SUCCESS,
         message: ['javascript compile success']
       }]);
-    }).catch(_ref => {
-      let {
-        errors,
-        warnings
-      } = _ref;
+    }).catch(err => {
+      const errors = err?.errors;
+      const warnings = err?.warnings;
+      if (!errors?.length && !warnings?.length) {
+        onLog?.([{
+          level: _sharedUtils.Loglevel.THROW,
+          message: [`javascript compile failed: ${err?.message ?? err}`]
+        }]);
+        throw err instanceof Error ? err : new Error(String(err));
+      }
       const errorLength = errors?.length || 0;
       const messages = [`webpack error:\r\n`];
       if (errors?.length) {

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

@@ -12,16 +12,6 @@ declare function uxToTemplateJson(templateNode: any, styleObjectId?: number, sty
  * `screen and ` is preserved; `not` / `only` are preserved as-is.
  */
 declare function normalizeMediaQuery(condition: string): string;
-/**
- * Parse compiled $app_style$ array. Each rule is either:
- *   [selectors, props]                          — base rule
- *   [{condition: "<media-query>"}, selectors, props] — conditional rule (@media or @import with query)
- *
- * Returns a flat map: selectors → props for base rules, plus
- * `"@media <normalizedConditionText>"` keys whose values are the per-condition
- * `{selector: props}` map. The condition text is normalized to Level 3 so
- * runtime only needs a Level-3 matcher.
- */
 declare function parseStyleArray(code: string): Record<string, any>;
 /** Convert CSS text to css.json format */
 export { uxToTemplateJson, parseStyleArray, normalizeMediaQuery };

package/lib/compiler/javascript/TemplateCompiler.js

@@ -100,10 +100,74 @@ function normalizeMediaQuery(condition) {
  * `{selector: props}` map. The condition text is normalized to Level 3 so
  * runtime only needs a Level-3 matcher.
  */
+const NAMED_COLORS = new Set(['transparent', 'aliceblue', 'antiquewhite', 'aqua', 'aquamarine', 'azure', 'beige', 'bisque', 'black', 'blanchedalmond', 'blue', 'blueviolet', 'brown', 'burlywood', 'cadetblue', 'chartreuse', 'chocolate', 'coral', 'cornflowerblue', 'cornsilk', 'crimson', 'cyan', 'darkblue', 'darkcyan', 'darkgoldenrod', 'darkgray', 'darkgreen', 'darkgrey', 'darkkhaki', 'darkmagenta', 'darkolivegreen', 'darkorange', 'darkorchid', 'darkred', 'darksalmon', 'darkseagreen', 'darkslateblue', 'darkslategray', 'darkslategrey', 'darkturquoise', 'darkviolet', 'deeppink', 'deepskyblue', 'dimgray', 'dimgrey', 'dodgerblue', 'firebrick', 'floralwhite', 'forestgreen', 'fuchsia', 'gainsboro', 'ghostwhite', 'gold', 'goldenrod', 'gray', 'green', 'greenyellow', 'grey', 'honeydew', 'hotpink', 'indianred', 'indigo', 'ivory', 'khaki', 'lavender', 'lavenderblush', 'lawngreen', 'lemonchiffon', 'lightblue', 'lightcoral', 'lightcyan', 'lightgoldenrodyellow', 'lightgray', 'lightgreen', 'lightgrey', 'lightpink', 'lightsalmon', 'lightseagreen', 'lightskyblue', 'lightslategray', 'lightslategrey', 'lightsteelblue', 'lightyellow', 'lime', 'limegreen', 'linen', 'magenta', 'maroon', 'mediumaquamarine', 'mediumblue', 'mediumorchid', 'mediumpurple', 'mediumseagreen', 'mediumslateblue', 'mediumspringgreen', 'mediumturquoise', 'mediumvioletred', 'midnightblue', 'mintcream', 'mistyrose', 'moccasin', 'navajowhite', 'navy', 'oldlace', 'olive', 'olivedrab', 'orange', 'orangered', 'orchid', 'palegoldenrod', 'palegreen', 'paleturquoise', 'palevioletred', 'papayawhip', 'peachpuff', 'peru', 'pink', 'plum', 'powderblue', 'purple', 'rebeccapurple', 'red', 'rosybrown', 'royalblue', 'saddlebrown', 'salmon', 'sandybrown', 'seagreen', 'seashell', 'sienna', 'silver', 'skyblue', 'slateblue', 'slategray', 'slategrey', 'snow', 'springgreen', 'steelblue', 'tan', 'teal', 'thistle', 'tomato', 'turquoise', 'violet', 'wheat', 'white', 'whitesmoke', 'yellow', 'yellowgreen']);
+const COLOR_PROP_RE = /(?:^|[a-z])[Cc]olor$/;
+const NON_NAMED_COLOR_VALUE_RE = /^(?:#[0-9a-fA-F]{3,8}|rgba?\(|hsla?\(|currentColor)/;
 function parseStyleArray(code) {
   const styleSheet = {};
+  const expandShortHex = value => {
+    const short = /^#([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])?$/.exec(value);
+    if (!short) return value;
+    const r = short[1] + short[1];
+    const g = short[2] + short[2];
+    const b = short[3] + short[3];
+    const a = short[4] ? short[4] + short[4] : '';
+    return ('#' + r + g + b + a).toLowerCase();
+  };
+  const normalizeTransform = obj => {
+    if (!obj || typeof obj !== 'object') return typeof obj === 'string' ? obj : JSON.stringify(obj);
+    const out = {};
+    for (const [k, v] of Object.entries(obj)) {
+      out[k] = typeof v === 'number' && /^translate[XYZ]?$/.test(k) ? `${v}px` : v;
+    }
+    return JSON.stringify(out);
+  };
+  const expandKeyframeSteps = value => {
+    let arr = [];
+    if (typeof value === 'string') {
+      try {
+        arr = JSON.parse(value);
+      } catch {
+        return [];
+      }
+    } else if (Array.isArray(value)) {
+      arr = value;
+    } else {
+      return [];
+    }
+    return arr.map(step => {
+      const out = {};
+      const entries = Object.entries(step ?? {});
+      for (const [k, v] of entries) {
+        if (k === 'time') continue;
+        out[k] = k === 'transform' && v && typeof v === 'object' ? normalizeTransform(v) : v;
+      }
+      if ('time' in (step ?? {})) out.time = step.time;
+      return out;
+    });
+  };
+  const normalizeStyleProps = props => {
+    if (!props || typeof props !== 'object') return props;
+    const out = {};
+    for (const [k, v] of Object.entries(props)) {
+      if ((k === 'animationIterationCount' || k === 'iterationCount') && v === 'infinite') {
+        out[k] = -1;
+      } else if (typeof v === 'string' && COLOR_PROP_RE.test(k)) {
+        if (NAMED_COLORS.has(v.toLowerCase())) {
+          out[k] = v;
+        } else if (NON_NAMED_COLOR_VALUE_RE.test(v)) {
+          out[k] = expandShortHex(v);
+        }
+      } else {
+        out[k] = v;
+      }
+    }
+    return out;
+  };
   const ingest = parsed => {
     if (!Array.isArray(parsed)) return;
+    let currentMediaCondition = null;
+    let currentMediaEntry = null;
     for (const rule of parsed) {
       if (!Array.isArray(rule) || rule.length < 2) continue;
       let selectors, props, conditionText;
@@ -115,16 +179,47 @@ function parseStyleArray(code) {
         selectors = rule[0];
         props = rule[1];
       }
-      if (!Array.isArray(selectors)) continue;
-      let target = styleSheet;
+      if (!Array.isArray(selectors) || selectors.length === 0) continue;
+      let target;
       if (conditionText) {
-        const key = `@media ${normalizeMediaQuery(conditionText)}`;
-        target = styleSheet[key] = styleSheet[key] || {};
+        const normalized = normalizeMediaQuery(conditionText);
+        if (currentMediaCondition !== normalized) {
+          const list = styleSheet['@MEDIA'] = styleSheet['@MEDIA'] || [];
+          currentMediaEntry = {
+            condition: normalized
+          };
+          list.push(currentMediaEntry);
+          currentMediaCondition = normalized;
+        }
+        target = currentMediaEntry;
+      } else {
+        target = styleSheet;
+        currentMediaCondition = null;
+        currentMediaEntry = null;
       }
-      for (const sel of selectors) {
-        if (Array.isArray(sel) && sel.length >= 2) {
-          target[sel[0] === 0 ? `.${sel[1]}` : sel[1]] = props;
+      const normalizedProps = normalizeStyleProps(props);
+      const firstSel = selectors[0];
+      if (Array.isArray(firstSel) && firstSel.length >= 2 && firstSel[0] === 3) {
+        const bucket = target['@KEYFRAMES'] = target['@KEYFRAMES'] || {};
+        bucket[firstSel[1]] = expandKeyframeSteps(props?.keyframes ?? '[]');
+      } else if (Array.isArray(firstSel) && firstSel.length >= 2 && firstSel[0] === 4) {
+        const bucket = target['@FONT-FACE'] = target['@FONT-FACE'] || {};
+        bucket[firstSel[1]] = props?.fontface ?? normalizedProps;
+      } else {
+        const pieces = [];
+        for (let i = 0; i < selectors.length; i++) {
+          const sel = selectors[i];
+          if (!Array.isArray(sel) || sel.length < 2) continue;
+          if (sel[0] === 5) {
+            pieces.push(String(sel[1]));
+            continue;
+          }
+          if (pieces.length && pieces[pieces.length - 1] !== '>' && pieces[pieces.length - 1] !== '~' && pieces[pieces.length - 1] !== '+') {
+            pieces.push(' ');
+          }
+          if (sel[0] === 0) pieces.push(`.${sel[1]}`);else if (sel[0] === 1) pieces.push(`#${sel[1]}`);else pieces.push(String(sel[1]));
         }
+        if (pieces.length) target[pieces.join('')] = normalizedProps;
       }
     }
   };

package/lib/compiler/javascript/ViteCompiler.js

@@ -7,10 +7,95 @@ exports.default = void 0;
 var _TemplateCompiler = require("./TemplateCompiler");
 var _path = _interopRequireDefault(require("path"));
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
+var acorn = _interopRequireWildcard(require("acorn"));
 var _UxCompileUtil = _interopRequireDefault(require("./vela/utils/UxCompileUtil"));
 var _UxFileUtils = _interopRequireDefault(require("../../utils/ux/UxFileUtils"));
 var _UxLoaderUtils = _interopRequireDefault(require("../../utils/ux/UxLoaderUtils"));
+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; }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const NS_PREFIX = /^@(system|service|android|hap)\./;
+const APP_MODULE_PREFIX = '@app-module/';
+function rewriteSystemImports(code) {
+  if (!/@(system|service|android|hap)\.|@app-module\//.test(code)) return code;
+  let ast;
+  try {
+    ast = acorn.parse(code, {
+      sourceType: 'module',
+      ecmaVersion: 'latest',
+      allowHashBang: true,
+      allowAwaitOutsideFunction: true,
+      allowReturnOutsideFunction: true,
+      allowImportExportEverywhere: true
+    });
+  } catch {
+    return code;
+  }
+  const edits = [];
+  let tempCounter = 0;
+  for (const node of ast.body) {
+    if (node.type !== 'ImportDeclaration') continue;
+    const src = node.source.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) continue;
+    const target = `"${APP_MODULE_PREFIX}${moduleName}"`;
+    if (node.specifiers.length === 0) {
+      edits.push({
+        start: node.start,
+        end: node.end,
+        replacement: `$app_require$(${target});`
+      });
+      continue;
+    }
+    if (node.specifiers.length === 1) {
+      const spec = node.specifiers[0];
+      const local = spec.local.name;
+      if (spec.type === 'ImportDefaultSpecifier' || spec.type === 'ImportNamespaceSpecifier') {
+        edits.push({
+          start: node.start,
+          end: node.end,
+          replacement: `const ${local} = $app_require$(${target});`
+        });
+      } else if (spec.type === 'ImportSpecifier') {
+        const imported = spec.imported.name;
+        const dest = imported === local ? `{ ${local} }` : `{ ${imported}: ${local} }`;
+        edits.push({
+          start: node.start,
+          end: node.end,
+          replacement: `const ${dest} = $app_require$(${target});`
+        });
+      }
+      continue;
+    }
+    const tempVar = `$_imp${tempCounter++}`;
+    const parts = [`const ${tempVar} = $app_require$(${target});`];
+    for (const spec of node.specifiers) {
+      const local = spec.local.name;
+      if (spec.type === 'ImportDefaultSpecifier' || spec.type === 'ImportNamespaceSpecifier') {
+        parts.push(`const ${local} = ${tempVar};`);
+      } else if (spec.type === 'ImportSpecifier') {
+        const imported = spec.imported.name;
+        const dest = imported === local ? `{ ${local} }` : `{ ${imported}: ${local} }`;
+        parts.push(`const ${dest} = ${tempVar};`);
+      }
+    }
+    edits.push({
+      start: node.start,
+      end: node.end,
+      replacement: parts.join(' ')
+    });
+  }
+  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 loadUserViteConfig(projectPath, mode) {
   const configPath = _path.default.join(projectPath, 'quickapp.config.js');
   if (!_fsExtra.default.existsSync(configPath)) return {};
@@ -62,6 +147,11 @@ class ViteCompiler {
   }
   async compile(param) {
     await this.clean(param);
+    const nodeMajor = parseInt((process.versions.node ?? '0').split('.')[0], 10);
+    const nodeMinor = parseInt((process.versions.node ?? '0').split('.')[1] ?? '0', 10);
+    if (nodeMajor < 20 || nodeMajor === 20 && nodeMinor < 19) {
+      throw new Error(`vite ^8 requires Node ^20.19.0 || >=22.12.0; current Node is v${process.versions.node}. ` + `Upgrade Node (recommend 22 LTS) and re-run the build.`);
+    }
     const {
       projectPath,
       sourceRoot,
@@ -82,10 +172,13 @@ class ViteCompiler {
         message: [`Failed to load quickapp.config.js: ${e.message}`]
       }]);
     }
+    const entryFailures = [];
+    let entryAttempted = 0;
     for (const [entryName, entryValue] of Object.entries(entries)) {
       const entryPath = entryValue.split('?')[0];
       const resolvedEntry = _path.default.resolve(originalProjectPath, entryPath);
       if (!_fsExtra.default.existsSync(resolvedEntry)) continue;
+      entryAttempted++;
       const outputFile = _path.default.join(buildPath, `${entryName}.js`);
       _fsExtra.default.ensureDirSync(_path.default.dirname(outputFile));
       const allEntryPaths = Object.values(entries).map(v => _path.default.resolve(originalProjectPath, v.split('?')[0]));
@@ -120,10 +213,17 @@ class ViteCompiler {
             commonjsOptions: {
               transformMixedEsModules: true
             },
-            minify: param.mode === 'production' ? 'terser' : false,
+            minify: param.mode === 'production' ? userVite.build?.minify ?? 'terser' : false,
             terserOptions: {
               format: {
-                comments: false
+                comments: false,
+                ...(userVite.build?.terserOptions?.format ?? {})
+              },
+              compress: {
+                ...(userVite.build?.terserOptions?.compress ?? {})
+              },
+              mangle: {
+                ...(userVite.build?.terserOptions?.mangle ?? {})
               }
             }
           },
@@ -143,17 +243,9 @@ class ViteCompiler {
             name: 'system-to-app-require',
             enforce: 'pre',
             transform(code, id) {
-              if (!/@(system|service|android|hap)\.|@app-module\//.test(code)) return null;
-              const NS = '(system|service|android|hap)';
-              let t = code;
-              t = t.replace(new RegExp(`import\\s+(\\w+)\\s+from\\s+['"]@${NS}\\.([^'"]+)['"]\\s*;?`, 'g'), 'const $1 = $app_require$("@app-module/$2.$3");');
-              t = t.replace(new RegExp(`import\\s+\\{([^}]+)\\}\\s+from\\s+['"]@${NS}\\.([^'"]+)['"]\\s*;?`, 'g'), 'const {$1} = $app_require$("@app-module/$2.$3");');
-              t = t.replace(/import\s+(\w+)\s+from\s+['"]@app-module\/([^'"]+)['"]\s*;?/g, 'const $1 = $app_require$("@app-module/$2");');
-              t = t.replace(/import\s+\{([^}]+)\}\s+from\s+['"]@app-module\/([^'"]+)['"]\s*;?/g, 'const {$1} = $app_require$("@app-module/$2");');
-              t = t.replace(/import\s+['"]@app-module\/([^'"]+)['"]\s*;?/g, '$app_require$("@app-module/$1");');
-              t = t.replace(new RegExp(`import\\s+['"]@${NS}\\.([^'"]+)['"]\\s*;?`, 'g'), '$app_require$("@app-module/$1.$2");');
-              return t !== code ? {
-                code: t,
+              const out = rewriteSystemImports(code);
+              return out !== code ? {
+                code: out,
                 map: null
               } : null;
             }
@@ -167,9 +259,11 @@ class ViteCompiler {
             async load(id) {
               if (!id.endsWith('.ux')) return null;
               const content = _fsExtra.default.readFileSync(id, 'utf-8');
-              const isApp = id.endsWith('/app.ux') && _path.default.basename(_path.default.dirname(id)) === 'src';
+              const idPosix = id.replace(/\\/g, '/');
+              const resolvedEntryPosix = resolvedEntry.replace(/\\/g, '/');
+              const isApp = idPosix.endsWith('/app.ux') && _path.default.basename(_path.default.dirname(id)) === 'src';
               // Generate template.json and css.json
-              if (id === resolvedEntry) {
+              if (idPosix === resolvedEntryPosix) {
                 const parse5 = require("aiot-parse5");
                 const doc = parse5.parseFragment(content, {
                   scriptingEnabled: false
@@ -330,9 +424,19 @@ class ViteCompiler {
           }
         }
       } catch (err) {
-        console.warn(`vite: failed to build ${entryName}:`, err.message);
+        const msg = err.message;
+        console.warn(`vite: failed to build ${entryName}:`, msg);
+        entryFailures.push({
+          entry: entryName,
+          error: msg
+        });
       }
     }
+    if (entryAttempted > 0 && entryFailures.length === entryAttempted) {
+      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}`);
+    }
     // Second pass: compile ALL .ux files that weren't entry pages
     // Each .ux file gets its own template.json + css.json + js
     const allUxFiles = [];
@@ -348,7 +452,7 @@ class ViteCompiler {
     const compiledEntries = new Set(Object.values(entries).map(v => _path.default.resolve(originalProjectPath, v.split('?')[0])));
     for (const uxFile of allUxFiles) {
       if (compiledEntries.has(uxFile)) continue; // already compiled as entry
-      if (uxFile.endsWith('/app.ux')) continue; // app.ux handled separately
+      if (uxFile.replace(/\\/g, '/').endsWith('/app.ux')) continue; // app.ux handled separately
       const relPath = _path.default.relative(srcPath, uxFile).replace(/\.ux$/, '');
       const outputJs = _path.default.join(buildPath, `${relPath}.js`);
       const outputTpl = _path.default.join(buildPath, `${relPath}.template.json`);

package/package.json

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