@plumeria/compiler 0.14.8 → 0.14.9

package/dist/extract.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require('fs');
 const path = require('path');
-const originalCodeMap = new Map();
 const generatedTsMap = new Map();
 function isInComment(code, position) {
     const beforePosition = code.substring(0, position);
@@ -159,6 +158,20 @@ function extractCssCreate(code) {
     }
     return cssCreateMatches.join('\n');
 }
+function extractCssGlobal(code) {
+    const cssCreateMatches = [];
+    const regex = /\bcss\.global\(\s*([\s\S]*?)\s*\);/g;
+    let match;
+    while ((match = regex.exec(code))) {
+        if (isInComment(code, match.index) ||
+            isInString(code, match.index) ||
+            isInHtmlText(code, match.index)) {
+            continue;
+        }
+        cssCreateMatches.push(match[0]);
+    }
+    return cssCreateMatches.join('\n');
+}
 function parseCssPropsArguments(args) {
     const results = [];
     const splitArgs = args.split(/\s*,\s*(?![^(]*\))/);
@@ -187,7 +200,6 @@ async function extractVueAndSvelte(filePath) {
     if (!(ext === '.svelte' || ext === '.vue'))
         return filePath;
     const code = fs.readFileSync(filePath, 'utf8');
-    originalCodeMap.set(filePath, code);
     const lines = code.split(/\r?\n/);
     let inScript = false;
     const contentLines = [];
@@ -214,13 +226,17 @@ async function extractVueAndSvelte(filePath) {
     const importRegex = /^(\s*import\s[^;]+;\s*)+/m;
     const importMatch = tsCode.match(importRegex);
     const importSection = importMatch ? importMatch[0] : '';
-    const stylesSection = extractCssCreate(tsCode);
+    const cssCreateSection = extractCssCreate(code);
+    const cssGlobalSection = extractCssGlobal(code);
     let finalCode = '';
     if (importSection) {
         finalCode += importSection + '\n';
     }
-    if (stylesSection) {
-        finalCode += stylesSection + '\n';
+    if (cssGlobalSection) {
+        finalCode += cssGlobalSection + '\n';
+    }
+    if (cssCreateSection) {
+        finalCode += cssCreateSection + '\n';
     }
     if (calls) {
         finalCode += calls + '\n';
@@ -230,14 +246,14 @@ async function extractVueAndSvelte(filePath) {
     generatedTsMap.set(filePath, tsPath);
     return tsPath;
 }
-async function extractAndInjectStyleProps(filePath) {
-    const original = fs.readFileSync(filePath, 'utf8');
-    originalCodeMap.set(filePath, original);
+async function extractTSFile(filePath) {
+    const code = fs.readFileSync(filePath, 'utf8');
     const importRegex = /^(?:\s*import\s[^;]+;\s*)+/m;
-    const importMatch = original.match(importRegex);
+    const importMatch = code.match(importRegex);
     const importSection = importMatch ? importMatch[0] : '';
-    const cssCreateSection = extractCssCreate(original);
-    const propsMatches = extractCssProps(original);
+    const cssCreateSection = extractCssCreate(code);
+    const cssGlobalSection = extractCssGlobal(code);
+    const propsMatches = extractCssProps(code);
     const calls = propsMatches
         .filter(Boolean)
         .map((call) => `${call};`)
@@ -245,10 +261,16 @@ async function extractAndInjectStyleProps(filePath) {
     let finalCode = '';
     if (importSection)
         finalCode += importSection + '\n';
+    if (cssGlobalSection)
+        finalCode += cssGlobalSection + '\n';
     if (cssCreateSection)
         finalCode += cssCreateSection + '\n';
     finalCode += calls;
-    fs.writeFileSync(filePath, finalCode, 'utf8');
+    const ext = path.extname(filePath);
+    const tempFilePath = filePath.replace(ext, '-temp.ts');
+    fs.writeFileSync(tempFilePath, finalCode, 'utf8');
+    generatedTsMap.set(filePath, tempFilePath);
+    return tempFilePath;
 }
 async function restoreAllOriginals() {
     for (const [originalPath, genPath] of generatedTsMap.entries()) {
@@ -257,10 +279,6 @@ async function restoreAllOriginals() {
         }
     }
     generatedTsMap.clear();
-    for (const [filePath, backup] of originalCodeMap.entries()) {
-        fs.writeFileSync(filePath, backup, 'utf8');
-    }
-    originalCodeMap.clear();
 }
 process.on('uncaughtException', async (error) => {
     console.error('Uncaught Exception:', error);
@@ -273,8 +291,7 @@ process.on('unhandledRejection', async (reason, promise) => {
     process.exit(1);
 });
 module.exports = {
-    extractAndInjectStyleProps,
+    extractTSFile,
     restoreAllOriginals,
     extractVueAndSvelte,
-    originalCodeMap,
 };

package/dist/index.js

@@ -11,7 +11,7 @@ const { execute } = require('rscute/execute');
 const { transform } = require('lightningcss');
 const { parseSync } = require('@swc/core');
 const { buildGlobal, buildProps } = require('@plumeria/core/processors');
-const { extractAndInjectStyleProps, restoreAllOriginals, extractVueAndSvelte, } = require('./extract');
+const { extractTSFile, restoreAllOriginals, extractVueAndSvelte, } = require('./extract');
 const projectRoot = process.cwd().split('node_modules')[0];
 const directPath = path.join(projectRoot, 'node_modules/@plumeria/core');
 const coreFilePath = path.join(directPath, 'stylesheet.css');
@@ -107,27 +107,22 @@ async function optimizeCSS() {
     const projectName = path.basename(projectRoot);
     const filesSupportExtensions = [];
     for (const file of files) {
-        const tsFile = await extractVueAndSvelte(file);
-        filesSupportExtensions.push(tsFile);
+        const ext = path.extname(file);
+        if (ext === '.vue' || ext === '.svelte') {
+            const tsFile = await extractVueAndSvelte(file);
+            filesSupportExtensions.push(tsFile);
+        }
+        else {
+            const tempFile = await extractTSFile(file);
+            filesSupportExtensions.push(tempFile);
+        }
     }
     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;
-            }
-        }
+    const propsFiles = styleFiles.filter((file) => {
         return isCSS(file, 'props');
     });
-    for (let i = 0; i < cssPropsFiles.length; i++) {
-        await extractAndInjectStyleProps(path.resolve(cssPropsFiles[i]));
-    }
     for (let i = 0; i < styleFiles.length; i++) {
         await execute(path.resolve(styleFiles[i]));
         if (process.argv.includes('--paths'))
@@ -136,7 +131,7 @@ async function optimizeCSS() {
     for (let i = 0; i < styleFiles.length; i++) {
         await buildGlobal(coreFilePath);
     }
-    for (let i = 0; i < styleFiles.length; i++) {
+    for (let i = 0; i < propsFiles.length; i++) {
         await buildProps(coreFilePath);
     }
     await optimizeCSS();

package/package.json

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