@aiot-toolkit/aiotpack 2.1.0-prender.3 → 2.1.0-prender.5

package/lib/compiler/javascript/TemplateCompiler.js

@@ -214,7 +214,7 @@ function elementToJson(el, styleSheet, importMap, scopeVars, pageDir) {
     if (name === 'is' && tagName === 'component') {
       continue; // is attribute handled at runtime
     } else if (name === 'class') {
-      className = value.trim();
+      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());

package/lib/compiler/javascript/ViteCompiler.js

@@ -7,10 +7,112 @@ 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 {};
+  delete require.cache[require.resolve(configPath)];
+  const userConfig = require(configPath);
+  if (userConfig?.postHook && !userConfig?.vite) {
+    console.warn(`[aiot-toolkit] quickapp.config.js uses legacy webpack-style \`postHook\` API; ` + `the toolkit now reads a vite-native \`vite\` section instead. ` + `Migrate to: module.exports = { vite: { define: { ... }, plugins: [ ... ] } }`);
+  }
+  const viteSection = userConfig?.vite;
+  if (!viteSection) return {};
+  if (typeof viteSection === 'function') {
+    return viteSection({
+      mode
+    }) ?? {};
+  }
+  return viteSection;
+}
 function extractAppStyleLiteral(code) {
   const m = code.match(/var\s+\$app_style\$\s*=\s*\[/);
   if (!m) return null;
@@ -56,6 +158,15 @@ class ViteCompiler {
     const manifestPath = _UxFileUtils.default.getManifestFilePath(originalProjectPath, sourceRoot);
     const manifest = _fsExtra.default.readJSONSync(manifestPath);
     const entries = _UxCompileUtil.default.resolveEntries(manifest, srcPath, originalProjectPath);
+    let userVite = {};
+    try {
+      userVite = loadUserViteConfig(originalProjectPath, param.mode === 'production' ? 'production' : 'development');
+    } catch (e) {
+      this.onLog?.([{
+        level: 1,
+        message: [`Failed to load quickapp.config.js: ${e.message}`]
+      }]);
+    }
     for (const [entryName, entryValue] of Object.entries(entries)) {
       const entryPath = entryValue.split('?')[0];
       const resolvedEntry = _path.default.resolve(originalProjectPath, entryPath);
@@ -73,8 +184,10 @@ class ViteCompiler {
         const result = await build({
           root: originalProjectPath,
           logLevel: 'silent',
+          define: userVite.define ?? {},
           resolve: {
-            extensions: ['.js', '.ts', '.ux', '.json']
+            extensions: ['.js', '.ts', '.ux', '.json'],
+            ...(userVite.resolve ?? {})
           },
           build: {
             write: false,
@@ -115,17 +228,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;
             }
@@ -285,7 +390,7 @@ class ViteCompiler {
               }, isApp, param, compilation);
               return files[0]?.content || '';
             }
-          }]
+          }, ...(userVite.plugins ?? [])]
         });
         // Extract the output code
         if (result && !Array.isArray(result)) {

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

@@ -1,10 +1,10 @@
-/**
- * Jsc
- */
 declare class Jsc {
     readonly projectPath: string;
     readonly buildPath: string;
     constructor(projectPath: string, buildPath: string);
     jsc(deleteJs?: boolean): Promise<boolean>;
+    private logBeforeInvoke;
+    private logAfterInvoke;
+    private static listFiles;
 }
 export default Jsc;

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

@@ -4,10 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var fs = _interopRequireWildcard(require("fs"));
+var path = _interopRequireWildcard(require("path"));
 var _sharedUtils = require("@aiot-toolkit/shared-utils");
-/**
- * Jsc
- */
+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; }
 class Jsc {
   constructor(projectPath, buildPath) {
     this.projectPath = projectPath;
@@ -20,21 +21,93 @@ class Jsc {
       buildPath
     } = this;
     return _sharedUtils.CommonUtil.requireNodeModule(projectPath, `@aiot-toolkit/jsc`).then(async module => {
+      this.logBeforeInvoke();
+      const start = Date.now();
       const msg = await module.default(buildPath);
+      const elapsed = Date.now() - start;
       if (msg) {
         _sharedUtils.ColorConsole.success({
           word: 'jsc command'
         }, msg);
       }
+      this.logAfterInvoke(elapsed);
     }).then(() => {
       if (deleteJs) {
         return _sharedUtils.FileUtil.del(`${buildPath}/**/*.js`);
       }
       return true;
     }).catch(error => {
-      _sharedUtils.ColorConsole.throw(error.message);
+      const fields = [];
+      if (error.code !== undefined) fields.push(`code=${error.code}`);
+      if (error.status !== undefined) fields.push(`status=${error.status}`);
+      if (error.signal) fields.push(`signal=${error.signal}`);
+      if (error.killed !== undefined) fields.push(`killed=${error.killed}`);
+      if (error.cmd) fields.push(`cmd=${error.cmd}`);
+      const stderr = error.stderr ? Buffer.from(error.stderr).toString() : '';
+      const stdout = error.stdout ? Buffer.from(error.stdout).toString() : '';
+      const parts = [fields.length ? `[jsc] error fields: ${fields.join(' ')}` : '', stderr ? `[jsc] stderr:\n${stderr}` : '', stdout ? `[jsc] stdout:\n${stdout}` : ''];
+      const detail = parts.filter(Boolean).join('\n').trim();
+      _sharedUtils.ColorConsole.throw(detail ? `${error.message}\n${detail}` : error.message);
       return Promise.reject(error);
     });
   }
+  logBeforeInvoke() {
+    const {
+      projectPath,
+      buildPath
+    } = this;
+    const jscName = '@aiot-toolkit/jsc';
+    try {
+      const pkgJsonPath = require.resolve(`${jscName}/package.json`, {
+        paths: [projectPath]
+      });
+      const pkg = require(pkgJsonPath);
+      _sharedUtils.ColorConsole.info(`[jsc] using ${jscName}@${pkg.version} resolved at ${pkgJsonPath}`);
+    } catch {
+      _sharedUtils.ColorConsole.info(`[jsc] cannot resolve ${jscName}/package.json from ${projectPath}`);
+    }
+    try {
+      const files = Jsc.listFiles(buildPath, '.js');
+      const total = files.reduce((n, f) => n + f.size, 0);
+      _sharedUtils.ColorConsole.info(`[jsc] buildPath=${buildPath} files=${files.length} totalBytes=${total}`);
+      if (files.length) {
+        const sample = files.slice(0, 12).map(f => `${f.rel}:${f.size}`).join(', ');
+        const more = files.length > 12 ? ` ...and ${files.length - 12} more` : '';
+        _sharedUtils.ColorConsole.info(`[jsc] inputs: ${sample}${more}`);
+      }
+    } catch (e) {
+      _sharedUtils.ColorConsole.info(`[jsc] failed to enumerate inputs in ${buildPath}: ${e?.message ?? e}`);
+    }
+  }
+  logAfterInvoke(elapsedMs) {
+    const {
+      buildPath
+    } = this;
+    try {
+      const jscFiles = Jsc.listFiles(buildPath, '.jsc');
+      const total = jscFiles.reduce((n, f) => n + f.size, 0);
+      _sharedUtils.ColorConsole.info(`[jsc] produced ${jscFiles.length} .jsc files (${total} bytes) in ${elapsedMs}ms`);
+    } catch {
+      /* ignore */
+    }
+  }
+  static listFiles(dir, ext) {
+    const out = [];
+    if (!fs.existsSync(dir)) return out;
+    const walk = d => {
+      for (const name of fs.readdirSync(d)) {
+        const abs = path.join(d, name);
+        const stat = fs.statSync(abs);
+        if (stat.isDirectory()) walk(abs);else if (name.endsWith(ext)) {
+          out.push({
+            rel: path.relative(dir, abs),
+            size: stat.size
+          });
+        }
+      }
+    };
+    walk(dir);
+    return out;
+  }
 }
 var _default = exports.default = Jsc;

package/package.json

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