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

package/lib/compiler/javascript/ViteCompiler.js

@@ -11,6 +11,33 @@ var _UxCompileUtil = _interopRequireDefault(require("./vela/utils/UxCompileUtil"
 var _UxFileUtils = _interopRequireDefault(require("../../utils/ux/UxFileUtils"));
 var _UxLoaderUtils = _interopRequireDefault(require("../../utils/ux/UxLoaderUtils"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function extractAppStyleLiteral(code) {
+  const m = code.match(/var\s+\$app_style\$\s*=\s*\[/);
+  if (!m) return null;
+  let i = m.index + m[0].length - 1;
+  let depth = 0;
+  let inStr = null;
+  for (; i < code.length; i++) {
+    const c = code[i];
+    if (inStr) {
+      if (c === '\\') {
+        i++;
+        continue;
+      }
+      if (c === inStr) inStr = null;
+      continue;
+    }
+    if (c === '"' || c === "'") {
+      inStr = c;
+      continue;
+    }
+    if (c === '[') depth++;else if (c === ']') {
+      depth--;
+      if (depth === 0) return code.slice(m.index + m[0].length - 1, i + 1);
+    }
+  }
+  return null;
+}
 class ViteCompiler {
   constructor(context, onLog) {
     this.context = context;
@@ -148,11 +175,9 @@ class ViteCompiler {
                 const compiledCode = compFiles[0]?.content || '';
                 // Extract $app_style$ array from compiled code
                 let styleSheet = {};
-                const styleMatch = compiledCode.match(/var \$app_style\$ = (\[[\s\S]*?\]);?\s*(?:import|export|var |const |$)/);
-                if (styleMatch) {
-                  if (styleMatch) {
-                    styleSheet = (0, _TemplateCompiler.parseStyleArray)(styleMatch[1]);
-                  }
+                const styleLiteral = extractAppStyleLiteral(compiledCode);
+                if (styleLiteral) {
+                  styleSheet = (0, _TemplateCompiler.parseStyleArray)(styleLiteral);
                 }
                 // Write css.json
                 const cssPath = _path.default.join(buildPath, `${isApp ? 'app' : pageName}.css.json`);
@@ -226,9 +251,9 @@ class ViteCompiler {
                     }, false, param, compilation);
                     let compStyleSheet = {};
                     const compCode = compResult.files[0]?.content || '';
-                    const csm = compCode.match(/var \$app_style\$ = (\[[\s\S]*?\]);?\s*(?:import|export|var |const |$)/);
+                    const csm = extractAppStyleLiteral(compCode);
                     if (csm) {
-                      compStyleSheet = (0, _TemplateCompiler.parseStyleArray)(csm[1]);
+                      compStyleSheet = (0, _TemplateCompiler.parseStyleArray)(csm);
                     }
                     const compSid = (0, _TemplateCompiler.getStyleObjectId)(compPath);
                     _fsExtra.default.writeJSONSync(compTplPath, (0, _TemplateCompiler.uxToTemplateJson)(compTpl, compSid, compStyleSheet, compImportMap, _path.default.dirname(compPath)), param.mode === 'production' ? undefined : {
@@ -337,9 +362,9 @@ class ViteCompiler {
         const compCode = files[0]?.content || '';
         // Extract style
         let styleSheet = {};
-        const csm = compCode.match(/var \$app_style\$ = (\[[\s\S]*?\]);?\s*(?:import|export|var |const |$)/);
+        const csm = extractAppStyleLiteral(compCode);
         if (csm) {
-          styleSheet = (0, _TemplateCompiler.parseStyleArray)(csm[1]);
+          styleSheet = (0, _TemplateCompiler.parseStyleArray)(csm);
         }
         // Generate template.json
         if (templateNode) {

package/package.json

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