forgecss 0.10.0 → 0.12.0

package/lib/usages.js

@@ -1,58 +1,27 @@
-import swc from "@swc/core";
-import { readFile, writeFile } from "fs/promises";
-import { fromHtml } from "hast-util-from-html";
-import { visit } from "unist-util-visit";
-
-const FUNC_NAME = 'fx';
 let USAGES = {};
 
-const { parse } = swc;
-
-export async function findUsages(filePath, fileContent = null) {
+export async function findUsages(filePath, content, JSXParser) {
   try {
     if (USAGES[filePath]) {
       // already processed
       return;
     }
     USAGES[filePath] = [];
-    const content = fileContent ? fileContent : await readFile(filePath, "utf-8");
-    const extension = filePath.split('.').pop().toLowerCase();
+    const extension = filePath.split(".").pop().toLowerCase();
 
     // HTML
     if (extension === "html") {
-      const ast = fromHtml(content);
-      visit(ast, "element", (node) => {
-        if (node.properties.className) {
-          USAGES[filePath].push(node.properties.className.join(" "));
-        }
+      extractClassNamesFromHTML(content).forEach((cls) => {
+        USAGES[filePath].push(cls);
       });
       return;
     }
-
-    // JSX/TSX
-    const ast = await parse(content, {
-      syntax: "typescript",
-      tsx: true,
-      decorators: false
-    });
-    // writeFile(process.cwd() + '/ast.json', JSON.stringify(ast, null, 2), 'utf-8').catch(() => {});
-    traverseASTNode(ast, {
-      JSXExpressionContainer(node) {
-        if (node?.expression?.callee?.value === FUNC_NAME && node?.expression?.arguments) {
-          if (node?.expression?.arguments[0]) {
-            const arg = node.expression.arguments[0];
-            let value = arg?.expression.value;
-            if (arg.expression.type === "TemplateLiteral") {
-              let quasis = arg.expression.quasis.map((elem) => elem?.cooked || "");
-              value = quasis.join("");
-            }
-            USAGES[filePath].push(value);
-          }
-        }
-      }
-    });
+    if (JSXParser && (extension === "jsx" || extension === "tsx")) {
+      await JSXParser(content, USAGES, filePath);
+      return;
+    }
   } catch (err) {
-    console.error(`forgecss: error processing file ${filePath.replace(process.cwd(), '')}`, err);
+    console.error(`forgecss: error processing file ${filePath.replace(process.cwd(), "")}`, err);
   }
 }
 export function invalidateUsageCache(filePath) {
@@ -67,39 +36,15 @@ export function invalidateUsageCache(filePath) {
 export function getUsages() {
   return USAGES;
 }
-function traverseASTNode(node, visitors, stack = []) {
-  if (!node || typeof node.type !== "string") {
-    return;
-  }
 
-  const visitor = visitors[node.type];
-  if (visitor) {
-    visitor(node, stack);
-  }
-
-  for (const key in node) {
-    if (!node.hasOwnProperty(key)) continue;
-
-    const child = node[key];
+function extractClassNamesFromHTML(html) {
+  const result = [];
+  const classAttrRE = /\bclass\s*=\s*(["'])(.*?)\1/gis;
 
-    if (Array.isArray(child)) {
-      child.forEach((c) => {
-        if (c) {
-          if (typeof c.type === "string") {
-            traverseASTNode(c, visitors, [node].concat(stack));
-          } else if (c?.expression && typeof c.expression.type === "string") {
-            traverseASTNode(c.expression, visitors, [node].concat(stack));
-          } else if (c?.callee && typeof c.callee.type === "string") {
-            traverseASTNode(c.callee, visitors, [node].concat(stack));
-          } else if (c?.left && typeof c.left.type === "string") {
-            traverseASTNode(c.left, visitors, [node].concat(stack));
-          } else if (c?.right && typeof c.right.type === "string") {
-            traverseASTNode(c.right, visitors, [node].concat(stack));
-          }
-        }
-      });
-    } else if (child && typeof child.type === "string") {
-      traverseASTNode(child, visitors, [node].concat(stack));
-    }
+  let match;
+  while ((match = classAttrRE.exec(html))) {
+    result.push(match[2].trim());
   }
+
+  return result;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "forgecss",
-  "version": "0.10.0",
+  "version": "0.12.0",
   "type": "module",
   "description": "ForgeCSS turns strings into fully generated responsive CSS using a custom DSL.",
   "author": "Krasimir Tsonev",
@@ -27,15 +27,13 @@
     "@swc/core": "1.12.1",
     "chokidar": "^4.0.3",
     "commander": "^14.0.2",
-    "hast-util-from-html": "^2.0.3",
     "postcss": "^8.5.6",
-    "postcss-safe-parser": "^7.0.1",
-    "unist-util-visit": "^5.0.0"
+    "postcss-safe-parser": "^7.0.1"
   },
   "devDependencies": {
     "esbuild": "^0.27.1"
   },
   "bin": {
-    "forgecss": "./cli.js"
+    "forgecss": "./index.cli.js"
   }
 }

package/scripts/build.js

@@ -1,17 +1,14 @@
 import path from "path";
 import esbuild from "esbuild";
 import { fileURLToPath } from "url";
-import { readFileSync } from "fs";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
-
-const pkg = JSON.parse(readFileSync(path.join(__dirname, "..", "package.json"), "utf8"));
 const minify = true;
 
 (async function () {
   await esbuild.build({
-    entryPoints: [path.join(__dirname, "..", "standalone", "client.js")],
+    entryPoints: [path.join(__dirname, "..", "index.fx.js")],
     bundle: true,
     minify,
     outfile: path.join(__dirname, "..", "dist", "client.min.js"),
@@ -20,10 +17,10 @@ const minify = true;
     plugins: []
   });
   await esbuild.build({
-    entryPoints: [path.join(__dirname, "..", "standalone", "forgecss.js")],
+    entryPoints: [path.join(__dirname, "..", "index.browser.js")],
     bundle: true,
     minify,
-    outfile: path.join(__dirname, "..", "dist", "forgecss.min.js"),
+    outfile: path.join(__dirname, "..", "dist", "standalone.min.js"),
     platform: "browser",
     sourcemap: false,
     plugins: []