emily-css 1.0.17 → 1.0.19

package/src/watch.js

@@ -1,9 +1,16 @@
-const fs = require('fs');
-const path = require('path');
-const chokidar = require('chokidar');
-const chalk = require('chalk');
-const { buildFullFramework, buildProductionCss, ensureFullFramework } = require('./index.js');
-const { getAllFiles, extractClassNames } = require('./purge.js');
+const fs = require("fs");
+const path = require("path");
+const chokidar = require("chokidar");
+const chalk = require("chalk");
+const fg = require("fast-glob");
+
+const {
+  buildFullFramework,
+  buildProductionCss,
+  ensureFullFramework,
+} = require("./index.js");
+
+const { extractClassNames } = require("./purge.js");
 
 let isRunning = false;
 let pendingRun = false;
@@ -11,31 +18,35 @@ let previousClasses = new Set();
 let hasRunOnce = false;
 
 function readConfig() {
-  const configPath = path.join(process.cwd(), 'emily.config.json');
+  const configPath = path.join(process.cwd(), "emily.config.json");
 
   if (!fs.existsSync(configPath)) {
     console.error('\n  emily-css: No config found. Run "emily-css init" first.\n');
     process.exit(1);
   }
 
-  return JSON.parse(fs.readFileSync(configPath, 'utf8'));
+  return JSON.parse(fs.readFileSync(configPath, "utf8"));
+}
+
+function normalisePath(filePath) {
+  return filePath.replace(/\\/g, "/");
 }
 
 function shouldIgnore(filePath) {
-  const normalised = filePath.replace(/\\/g, '/');
+  const normalised = normalisePath(filePath);
 
   return [
-    'node_modules/',
-    '.git/',
-    '.nuxt/',
-    '.next/',
-    '.output/',
-    'dist/',
-    'build/',
-    'coverage/',
-    '.cache/',
-    '.vite/'
-  ].some(part => normalised.includes('/' + part) || normalised.startsWith(part));
+    "node_modules/",
+    ".git/",
+    ".nuxt/",
+    ".next/",
+    ".output/",
+    "dist/",
+    "build/",
+    "coverage/",
+    ".cache/",
+    ".vite/",
+  ].some((part) => normalised.includes("/" + part) || normalised.startsWith(part));
 }
 
 function runQuietly(fn) {
@@ -53,16 +64,58 @@ function runQuietly(fn) {
   }
 }
 
-function collectUsedClasses(sourceDir, config) {
-  const files = getAllFiles(sourceDir, config.purge?.extensions);
+function getScanFiles(config) {
+  const sourceGlobs = config.purge?.sourceGlobs;
+
+  if (sourceGlobs && sourceGlobs.length) {
+    return fg.sync(sourceGlobs, {
+      ignore: config.purge?.ignore || [],
+      onlyFiles: true,
+      unique: true,
+    });
+  }
+
+  const sourceDir = config.purge?.sourceDir || ".";
+  const extensions = config.purge?.extensions || [
+    ".html",
+    ".htm",
+    ".twig",
+    ".njk",
+    ".liquid",
+    ".hbs",
+    ".jsx",
+    ".tsx",
+    ".vue",
+    ".php",
+    ".astro",
+    ".svelte",
+    ".blade.php",
+    ".jinja",
+    ".jinja2",
+    ".j2",
+    ".md",
+  ];
+
+  return fg.sync(
+    extensions.map((ext) => `${sourceDir.replace(/\/$/, "")}/**/*${ext}`),
+    {
+      ignore: config.purge?.ignore || [],
+      onlyFiles: true,
+      unique: true,
+    },
+  );
+}
+
+function collectUsedClasses(config) {
+  const files = getScanFiles(config);
   const usedClasses = new Set();
 
   for (const file of files) {
     if (shouldIgnore(file)) continue;
 
     try {
-      const content = fs.readFileSync(file, 'utf8');
-      extractClassNames(content).forEach(cls => usedClasses.add(cls));
+      const content = fs.readFileSync(file, "utf8");
+      extractClassNames(content).forEach((cls) => usedClasses.add(cls));
     } catch {}
   }
 
@@ -70,8 +123,8 @@ function collectUsedClasses(sourceDir, config) {
 }
 
 function getClassDiff(currentClasses) {
-  const added = [...currentClasses].filter(cls => !previousClasses.has(cls));
-  const removed = [...previousClasses].filter(cls => !currentClasses.has(cls));
+  const added = [...currentClasses].filter((cls) => !previousClasses.has(cls));
+  const removed = [...previousClasses].filter((cls) => !currentClasses.has(cls));
 
   previousClasses = new Set(currentClasses);
 
@@ -79,32 +132,63 @@ function getClassDiff(currentClasses) {
 }
 
 function formatClassList(classes) {
-  if (classes.length === 0) return '';
+  if (classes.length === 0) return "";
 
-  const shown = classes.slice(0, 8).join(', ');
-  const extra = classes.length > 8 ? ' +' + (classes.length - 8) + ' more' : '';
+  const shown = classes.slice(0, 8).join(", ");
+  const extra = classes.length > 8 ? " +" + (classes.length - 8) + " more" : "";
 
   return shown + extra;
 }
 
 function printSummary({ currentClasses, result, added, removed }) {
-  const reduction = (((result.originalSize - result.outputSize) / result.originalSize) * 100).toFixed(1);
+  const reduction = (
+    ((result.originalSize - result.outputSize) / result.originalSize) *
+    100
+  ).toFixed(1);
+
   const sizeKb = (result.outputSize / 1024).toFixed(1);
+  const outputPath = result.outputPath
+    ? path.relative(process.cwd(), result.outputPath)
+    : "emily.min.css";
+
   const time = new Date().toLocaleTimeString();
 
   console.log(
-    chalk.green('✓ ' + time + ' updated') +
-    chalk.gray(' | ' + currentClasses.size + ' classes | ' + sizeKb + ' KB | ' + reduction + '% reduced')
+    chalk.green("✓ " + time + " updated") +
+      chalk.gray(
+        " | " +
+          currentClasses.size +
+          " classes | " +
+          sizeKb +
+          " KB | " +
+          reduction +
+          "% reduced | " +
+          outputPath,
+      ),
   );
 
   if (!hasRunOnce) return;
 
   if (removed.length > 0) {
-    console.log(chalk.red('− removed ' + removed.length + ' class' + (removed.length === 1 ? '' : 'es')) + chalk.gray(' (' + formatClassList(removed) + ')'));
+    console.log(
+      chalk.red(
+        "− removed " +
+          removed.length +
+          " class" +
+          (removed.length === 1 ? "" : "es"),
+      ) + chalk.gray(" (" + formatClassList(removed) + ")"),
+    );
   }
 
   if (added.length > 0) {
-    console.log(chalk.green('+ added ' + added.length + ' class' + (added.length === 1 ? '' : 'es')) + chalk.gray(' (' + formatClassList(added) + ')'));
+    console.log(
+      chalk.green(
+        "+ added " +
+          added.length +
+          " class" +
+          (added.length === 1 ? "" : "es"),
+      ) + chalk.gray(" (" + formatClassList(added) + ")"),
+    );
   }
 }
 
@@ -118,25 +202,24 @@ function runProductionUpdate(filePath) {
 
   try {
     const config = readConfig();
-    const sourceDir = config.purge?.sourceDir || '.';
-    const isConfigChange = filePath && filePath.replace(/\\/g, '/').endsWith('emily.config.json');
-    const cssPath = path.join(process.cwd(), 'dist/emily.css');
+    const normalisedFilePath = filePath ? normalisePath(filePath) : "";
+    const isConfigChange = normalisedFilePath.endsWith("emily.config.json");
 
- if (isConfigChange) {
-  runQuietly(() => buildFullFramework());
-} else {
-  runQuietly(() => ensureFullFramework());
-}
+    if (isConfigChange) {
+      runQuietly(() => buildFullFramework());
+    } else {
+      runQuietly(() => ensureFullFramework());
+    }
 
     const result = runQuietly(() => buildProductionCss());
-    const currentClasses = collectUsedClasses(sourceDir, config);
+    const currentClasses = collectUsedClasses(config);
     const { added, removed } = getClassDiff(currentClasses);
 
     printSummary({ currentClasses, result, added, removed });
 
     hasRunOnce = true;
   } catch (error) {
-    console.error('\n❌ EmilyUI watch failed');
+    console.error("\n❌ EmilyUI watch failed");
     console.error(error.message);
   } finally {
     isRunning = false;
@@ -150,8 +233,8 @@ function runProductionUpdate(filePath) {
 
 function getWatchPaths(config) {
   return [
-    config.purge?.sourceDir || '.',
-    'emily.config.json'
+    config.purge?.sourceDir || ".",
+    "emily.config.json",
   ];
 }
 
@@ -164,9 +247,14 @@ function runWatch() {
   const config = readConfig();
   const watchPaths = getWatchPaths(config);
 
-  console.log('\n👀 EmilyUI is watching...');
-  console.log(chalk.gray('   Watching:'));
-  watchPaths.forEach(item => console.log(chalk.gray('   - ' + item)));
+  console.log("\n👀 EmilyUI is watching...");
+console.log(chalk.gray("   Project: " + (config.purge?.projectType || "Unknown")));
+console.log(chalk.gray("   Output:  " + (config.output?.css || "dist/emily.min.css")));
+console.log(chalk.gray("   Watching:"));
+
+watchPaths.forEach((item) => {
+  console.log(chalk.gray("   - " + item));
+});
 
   runQuietly(() => ensureFullFramework());
   runProductionUpdate();
@@ -176,18 +264,18 @@ function runWatch() {
     ignoreInitial: true,
     awaitWriteFinish: {
       stabilityThreshold: 500,
-      pollInterval: 100
-    }
+      pollInterval: 100,
+    },
   });
 
-  watcher.on('change', queueUpdate);
-  watcher.on('add', queueUpdate);
-  watcher.on('unlink', queueUpdate);
+  watcher.on("change", queueUpdate);
+  watcher.on("add", queueUpdate);
+  watcher.on("unlink", queueUpdate);
 
-  watcher.on('error', error => {
-    console.error('\n❌ EmilyUI watcher error');
+  watcher.on("error", (error) => {
+    console.error("\n❌ EmilyUI watcher error");
     console.error(error.message);
   });
 }
 
-runWatch();
+runWatch();

package/src/purge-cmd.js

@@ -1,55 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-
-function runPurge() {
-  const configPath = path.join(process.cwd(), 'emily.config.json');
-
-  if (!fs.existsSync(configPath)) {
-    console.error('\n  emily-css: No config found. Run "emily-css init" first.\n');
-    process.exit(1);
-  }
-
-  const config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
-  const sourceDir = config.purge && config.purge.sourceDir;
-
-  if (!sourceDir) {
-    console.error('\n  emily-css: No purge sourceDir in emily.config.json.');
-    console.error('  Add: "purge": { "sourceDir": "./src" }\n');
-    process.exit(1);
-  }
-
-  const cssPath = path.join(process.cwd(), 'dist/emily.css');
-
-  if (!fs.existsSync(cssPath)) {
-    console.error('\n  emily-css: No CSS found. Run "emily-css build" first.\n');
-    process.exit(1);
-  }
-
-  const { purgeCSS } = require('./purge.js');
-
-  console.log('\nPurging unused utilities from ' + sourceDir + '...');
-
-  const css = fs.readFileSync(cssPath, 'utf8');
-  const purged = purgeCSS(css, sourceDir, config);
-  const minified = purged
-    .replace(/\/\*[\s\S]*?\*\//g, '')
-    .replace(/\s+/g, ' ')
-    .replace(/\s?\{/g, '{')
-    .replace(/\s?\}/g, '}')
-    .replace(/;\s/g, ';')
-    .trim();
-
-  fs.writeFileSync(path.join(process.cwd(), 'dist/emily.purged.css'), purged);
-  fs.writeFileSync(path.join(process.cwd(), 'dist/emily.purged.min.css'), minified);
-
-  const original = Buffer.byteLength(css, 'utf8');
-  const purgedSize = Buffer.byteLength(purged, 'utf8');
-  const reduction = Math.round((1 - purgedSize / original) * 100);
-
-  console.log('\n\u2713 Purged CSS written:');
-  console.log('  dist/emily.purged.css');
-  console.log('  dist/emily.purged.min.css');
-  console.log('\n  ' + Math.round(original / 1024) + 'KB -> ' + Math.round(purgedSize / 1024) + 'KB (' + reduction + '% reduction)\n');
-}
-
-runPurge();