@plumeria/compiler 0.8.2 → 0.8.4

package/bin/css.mjs

@@ -5,17 +5,6 @@ import path from 'path';
 import { execSync } from 'child_process';
 import { styleText } from 'util';
 
-function findPnpmPath(arg1, arg2) {
-  const pnpmPath = path.join(process.cwd(), 'node_modules/.pnpm');
-  const pnpmDir = fs.readdirSync(pnpmPath).find((dir) => dir.startsWith(arg1));
-
-  if (!pnpmDir) {
-    throw new Error(`Could not find ${arg1} package in pnpm directory`);
-  }
-
-  return path.join(pnpmPath, pnpmDir, arg2);
-}
-
 try {
   const checkMark = styleText('greenBright', '✓');
   const isPnpm = fs.existsSync(path.join(process.cwd(), 'node_modules/.pnpm'));
@@ -32,11 +21,14 @@ try {
     : path.join(process.cwd(), 'node_modules/@plumeria');
 
   const rscutePath = isPnpm
-    ? findPnpmPath('rscute@', 'node_modules/rscute/dist/jit.js')
-    : path.join(process.cwd(), 'node_modules/rscute/dist/jit.js');
+    ? findPnpmPath('rscute@', 'node_modules/rscute/dist/execute.js')
+    : path.join(process.cwd(), 'node_modules/rscute/dist/execute.js');
+
+  const a1 = process.argv.includes('--view') ? '--view' : '';
+  const a2 = process.argv.includes('--paths') ? '--paths' : '';
+  const argv = [a1, a2].join(' ');
 
-  const argv = process.argv.includes('--log') ? ' --log' : '';
-  execSync(`node ${rscutePath} compiler/dist/index.js` + argv, {
+  execSync(`node ${rscutePath} compiler/dist/index.js ` + argv, {
     stdio: 'inherit',
     cwd: plumeriaPath,
   });
@@ -47,3 +39,14 @@ try {
   console.error('Compilation failed:', error.message);
   process.exit(1);
 }
+
+function findPnpmPath(arg1, arg2) {
+  const pnpmPath = path.join(process.cwd(), 'node_modules/.pnpm');
+  const pnpmDir = fs.readdirSync(pnpmPath).find((dir) => dir.startsWith(arg1));
+
+  if (!pnpmDir) {
+    throw new Error(`Could not find ${arg1} package in pnpm directory`);
+  }
+
+  return path.join(pnpmPath, pnpmDir, arg2);
+}

package/dist/index.js

@@ -1,17 +1,49 @@
 import * as path from 'path';
 import * as fs from 'fs';
-import ts from 'typescript';
 import fg from 'fast-glob';
+import postcss from 'postcss';
+import combineSelectors from 'postcss-combine-duplicated-selectors';
+import { transform } from 'lightningcss';
+import { parseSync } from '@swc/core';
+import { execute } from 'rscute';
 import { buildGlobal, buildCreate } from '@plumeria/core/build-helper';
-import { JIT } from 'rscute';
+function isCSS(filePath) {
+    const code = fs.readFileSync(filePath, 'utf8');
+    const ast = parseSync(code, {
+        syntax: 'typescript',
+        tsx: filePath.endsWith('.tsx'),
+        decorators: false,
+        dynamicImport: true,
+    });
+    let found = false;
+    function visit(node) {
+        if (node.type === 'MemberExpression' && node.property?.value) {
+            if (node.object?.type === 'Identifier' && node.object.value === 'css') {
+                if (node.property.value === 'create' ||
+                    node.property.value === 'global') {
+                    found = true;
+                }
+            }
+        }
+        for (const key in node) {
+            const value = node[key];
+            if (value && typeof value === 'object') {
+                if (Array.isArray(value)) {
+                    value.forEach(visit);
+                }
+                else {
+                    visit(value);
+                }
+            }
+        }
+    }
+    visit(ast);
+    return found;
+}
 const projectRoot = process.cwd().split('node_modules')[0];
 const directPath = path.join(projectRoot, 'node_modules/@plumeria/core');
 const coreFilePath = path.join(directPath, 'stylesheet/core.css');
 const cleanUp = async () => {
-    if (process.env.CI && fs.existsSync(coreFilePath)) {
-        fs.unlinkSync(coreFilePath);
-        console.log('File deleted successfully');
-    }
     try {
         fs.writeFileSync(coreFilePath, '', 'utf-8');
     }
@@ -19,18 +51,26 @@ const cleanUp = async () => {
         console.error('An error occurred:', err);
     }
 };
-function isCSS(filePath) {
-    const content = fs.readFileSync(filePath, 'utf8');
-    const sourceFile = ts.createSourceFile(filePath, content, ts.ScriptTarget.Latest, true);
-    const checker = (node) => {
-        if (ts.isPropertyAccessExpression(node) && ts.isIdentifier(node.name)) {
-            const expressionText = node.expression.getText(sourceFile);
-            const methodName = node.name.getText(sourceFile);
-            return (expressionText === 'css' && ['create', 'global'].includes(methodName));
-        }
-        return ts.forEachChild(node, checker) || false;
-    };
-    return checker(sourceFile);
+async function optimizeCSS() {
+    const code = fs.readFileSync(coreFilePath, 'utf8');
+    const mergedResult = postcss([
+        combineSelectors({ removeDuplicatedProperties: true }),
+    ]).process(code, {
+        from: coreFilePath,
+        to: coreFilePath,
+    });
+    const prefixResult = transform({
+        filename: coreFilePath,
+        code: Buffer.from(mergedResult.css),
+        minify: true,
+        targets: {
+            safari: 16,
+            edge: 110,
+            firefox: 110,
+            chrome: 110,
+        },
+    });
+    fs.writeFileSync(coreFilePath, prefixResult.code);
 }
 async function getAppRoot() {
     const threeLevelsUp = path.join(process.cwd(), '../../../../..');
@@ -46,7 +86,9 @@ async function getAppRoot() {
     });
     const styleFiles = files.filter(isCSS);
     for (let i = 0; i < styleFiles.length; i++) {
-        await JIT(path.resolve(styleFiles[i]));
+        await execute(path.resolve(styleFiles[i]));
+        if (process.argv.includes('--paths'))
+            console.log(styleFiles[i]);
     }
     for (let i = 0; i < styleFiles.length; i++) {
         await buildGlobal(coreFilePath);
@@ -54,4 +96,5 @@ async function getAppRoot() {
     for (let i = 0; i < styleFiles.length; i++) {
         await buildCreate(coreFilePath);
     }
+    await optimizeCSS();
 })();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/compiler",
-  "version": "0.8.2",
+  "version": "0.8.4",
   "description": "A faster compiler for Plumeria",
   "keywords": [
     "css",
@@ -22,8 +22,12 @@
     "build": "rimraf dist && tsc"
   },
   "dependencies": {
-    "fast-glob": "3.3.3",
-    "rscute": "0.1.3"
+    "@swc/core": "^1.11.22",
+    "fast-glob": "^3.3.3",
+    "lightningcss": "^1.29.3",
+    "postcss": "^8.5.3",
+    "postcss-combine-duplicated-selectors": "^10.0.3",
+    "rscute": "^0.2.1"
   },
   "publishConfig": {
     "access": "public"