@plumeria/compiler 0.14.6 → 0.14.7

package/dist/extract.js

@@ -29,12 +29,75 @@ function isInComment(code, position) {
     }
     return inMultiLineComment;
 }
+function isInString(code, position) {
+    let inSingleQuote = false;
+    let inDoubleQuote = false;
+    let inBacktick = false;
+    let escape = false;
+    for (let i = 0; i < position; i++) {
+        const char = code[i];
+        if (escape) {
+            escape = false;
+            continue;
+        }
+        if (char === '\\') {
+            escape = true;
+            continue;
+        }
+        if (!inSingleQuote && !inDoubleQuote && !inBacktick) {
+            if (char === "'") {
+                inSingleQuote = true;
+            }
+            else if (char === '"') {
+                inDoubleQuote = true;
+            }
+            else if (char === '`') {
+                inBacktick = true;
+            }
+        }
+        else {
+            if (inSingleQuote && char === "'") {
+                inSingleQuote = false;
+            }
+            else if (inDoubleQuote && char === '"') {
+                inDoubleQuote = false;
+            }
+            else if (inBacktick && char === '`') {
+                inBacktick = false;
+            }
+        }
+    }
+    return inSingleQuote || inDoubleQuote || inBacktick;
+}
+function isInHtmlText(code, position) {
+    let lastOpenTag = -1;
+    let lastCloseTag = -1;
+    for (let i = position - 1; i >= 0; i--) {
+        if (code[i] === '>' && lastCloseTag === -1) {
+            lastCloseTag = i;
+        }
+        if (code[i] === '<') {
+            lastOpenTag = i;
+            break;
+        }
+    }
+    let nextOpenTag = -1;
+    for (let i = position; i < code.length; i++) {
+        if (code[i] === '<') {
+            nextOpenTag = i;
+            break;
+        }
+    }
+    return lastCloseTag > lastOpenTag && nextOpenTag > position;
+}
 function extractCssProps(code) {
     const propsMatches = [];
     const regex = /css\.props\s*\(/g;
     let match;
     while ((match = regex.exec(code))) {
-        if (isInComment(code, match.index)) {
+        if (isInComment(code, match.index) ||
+            isInString(code, match.index) ||
+            isInHtmlText(code, match.index)) {
             continue;
         }
         const startIndex = match.index + match[0].length;
@@ -69,7 +132,9 @@ function extractCssCreate(code) {
     const regex = /(?:(?:\s*const\s+[a-zA-Z0-9_$]+\s*=\s*css\.create\([\s\S]*?\);\s*))/g;
     let match;
     while ((match = regex.exec(code))) {
-        if (isInComment(code, match.index)) {
+        if (isInComment(code, match.index) ||
+            isInString(code, match.index) ||
+            isInHtmlText(code, match.index)) {
             continue;
         }
         cssCreateMatches.push(match[0]);
@@ -99,7 +164,7 @@ function parseCssPropsArguments(args) {
     }
     return results;
 }
-function extractVueAndSvelte(filePath) {
+async function extractVueAndSvelte(filePath) {
     const ext = path.extname(filePath);
     if (!(ext === '.svelte' || ext === '.vue'))
         return filePath;

package/dist/index.js

@@ -10,7 +10,7 @@ const combineMediaQuery = require('postcss-combine-media-query');
 const { execute } = require('rscute/execute');
 const { transform } = require('lightningcss');
 const { parseSync } = require('@swc/core');
-const { buildGlobal, buildCreate } = require('@plumeria/core/processors');
+const { buildGlobal, buildProps } = require('@plumeria/core/processors');
 const { extractAndInjectStyleProps, restoreAllOriginals, extractVueAndSvelte, } = require('./extract');
 const projectRoot = process.cwd().split('node_modules')[0];
 const directPath = path.join(projectRoot, 'node_modules/@plumeria/core');
@@ -105,9 +105,26 @@ async function optimizeCSS() {
         cwd: projectRoot,
     });
     const projectName = path.basename(projectRoot);
-    const filesSupportExtensions = files.map((file) => extractVueAndSvelte(file));
-    const styleFiles = filesSupportExtensions.filter(isCSS).sort();
-    const cssPropsFiles = styleFiles.filter((file) => isCSS(file, 'props'));
+    const filesSupportExtensions = [];
+    for (const file of files) {
+        const tsFile = await extractVueAndSvelte(file);
+        filesSupportExtensions.push(tsFile);
+    }
+    const styleFiles = filesSupportExtensions
+        .filter((file) => isCSS(file, ''))
+        .sort();
+    const cssPropsFiles = styleFiles.filter((file) => {
+        if (file.endsWith('.ts')) {
+            const vueFile = file.replace('.ts', '.vue');
+            const svelteFile = file.replace('.ts', '.svelte');
+            const isGeneratedFromVue = existsSync(vueFile);
+            const isGeneratedFromSvelte = existsSync(svelteFile);
+            if (isGeneratedFromVue || isGeneratedFromSvelte) {
+                return false;
+            }
+        }
+        return isCSS(file, 'props');
+    });
     for (let i = 0; i < cssPropsFiles.length; i++) {
         await extractAndInjectStyleProps(path.resolve(cssPropsFiles[i]));
     }
@@ -120,7 +137,7 @@ async function optimizeCSS() {
         await buildGlobal(coreFilePath);
     }
     for (let i = 0; i < styleFiles.length; i++) {
-        await buildCreate(coreFilePath);
+        await buildProps(coreFilePath);
     }
     await optimizeCSS();
     await restoreAllOriginals();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/compiler",
-  "version": "0.14.6",
+  "version": "0.14.7",
   "description": "A faster compiler for Plumeria",
   "keywords": [
     "css",