domflax 0.1.2 → 0.1.4

package/dist/cli.js

@@ -1,23 +1,18 @@
 #!/usr/bin/env node
 import {
-  builtinPatterns,
-  createCssResolver,
-  createJsxBackend,
-  createJsxFrontend,
-  createTailwindResolver
-} from "./chunk-DNHOGPYV.js";
-import {
-  buildSelectorIndex,
-  createSyntheticSink,
-  normalizer,
-  runPasses,
-  syncClassesFromComputed
-} from "./chunk-DWLB7FRR.js";
+  createTransform,
+  destinationFor,
+  isGitClean,
+  planWrites
+} from "./chunk-EVENAJYI.js";
+import "./chunk-3Z5ZWLXX.js";
+import "./chunk-H5KTGI3A.js";
 import {
   __commonJS,
+  __dirname,
   __toESM,
   init_esm_shims
-} from "./chunk-6WVVF6AD.js";
+} from "./chunk-U5GOONKV.js";
 
 // ../../node_modules/sisteransi/src/index.js
 var require_src = __commonJS({
@@ -172,6 +167,14 @@ function toSafety(raw) {
   if (n === 0 || n === 1 || n === 2 || n === 3) return n;
   throw new Error(`domflax: invalid --safety "${raw}" (expected 0, 1, 2 or 3)`);
 }
+function toPositiveInt(raw, flag) {
+  if (raw === void 0) return null;
+  const n = Number(raw);
+  if (!Number.isInteger(n) || n < 1) {
+    throw new Error(`domflax: invalid ${flag} "${raw}" (expected a positive integer)`);
+  }
+  return n;
+}
 function parseInvocation(argv) {
   const { values, positionals } = parseArgs({
     args: argv,
@@ -187,7 +190,9 @@ function parseInvocation(argv) {
       "no-interactive": { type: "boolean", default: false },
       yes: { type: "boolean", short: "y", default: false },
       safety: { type: "string" },
-      "project-root": { type: "string" }
+      "project-root": { type: "string" },
+      "max-memory": { type: "string" },
+      concurrency: { type: "string" }
     }
   });
   const provider = values.provider ?? DEFAULT_PROVIDER;
@@ -206,7 +211,9 @@ function parseInvocation(argv) {
     interactive: values["no-interactive"] !== true && values.yes !== true,
     passes: null,
     safety: toSafety(values.safety),
-    projectRoot: values["project-root"] ?? null
+    projectRoot: values["project-root"] ?? null,
+    maxMemory: toPositiveInt(values["max-memory"], "--max-memory"),
+    concurrency: toPositiveInt(values.concurrency, "--concurrency")
   };
 }
 function shouldPrompt(options, isTty) {
@@ -230,218 +237,219 @@ var USAGE = [
   "  --dangerously-overwrite-source overwrite source in place (needs a clean git tree)",
   "  --no-git-check                 skip the clean-git-tree gate",
   "  --safety <0|1|2|3>             optimization aggressiveness (default: 2)",
+  "  --max-memory <MB>              memory budget; caps pool RAM AND parallelism (default: ~70% free RAM)",
+  "  --concurrency <N>              max parallel workers (still clamped by --max-memory)",
   "  --yes, --no-interactive        never launch the wizard (CI-safe)",
   "",
+  "Many files are processed across CPU cores by a memory-bounded worker pool; small jobs run inline.",
   "With no paths in an interactive terminal, a guided wizard launches."
 ].join("\n");
 
-// ../cli/src/safety.ts
+// ../cli/src/pool.ts
 init_esm_shims();
-import { execFileSync } from "child_process";
+import { existsSync } from "fs";
+import * as os from "os";
 import * as path from "path";
-var DISPOSABLE_DIRS = /* @__PURE__ */ new Set(["dist", "build", "out", ".next"]);
-function isDisposablePath(file) {
-  return path.resolve(file).split(path.sep).some((seg) => DISPOSABLE_DIRS.has(seg));
+import { fileURLToPath } from "url";
+import { Worker } from "worker_threads";
+var PER_WORKER_MB = 160;
+var MIN_OLD_GEN_MB = 64;
+function emptyTotals() {
+  return { files: 0, changed: 0, nodesRemoved: 0, classesSaved: 0, bytesSaved: 0 };
 }
-function isGitClean(cwd) {
-  try {
-    const out = execFileSync("git", ["status", "--porcelain"], {
-      cwd,
-      encoding: "utf8",
-      stdio: ["ignore", "pipe", "ignore"]
-    });
-    return out.trim().length === 0;
-  } catch {
-    return false;
-  }
-}
-function planWrites(options, gitClean) {
-  if (options.dangerouslyOverwriteSource) {
-    if (!options.noGitCheck && !gitClean) {
-      return {
-        ok: false,
-        error: "refusing --dangerously-overwrite-source: git working tree is not clean. Commit or stash first, or pass --no-git-check to override."
-      };
-    }
-    return { ok: true, value: { mode: "overwrite-source", outDir: null } };
-  }
-  const outDir = path.resolve(options.out ?? "domflax-out");
-  return { ok: true, value: { mode: "out-dir", outDir } };
-}
-function destinationFor(file, inputRoot, plan) {
-  const absFile = path.resolve(file);
-  if (plan.mode === "overwrite-source") {
-    return { ok: true, value: absFile };
-  }
-  const outDir = plan.outDir;
-  const rel = path.relative(inputRoot, absFile);
-  const safeRel = rel === "" || rel.startsWith("..") || path.isAbsolute(rel) ? path.basename(absFile) : rel;
-  const dest = path.join(outDir, safeRel);
-  if (path.resolve(dest) === absFile && !isDisposablePath(absFile)) {
-    return {
-      ok: false,
-      error: `refusing to overwrite source file ${absFile}: the output path resolves onto the source. Choose a different --out, or pass --dangerously-overwrite-source (with a clean git tree).`
-    };
-  }
-  return { ok: true, value: dest };
+function addStats(totals, stats, changed) {
+  totals.files += 1;
+  if (changed) totals.changed += 1;
+  totals.nodesRemoved += stats.nodesRemoved;
+  totals.classesSaved += stats.classesSaved;
+  totals.bytesSaved += stats.bytesSaved;
 }
-
-// ../cli/src/transform.ts
-init_esm_shims();
-function buildResolver(provider, css, projectRoot) {
-  if (provider === "custom") {
-    return createCssResolver([], { files: css, projectRoot });
-  }
-  return createTailwindResolver({ projectRoot });
+function clamp(n, lo, hi) {
+  return Math.max(lo, Math.min(hi, n));
 }
-function buildPasses(patterns) {
-  const byPhase = /* @__PURE__ */ new Map();
-  for (const p2 of patterns) {
-    const phase = p2.category.split("/", 1)[0] ?? "flatten";
-    let bucket = byPhase.get(phase);
-    if (!bucket) {
-      bucket = [];
-      byPhase.set(phase, bucket);
-    }
-    bucket.push(p2);
-  }
-  const passes = [];
-  for (const [phase, pats] of byPhase) {
-    passes.push({ phase, category: `${phase}/builtin`, patterns: pats });
-  }
-  return passes;
+function computeWorkerCount(options) {
+  const cpus2 = Math.max(1, os.cpus().length);
+  const freeMB = Math.floor(os.freemem() / (1024 * 1024));
+  const budgetMB = Math.max(PER_WORKER_MB, options.maxMemory ?? Math.floor(freeMB * 0.7));
+  const byMemory = Math.max(1, Math.floor(budgetMB / PER_WORKER_MB));
+  const target = options.concurrency ?? Math.max(1, cpus2 - 1);
+  const workers = clamp(Math.min(target, byMemory), 1, byMemory);
+  const perWorkerCapMB = Math.max(MIN_OLD_GEN_MB, Math.floor(budgetMB / workers));
+  return { workers, budgetMB, perWorkerCapMB };
 }
-function selectPatterns(names) {
-  if (names === null) return builtinPatterns;
-  const set = new Set(names);
-  return builtinPatterns.filter((p2) => set.has(p2.name));
+function inlineThreshold(workers) {
+  return Math.max(4, 2 * workers);
 }
-function jsxKindOf(id) {
-  const clean = id.split("?", 1)[0] ?? id;
-  const lower = clean.toLowerCase();
-  if (lower.endsWith(".tsx")) return "tsx";
-  if (lower.endsWith(".jsx")) return "jsx";
-  return null;
+function shouldUsePool(fileCount, plan) {
+  return plan.workers > 1 && fileCount > inlineThreshold(plan.workers);
 }
-function countClassTokens(code) {
-  let total = 0;
-  const re = /\b(?:className|class)\s*=\s*"([^"]*)"/g;
-  let m2;
-  while ((m2 = re.exec(code)) !== null) {
-    total += m2[1].split(/\s+/).filter((t) => t.length > 0).length;
+function moduleDir() {
+  try {
+    return path.dirname(fileURLToPath(import.meta.url));
+  } catch {
+    return typeof __dirname !== "undefined" ? __dirname : process.cwd();
   }
-  return total;
-}
-function bytes(s) {
-  return Buffer.byteLength(s, "utf8");
 }
-function passthroughResult(code) {
-  return {
-    code,
-    changed: false,
-    passthrough: true,
-    stats: {
-      nodesIn: 0,
-      nodesOut: 0,
-      nodesRemoved: 0,
-      classesBefore: 0,
-      classesAfter: 0,
-      classesSaved: 0,
-      bytesBefore: bytes(code),
-      bytesAfter: bytes(code),
-      bytesSaved: 0
-    }
-  };
+function resolveWorkerPath() {
+  const dir = moduleDir();
+  const candidates = [
+    path.join(dir, "worker.cjs"),
+    path.join(dir, "worker.js"),
+    path.join(dir, "..", "dist", "worker.cjs"),
+    path.join(dir, "..", "dist", "worker.js")
+  ];
+  for (const c of candidates) {
+    if (existsSync(c)) return c;
+  }
+  return candidates[0];
 }
-function createTransform(options) {
-  const projectRoot = options.projectRoot ?? process.cwd();
-  const resolver = buildResolver(options.provider, options.css, projectRoot);
-  const patterns = selectPatterns(options.passes);
-  function prepare(code, id, kind, gate) {
-    const parsed = createJsxFrontend().parse(code, {
-      id,
-      kind,
-      resolver,
-      normalizer,
-      config: {},
-      onDiagnostic: () => {
+function runPool(files, init, plan, onWrote) {
+  const workerPath = resolveWorkerPath();
+  const totals = emptyTotals();
+  const wrote = [];
+  const errors = [];
+  let failures = 0;
+  const budgetBytes = plan.budgetMB * 1024 * 1024;
+  let nextIndex = 0;
+  let completed = 0;
+  const total = files.length;
+  let respawns = 0;
+  const maxRespawns = total + plan.workers + 8;
+  return new Promise((resolve3) => {
+    const handles = /* @__PURE__ */ new Set();
+    const finishIfDone = () => {
+      if (completed < total) return;
+      for (const h2 of handles) {
+        if (!h2.dead) {
+          try {
+            h2.worker.postMessage({ type: "stop" });
+          } catch {
+          }
+          void h2.worker.terminate();
+        }
       }
-    });
-    const doc = parsed.doc;
-    const nodesIn = doc.nodes.size;
-    for (const node of doc.nodes.values()) node.meta.safetyFloor = 3;
-    const ctx = {
-      doc,
-      safetyCeiling: options.safety,
-      normalizer,
-      // Real CSS-selector-safety index from the active resolver (custom-CSS reports combinator /
-      // structural-pseudo coupling; Tailwind has none → null index, behaviour unchanged).
-      selectors: buildSelectorIndex(doc, resolver),
-      resolver,
-      gate
+      handles.clear();
+      resolve3({ totals, failures, wrote, errors });
     };
-    return { doc, ctx, passes: buildPasses(patterns), nodesIn };
-  }
-  function finish(code, optimized, id, nodesIn) {
-    syncClassesFromComputed(optimized, resolver, normalizer);
-    const printed = createJsxBackend().print(
-      optimized,
-      { moduleId: id, ops: [], provenance: /* @__PURE__ */ new Map() },
-      { normalizer, resolver, sink: createSyntheticSink(), eol: "\n", onDiagnostic: () => {
-      } }
-    );
-    const out = printed.code;
-    const nodesOut = optimized.nodes.size;
-    const classesBefore = countClassTokens(code);
-    const classesAfter = countClassTokens(out);
-    return {
-      code: out,
-      changed: out !== code,
-      passthrough: false,
-      stats: {
-        nodesIn,
-        nodesOut,
-        nodesRemoved: Math.max(0, nodesIn - nodesOut),
-        classesBefore,
-        classesAfter,
-        classesSaved: Math.max(0, classesBefore - classesAfter),
-        bytesBefore: bytes(code),
-        bytesAfter: bytes(out),
-        bytesSaved: bytes(code) - bytes(out)
+    const recordFailure = (file, error) => {
+      failures += 1;
+      completed += 1;
+      errors.push({ path: file, error });
+    };
+    const dispatch = (h2) => {
+      if (h2.dead) return;
+      if (nextIndex >= total) {
+        h2.current = null;
+        try {
+          h2.worker.postMessage({ type: "stop" });
+        } catch {
+        }
+        return;
+      }
+      if (process.memoryUsage().rss > budgetBytes) {
+        setTimeout(() => dispatch(h2), 25);
+        return;
+      }
+      const file = files[nextIndex++];
+      h2.current = file;
+      try {
+        h2.worker.postMessage({ type: "file", path: file });
+      } catch {
+        onWorkerDown(h2);
       }
     };
-  }
-  return {
-    resolver,
-    transformFile(code, id) {
-      const kind = jsxKindOf(id);
-      if (kind === null) return passthroughResult(code);
-      const { doc, ctx, passes, nodesIn } = prepare(code, id, kind, "provably-safe");
-      const { doc: optimized } = runPasses(doc, passes, ctx);
-      return finish(code, optimized, id, nodesIn);
-    }
-  };
+    const onMessage = (h2, msg) => {
+      if (msg.type === "ready") {
+        h2.ready = true;
+        dispatch(h2);
+        return;
+      }
+      h2.current = null;
+      if (msg.ok) {
+        addStats(totals, msg.stats, msg.changed);
+        if (msg.wrote) {
+          wrote.push(msg.wrote);
+          onWrote?.(msg.wrote);
+        }
+      } else {
+        failures += 1;
+        errors.push({ path: msg.path, error: msg.error });
+      }
+      completed += 1;
+      if (completed >= total) {
+        finishIfDone();
+        return;
+      }
+      dispatch(h2);
+    };
+    const drainRemaining = (reason) => {
+      while (nextIndex < total) recordFailure(files[nextIndex++], reason);
+      finishIfDone();
+    };
+    const onWorkerDown = (h2) => {
+      if (h2.dead) return;
+      h2.dead = true;
+      handles.delete(h2);
+      const lost = h2.current;
+      h2.current = null;
+      if (lost !== null) recordFailure(lost, "worker crashed while processing this file");
+      void h2.worker.terminate();
+      if (completed >= total) {
+        finishIfDone();
+        return;
+      }
+      if (nextIndex >= total) {
+        if (handles.size === 0) finishIfDone();
+        return;
+      }
+      if (respawns < maxRespawns) {
+        respawns += 1;
+        spawn();
+      } else if (handles.size === 0) {
+        drainRemaining("worker pool exhausted its respawn budget (memory cap too small?)");
+      }
+    };
+    const spawn = () => {
+      let worker;
+      try {
+        worker = new Worker(workerPath, {
+          workerData: init,
+          resourceLimits: { maxOldGenerationSizeMb: plan.perWorkerCapMB }
+        });
+      } catch {
+        if (nextIndex < total) recordFailure(files[nextIndex++], "failed to spawn worker");
+        if (completed >= total) finishIfDone();
+        else if (handles.size === 0 && nextIndex < total) spawn();
+        return;
+      }
+      const h2 = { worker, current: null, ready: false, dead: false };
+      handles.add(h2);
+      worker.on("message", (m2) => onMessage(h2, m2));
+      worker.on("error", () => onWorkerDown(h2));
+      worker.on("exit", (code) => {
+        if (code !== 0) onWorkerDown(h2);
+      });
+    };
+    const initial = Math.min(plan.workers, total);
+    for (let i = 0; i < initial; i++) spawn();
+    if (initial === 0) finishIfDone();
+  });
 }
 
 // ../cli/src/walk.ts
 init_esm_shims();
 import * as fs from "fs";
 import * as path2 from "path";
-var SUPPORTED_EXTS = [".jsx", ".tsx"];
-var HTML_EXTS = [".html", ".htm"];
+var SUPPORTED_EXTS = [".jsx", ".tsx", ".html", ".htm"];
 var SKIP_DIRS = /* @__PURE__ */ new Set(["node_modules", ".git", "domflax-out"]);
 function isSupported(file) {
   const lower = file.toLowerCase();
   return SUPPORTED_EXTS.some((ext) => lower.endsWith(ext));
 }
-function isHtml(file) {
-  const lower = file.toLowerCase();
-  return HTML_EXTS.some((ext) => lower.endsWith(ext));
-}
 function hasGlobMagic(p2) {
   return /[*?[\]{}]/.test(p2);
 }
-function walkDir(dir, out, counts) {
+function walkDir(dir, out) {
   let entries;
   try {
     entries = fs.readdirSync(dir, { withFileTypes: true });
@@ -452,10 +460,9 @@ function walkDir(dir, out, counts) {
     const full = path2.join(dir, entry.name);
     if (entry.isDirectory()) {
       if (SKIP_DIRS.has(entry.name)) continue;
-      walkDir(full, out, counts);
+      walkDir(full, out);
     } else if (entry.isFile()) {
       if (isSupported(entry.name)) out.push(full);
-      else if (isHtml(entry.name)) counts.html += 1;
     }
   }
 }
@@ -466,7 +473,6 @@ function globSyncMaybe() {
 function discoverInputs(paths) {
   const files = [];
   const warnings = [];
-  const counts = { html: 0 };
   const seen = /* @__PURE__ */ new Set();
   const push = (f) => {
     const abs = path2.resolve(f);
@@ -490,12 +496,11 @@ function discoverInputs(paths) {
       stat = null;
     }
     if (stat?.isDirectory()) {
-      walkDir(path2.resolve(p2), files, counts);
+      walkDir(path2.resolve(p2), files);
       continue;
     }
     if (stat?.isFile()) {
       if (isSupported(p2)) push(p2);
-      else if (isHtml(p2)) counts.html += 1;
       else warnings.push(`unsupported file type, skipped: ${p2}`);
       continue;
     }
@@ -507,8 +512,7 @@ function discoverInputs(paths) {
       }
       const matched = glob(p2);
       const supported = matched.filter(isSupported);
-      counts.html += matched.filter(isHtml).length;
-      if (supported.length === 0) warnings.push(`no .jsx/.tsx files matched: ${p2}`);
+      if (supported.length === 0) warnings.push(`no .jsx/.tsx/.html files matched: ${p2}`);
       for (const m2 of supported) push(m2);
       continue;
     }
@@ -523,11 +527,6 @@ function discoverInputs(paths) {
       deduped.push(abs);
     }
   }
-  if (deduped.length === 0 && counts.html > 0) {
-    warnings.push(
-      `found ${counts.html} .html file${counts.html === 1 ? "" : "s"} but HTML optimization isn't supported yet (domflax currently optimizes .jsx/.tsx source; HTML is on the roadmap: https://github.com/Krishnesh-Mishra/domflax#roadmap).`
-    );
-  }
   return { files: deduped, inputRoot, warnings };
 }
 
@@ -1305,13 +1304,6 @@ async function runWizard(base) {
 }
 
 // ../cli/src/index.ts
-function addStats(totals, stats, changed) {
-  totals.files += 1;
-  if (changed) totals.changed += 1;
-  totals.nodesRemoved += stats.nodesRemoved;
-  totals.classesSaved += stats.classesSaved;
-  totals.bytesSaved += stats.bytesSaved;
-}
 function printReport(totals) {
   console.log("");
   console.log("domflax report");
@@ -1321,23 +1313,8 @@ function printReport(totals) {
   console.log(`  classes saved   : ${totals.classesSaved}`);
   console.log(`  bytes saved     : ${totals.bytesSaved}`);
 }
-async function execute(options) {
-  const { files, inputRoot, warnings } = discoverInputs(options.paths);
-  for (const w2 of warnings) console.error(`domflax: ${w2}`);
-  if (files.length === 0) {
-    console.error("domflax: no .jsx/.tsx files found for the given paths");
-    return { exitCode: 1 };
-  }
-  const projectRoot = options.projectRoot ?? process.cwd();
-  const gitClean = options.dangerouslyOverwriteSource && !options.noGitCheck ? isGitClean(projectRoot) : true;
-  const planned = planWrites(options, gitClean);
-  if (!planned.ok) {
-    console.error(`domflax: ${planned.error}`);
-    return { exitCode: 1 };
-  }
-  const plan = planned.value;
+function runInline(files, options, inputRoot, plan, totals) {
   const transform = createTransform(options);
-  const totals = { files: 0, changed: 0, nodesRemoved: 0, classesSaved: 0, bytesSaved: 0 };
   let failures = 0;
   for (const file of files) {
     let code;
@@ -1372,6 +1349,45 @@ async function execute(options) {
       failures += 1;
     }
   }
+  return failures;
+}
+async function execute(options) {
+  const { files, inputRoot, warnings } = discoverInputs(options.paths);
+  for (const w2 of warnings) console.error(`domflax: ${w2}`);
+  if (files.length === 0) {
+    console.error("domflax: no .jsx/.tsx files found for the given paths");
+    return { exitCode: 1 };
+  }
+  const projectRoot = options.projectRoot ?? process.cwd();
+  const gitClean = options.dangerouslyOverwriteSource && !options.noGitCheck ? isGitClean(projectRoot) : true;
+  const planned = planWrites(options, gitClean);
+  if (!planned.ok) {
+    console.error(`domflax: ${planned.error}`);
+    return { exitCode: 1 };
+  }
+  const plan = planned.value;
+  const poolPlan = computeWorkerCount(options);
+  const usePool = !options.dryRun && shouldUsePool(files.length, poolPlan);
+  const totals = emptyTotals();
+  let failures = 0;
+  if (usePool) {
+    const outcome = await runPool(
+      files,
+      { options, inputRoot, plan },
+      poolPlan
+      // Per-file "wrote" lines are collected and printed in deterministic (sorted) order below.
+    );
+    Object.assign(totals, outcome.totals);
+    failures = outcome.failures;
+    for (const { path: p2, error } of outcome.errors) {
+      console.error(`domflax: failed ${path4.relative(process.cwd(), p2) || p2}: ${error}`);
+    }
+    for (const dest of [...outcome.wrote].sort()) {
+      console.log(`domflax: wrote ${path4.relative(process.cwd(), dest) || dest}`);
+    }
+  } else {
+    failures += runInline(files, options, inputRoot, plan, totals);
+  }
   if (options.dryRun) {
     console.log("\ndomflax: dry run \u2014 no files were written.");
   } else if (totals.changed === 0) {