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

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 {};
@@ -143,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;
             }

package/package.json

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