@plumeria/compiler 0.25.2 → 0.25.3

package/dist/extract.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generatedTsMap = void 0;
 exports.extractTSFile = extractTSFile;
-exports.restoreAllOriginals = restoreAllOriginals;
 exports.extractVueAndSvelte = extractVueAndSvelte;
 const core_1 = require("@swc/core");
 const promises_1 = require("fs/promises");
@@ -159,8 +158,11 @@ function expressionToString(expr) {
     console.warn(`css.props: Argument unsupported ${expr.type}: Use css.create instead.`);
     return '';
 }
-async function extractCssProps(ast) {
+async function extractCssProps(ast, code) {
     const propsMatches = [];
+    if (code && !code.includes('css.props')) {
+        return propsMatches;
+    }
     try {
         await visit(ast, {
             CallExpression: async (node) => {
@@ -350,7 +352,10 @@ async function extractImportDeclarations(ast) {
     }
     return importDeclarations.join('\n');
 }
-async function extractCssMethod(ast, methodName) {
+async function extractCssMethod(ast, methodName, code) {
+    if (!code.includes(`css.${methodName}`)) {
+        return '';
+    }
     const matches = [];
     try {
         for (const node of ast.body) {
@@ -410,7 +415,7 @@ async function extractVueAndSvelte(filePath) {
         syntax: 'typescript',
         tsx: true,
     });
-    const propsFromScript = await extractCssProps(ast);
+    const propsFromScript = await extractCssProps(ast, code);
     const propsFromTemplate = extractCssPropsFromTemplate(code);
     const propsMatches = [...new Set([...propsFromScript, ...propsFromTemplate])];
     const calls = propsMatches
@@ -419,11 +424,11 @@ async function extractVueAndSvelte(filePath) {
         .join('\n');
     const importSection = await extractImportDeclarations(ast);
     const staticVariableSection = await extractStaticStringLiteralVariable(ast);
-    const cssCreateSection = await extractCssMethod(ast, 'create');
-    const cssKeyframesSection = await extractCssMethod(ast, 'keyframes');
-    const cssViewTransitionSection = await extractCssMethod(ast, 'viewTransition');
-    const cssDefineConstsSection = await extractCssMethod(ast, 'defineConsts');
-    const cssDefineTokensSection = await extractCssMethod(ast, 'defineTokens');
+    const cssCreateSection = await extractCssMethod(ast, 'create', code);
+    const cssKeyframesSection = await extractCssMethod(ast, 'keyframes', code);
+    const cssViewTransitionSection = await extractCssMethod(ast, 'viewTransition', code);
+    const cssDefineConstsSection = await extractCssMethod(ast, 'defineConsts', code);
+    const cssDefineTokensSection = await extractCssMethod(ast, 'defineTokens', code);
     let finalCode = '';
     if (importSection)
         finalCode += importSection + '\n';
@@ -442,7 +447,7 @@ async function extractVueAndSvelte(filePath) {
     if (calls)
         finalCode += calls + '\n';
     generatedTsMap.set(filePath, finalCode);
-    return tsPath;
+    return filePath;
 }
 async function extractTSFile(filePath) {
     const code = await (0, promises_1.readFile)(filePath, 'utf8');
@@ -452,12 +457,12 @@ async function extractTSFile(filePath) {
     });
     const importSection = await extractImportDeclarations(ast);
     const staticVariableSection = await extractStaticStringLiteralVariable(ast);
-    const cssCreateSection = await extractCssMethod(ast, 'create');
-    const cssKeyframesSection = await extractCssMethod(ast, 'keyframes');
-    const cssViewTransitionSection = await extractCssMethod(ast, 'viewTransition');
-    const cssDefineConstsSection = await extractCssMethod(ast, 'defineConsts');
-    const cssDefineTokensSection = await extractCssMethod(ast, 'defineTokens');
-    const propsMatches = await extractCssProps(ast);
+    const cssCreateSection = await extractCssMethod(ast, 'create', code);
+    const cssKeyframesSection = await extractCssMethod(ast, 'keyframes', code);
+    const cssViewTransitionSection = await extractCssMethod(ast, 'viewTransition', code);
+    const cssDefineConstsSection = await extractCssMethod(ast, 'defineConsts', code);
+    const cssDefineTokensSection = await extractCssMethod(ast, 'defineTokens', code);
+    const propsMatches = await extractCssProps(ast, code);
     const calls = propsMatches
         .filter(Boolean)
         .map((call) => `${call};`)
@@ -478,20 +483,16 @@ async function extractTSFile(filePath) {
     if (cssCreateSection)
         finalCode += cssCreateSection + '\n';
     finalCode += calls;
-    const tempFilePath = filePath.replace(path_1.default.extname(filePath), '-temp.ts');
     generatedTsMap.set(filePath, finalCode);
-    return tempFilePath;
-}
-async function restoreAllOriginals() {
-    generatedTsMap.clear();
+    return filePath;
 }
 process.on('uncaughtException', async (error) => {
     console.error('Uncaught Exception:', error);
-    await restoreAllOriginals();
+    generatedTsMap.clear();
     process.exit(1);
 });
 process.on('unhandledRejection', async (reason, promise) => {
     console.error('Unhandled Rejection at:', promise, 'reason:', reason);
-    await restoreAllOriginals();
+    generatedTsMap.clear();
     process.exit(1);
 });

package/dist/index.js

@@ -198,43 +198,37 @@ async function main() {
             files.push(entry);
         }
         const projectName = path_1.default.basename(projectRoot);
-        const tempToOriginalMap = new Map();
         const filesSupportExtensions = await Promise.all(files.map(async (file) => {
             const ext = path_1.default.extname(file);
-            let tempFile;
             if (ext === '.vue' || ext === '.svelte') {
-                tempFile = await (0, extract_1.extractVueAndSvelte)(file);
+                return await (0, extract_1.extractVueAndSvelte)(file);
             }
             else {
-                tempFile = await (0, extract_1.extractTSFile)(file);
+                return await (0, extract_1.extractTSFile)(file);
             }
-            tempToOriginalMap.set(tempFile, file);
-            return tempFile;
         }));
         const styleFiles = await Promise.all(filesSupportExtensions.map(async (file) => {
-            const originalFile = tempToOriginalMap.get(file);
-            const code = extract_1.generatedTsMap.get(originalFile);
+            const code = extract_1.generatedTsMap.get(file);
             const isCssFile = code ? await isCSS(code, file) : false;
             return isCssFile ? file : null;
         }))
             .then((results) => results.filter(Boolean))
             .then((results) => results.sort());
         for (const file of styleFiles) {
-            const originalFile = tempToOriginalMap.get(file);
-            const code = extract_1.generatedTsMap.get(originalFile);
+            const code = extract_1.generatedTsMap.get(file);
             if (code) {
-                await (0, promises_1.writeFile)(file, code, 'utf8');
-                await (0, execute_1.execute)(path_1.default.resolve(file));
+                const ext = path_1.default.extname(file);
+                const tsPath = ext === '.vue' || ext === '.svelte' ? file.replace(ext, '.ts') : file;
+                await (0, execute_1.executeCode)(code, { filePath: tsPath });
                 if (process.argv.includes('--paths')) {
-                    console.log(`✅: ${projectName}/${path_1.default.relative(projectRoot, originalFile)}`);
+                    console.log(`✅: ${projectName}/${path_1.default.relative(projectRoot, file)}`);
                 }
-                await (0, promises_1.unlink)(file);
             }
         }
         await (0, processors_1.buildGlobal)(coreFilePath);
         await (0, processors_1.buildProps)(coreFilePath);
         await optimizeCSS();
-        await (0, extract_1.restoreAllOriginals)();
+        extract_1.generatedTsMap.clear();
         if (process.argv.includes('--stats')) {
             const endTime = performance.now();
             const buildTime = (endTime - startTime) / 1000;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/compiler",
-  "version": "0.25.2",
+  "version": "0.25.3",
   "description": "Plumeria Rust-based compiler",
   "repository": {
     "type": "git",
@@ -16,12 +16,12 @@
     "css": "./bin/css.js"
   },
   "dependencies": {
-    "@swc/core": "1.15.0",
+    "@swc/core": "1.15.1",
     "find-up": "^8.0.0",
     "lightningcss": "^1.30.2",
     "postcss": "^8.5.6",
     "postcss-combine-media-query": "^2.1.0",
-    "rscute": "^1.0.2"
+    "rscute": "^1.1.1"
   },
   "publishConfig": {
     "access": "public"