@birdycom/omniacss-migrate 0.11.0 → 0.11.2

package/src/extract.mjs

@@ -1,91 +1,91 @@
-// File: packages/migrate/src/extract.mjs
-// Extract class-like tokens from source text (Blade, Vue, JSX/TSX, JS, HTML …), keeping arbitrary values
-// such as `w-[37px]`, `[&_svg:not([class*='size-'])]:size-4` and `bg-(--brand)` intact.
-// Author: Serge Cools | Framework: OmniaCSS
-
-import fs from "node:fs/promises";
-import path from "node:path";
-
-export const DEFAULT_EXTENSIONS = ["blade.php", "php", "vue", "jsx", "tsx", "js", "ts", "mjs", "html", "svelte", "astro", "mdx", "twig", "erb"];
-const IGNORE_DIRS = new Set(["node_modules", "vendor", ".git", "storage", "dist", "build", "public", ".next", ".nuxt", ".output", "bootstrap", ".cache", ".turbo", ".astro"]);
-
-const DELIM = /[\s"'`{},;<>=|\\$+?^~]/;
-
-/**
- * Call `cb(token, start, end)` for every class-like token in `text`.
- * Arbitrary values such as `w-[37px]` stay in one piece.
- */
-export function scanTokens(text, cb) {
-  let cur = "", depth = 0, mark = 0, start = 0;
-  const flush = (end) => {
-    if (cur) {
-      const lead = cur.length - cur.replace(/^[.:]+/, "").length;
-      const t = cur.replace(/^[.:]+/, "").replace(/[.:,]+$/, "");
-      if (t && t.length <= 250 && /^[A-Za-z0-9!@\[*(-]/.test(t)) cb(t, start + lead, start + lead + t.length);
-    }
-    cur = "";
-  };
-  for (let i = 0; i < text.length; i++) {
-    const ch = text[i];
-    if (depth > 0) {
-      if (/\s/.test(ch) || cur.length > 250) { i = mark; cur = ""; depth = 0; continue; } // not an arbitrary value after all
-      cur += ch;
-      if (ch === "[" || ch === "(") depth++;
-      else if (ch === "]" || ch === ")") depth--;
-      continue;
-    }
-    if (ch === "[" || ch === "(") {
-      const prev = cur.slice(-1);
-      const next = text[i + 1];
-      const attach = ch === "[" ? (cur === "" ? !!next && !/[\s"'`\]]/.test(next) : /[-:!]/.test(prev)) : /[-:!]/.test(prev);
-      if (attach) { if (!cur) start = i; mark = i; depth = 1; cur += ch; continue; }
-      flush(i); continue;
-    }
-    if (DELIM.test(ch) || ch === ")" || ch === "]" || ch === "&" || (ch === "#" && cur === "")) { flush(i); continue; }
-    if (!cur) start = i;
-    cur += ch;
-  }
-  flush(text.length);
-}
-
-/** Class-like tokens in a text (duplicates are kept, so callers can count occurrences). */
-export function extractTokens(text) {
-  const out = [];
-  scanTokens(text, (t) => out.push(t));
-  return out;
-}
-
-/** Walk `dir` and return files with one of the given extensions. */
-export async function walk(dir, { extensions = DEFAULT_EXTENSIONS, ignore = IGNORE_DIRS } = {}) {
-  const files = [];
-  async function rec(d) {
-    let entries;
-    try { entries = await fs.readdir(d, { withFileTypes: true }); } catch { return; }
-    for (const e of entries) {
-      if (e.isDirectory()) { if (!ignore.has(e.name) && !e.name.startsWith(".")) await rec(path.join(d, e.name)); continue; }
-      if (extensions.some((x) => e.name.endsWith("." + x))) files.push(path.join(d, e.name));
-    }
-  }
-  await rec(dir);
-  return files;
-}
-
-const STRING_RE = /"(?:[^"\\\n]|\\.){0,3000}"|'(?:[^'\\\n]|\\.){0,3000}'|`(?:[^`\\]|\\.){0,4000}`/g;
-const CLASS_CONTEXT = /(class(Name)?|:class|\bcn|clsx|cva|twMerge|classNames|tv|@class)\W{0,6}$/;
-
-/**
- * Candidate class strings: quoted strings (and attribute values) with their preceding context.
- * @returns {Array<{ words: string[], spans: Array<{token:string,start:number,end:number}>, hinted: boolean }>}
- */
-export function classStrings(text) {
-  const out = [];
-  for (const m of text.matchAll(STRING_RE)) {
-    const inner = m[0].slice(1, -1);
-    if (!inner.trim()) continue;
-    const before = text.slice(Math.max(0, m.index - 24), m.index);
-    const tokens = [];
-    scanTokens(inner, (t, s, e) => tokens.push({ token: t, start: m.index + 1 + s, end: m.index + 1 + e }));
-    out.push({ words: tokens.map((t) => t.token), spans: tokens, hinted: CLASS_CONTEXT.test(before) });
-  }
-  return out;
-}
+// File: packages/migrate/src/extract.mjs
+// Extract class-like tokens from source text (Blade, Vue, JSX/TSX, JS, HTML …), keeping arbitrary values
+// such as `w-[37px]`, `[&_svg:not([class*='size-'])]:size-4` and `bg-(--brand)` intact.
+// Author: Serge Cools | Framework: OmniaCSS
+
+import fs from "node:fs/promises";
+import path from "node:path";
+
+export const DEFAULT_EXTENSIONS = ["blade.php", "php", "vue", "jsx", "tsx", "js", "ts", "mjs", "html", "svelte", "astro", "mdx", "twig", "erb"];
+const IGNORE_DIRS = new Set(["node_modules", "vendor", ".git", "storage", "dist", "build", "public", ".next", ".nuxt", ".output", "bootstrap", ".cache", ".turbo", ".astro"]);
+
+const DELIM = /[\s"'`{},;<>=|\\$+?^~]/;
+
+/**
+ * Call `cb(token, start, end)` for every class-like token in `text`.
+ * Arbitrary values such as `w-[37px]` stay in one piece.
+ */
+export function scanTokens(text, cb) {
+  let cur = "", depth = 0, mark = 0, start = 0;
+  const flush = (end) => {
+    if (cur) {
+      const lead = cur.length - cur.replace(/^[.:]+/, "").length;
+      const t = cur.replace(/^[.:]+/, "").replace(/[.:,]+$/, "");
+      if (t && t.length <= 250 && /^[A-Za-z0-9!@\[*(-]/.test(t)) cb(t, start + lead, start + lead + t.length);
+    }
+    cur = "";
+  };
+  for (let i = 0; i < text.length; i++) {
+    const ch = text[i];
+    if (depth > 0) {
+      if (/\s/.test(ch) || cur.length > 250) { i = mark; cur = ""; depth = 0; continue; } // not an arbitrary value after all
+      cur += ch;
+      if (ch === "[" || ch === "(") depth++;
+      else if (ch === "]" || ch === ")") depth--;
+      continue;
+    }
+    if (ch === "[" || ch === "(") {
+      const prev = cur.slice(-1);
+      const next = text[i + 1];
+      const attach = ch === "[" ? (cur === "" ? !!next && !/[\s"'`\]]/.test(next) : /[-:!]/.test(prev)) : /[-:!]/.test(prev);
+      if (attach) { if (!cur) start = i; mark = i; depth = 1; cur += ch; continue; }
+      flush(i); continue;
+    }
+    if (DELIM.test(ch) || ch === ")" || ch === "]" || ch === "&" || (ch === "#" && cur === "")) { flush(i); continue; }
+    if (!cur) start = i;
+    cur += ch;
+  }
+  flush(text.length);
+}
+
+/** Class-like tokens in a text (duplicates are kept, so callers can count occurrences). */
+export function extractTokens(text) {
+  const out = [];
+  scanTokens(text, (t) => out.push(t));
+  return out;
+}
+
+/** Walk `dir` and return files with one of the given extensions. */
+export async function walk(dir, { extensions = DEFAULT_EXTENSIONS, ignore = IGNORE_DIRS } = {}) {
+  const files = [];
+  async function rec(d) {
+    let entries;
+    try { entries = await fs.readdir(d, { withFileTypes: true }); } catch { return; }
+    for (const e of entries) {
+      if (e.isDirectory()) { if (!ignore.has(e.name) && !e.name.startsWith(".")) await rec(path.join(d, e.name)); continue; }
+      if (extensions.some((x) => e.name.endsWith("." + x))) files.push(path.join(d, e.name));
+    }
+  }
+  await rec(dir);
+  return files;
+}
+
+const STRING_RE = /"(?:[^"\\\n]|\\.){0,3000}"|'(?:[^'\\\n]|\\.){0,3000}'|`(?:[^`\\]|\\.){0,4000}`/g;
+const CLASS_CONTEXT = /(class(Name)?|:class|\bcn|clsx|cva|twMerge|classNames|tv|@class)\W{0,6}$/;
+
+/**
+ * Candidate class strings: quoted strings (and attribute values) with their preceding context.
+ * @returns {Array<{ words: string[], spans: Array<{token:string,start:number,end:number}>, hinted: boolean }>}
+ */
+export function classStrings(text) {
+  const out = [];
+  for (const m of text.matchAll(STRING_RE)) {
+    const inner = m[0].slice(1, -1);
+    if (!inner.trim()) continue;
+    const before = text.slice(Math.max(0, m.index - 24), m.index);
+    const tokens = [];
+    scanTokens(inner, (t, s, e) => tokens.push({ token: t, start: m.index + 1 + s, end: m.index + 1 + e }));
+    out.push({ words: tokens.map((t) => t.token), spans: tokens, hinted: CLASS_CONTEXT.test(before) });
+  }
+  return out;
+}

package/src/index.mjs

@@ -1,12 +1,12 @@
-// File: packages/migrate/src/index.mjs
-// Public API of @birdycom/omniacss-migrate.
-// Author: Serge Cools | Framework: OmniaCSS
-export { createContext, resolveToken, resolveUtility, parseToken, compileToken, compileTokens, serialize, SCREENS } from "./resolve.mjs";
-export { extractTokens, classStrings } from "./extract.mjs";
-export { scanDir, formatScan } from "./scan.mjs";
-export { runCodemod, formatCodemod } from "./codemod.mjs";
-export { planSetup, applySetup, formatPlan } from "./setup.mjs";
-export { loadProject, themeFromConfig } from "./project.mjs";
-export { COLOR_MAP } from "./values.mjs";
-export { default as postcss } from "./postcss.mjs";
-export { default as vite } from "./vite.mjs";
+// File: packages/migrate/src/index.mjs
+// Public API of @birdycom/omniacss-migrate.
+// Author: Serge Cools | Framework: OmniaCSS
+export { createContext, resolveToken, resolveUtility, parseToken, compileToken, compileTokens, serialize, SCREENS } from "./resolve.mjs";
+export { extractTokens, classStrings } from "./extract.mjs";
+export { scanDir, formatScan } from "./scan.mjs";
+export { runCodemod, formatCodemod } from "./codemod.mjs";
+export { planSetup, applySetup, formatPlan } from "./setup.mjs";
+export { loadProject, themeFromConfig } from "./project.mjs";
+export { COLOR_MAP } from "./values.mjs";
+export { default as postcss } from "./postcss.mjs";
+export { default as vite } from "./vite.mjs";

package/src/native.mjs

@@ -1,72 +1,72 @@
-// File: packages/migrate/src/native.mjs
-// Codemod brain: find the native OmniaCSS class that has exactly the same declarations as a Tailwind-style class.
-// The index is read from the shipped @birdycom/omniacss CSS, so it always matches the installed version.
-// Author: Serge Cools | Framework: OmniaCSS
-
-import fs from "node:fs";
-import path from "node:path";
-import { createRequire } from "node:module";
-import { fileURLToPath } from "node:url";
-import { parseToken, resolveToken } from "./resolve.mjs";
-import { esc } from "./variants.mjs";
-
-const here = path.dirname(fileURLToPath(import.meta.url));
-
-function findOmniaCss(cwd) {
-  const tries = [
-    () => createRequire(path.join(cwd, "package.json")).resolve("@birdycom/omniacss/dist/omnia.css"),
-    () => createRequire(import.meta.url).resolve("@birdycom/omniacss/dist/omnia.css"),
-    () => path.resolve(here, "../../core/dist/omnia.css"),
-  ];
-  for (const t of tries) { try { const p = t(); if (fs.existsSync(p)) return p; } catch { /* next */ } }
-  throw new Error("@birdycom/omniacss-migrate: cannot find @birdycom/omniacss/dist/omnia.css (npm install @birdycom/omniacss)");
-}
-
-const normDecls = (body) =>
-  body.replace(/\/\*[\s\S]*?\*\//g, "").split(";").map((s) => s.trim().replace(/\s+/g, " ")).filter(Boolean).map((s) => s.replace(/\s*:\s*/, ":")).join(";");
-
-let cached;
-
-/** Index of Omnia's own classes: declarations -> class names, plus the set of every class name. */
-export function loadOmniaIndex(cwd = process.cwd()) {
-  const file = findOmniaCss(cwd);
-  if (cached?.file === file) return cached;
-  const css = fs.readFileSync(file, "utf8").replace(/\r\n/g, "\n");
-  const names = new Set();
-  for (const m of css.matchAll(/\.((?:\\.|[A-Za-z0-9_-])+)/g)) names.add(m[1].replace(/\\(.)/g, "$1"));
-  const byDecls = new Map();
-  for (const m of css.matchAll(/^\.((?:\\.|[A-Za-z0-9_-])+) \{\n([^}]*)\}/gm)) {
-    const name = m[1].replace(/\\(.)/g, "$1");
-    const key = normDecls(m[2]);
-    if (!key) continue;
-    const list = byDecls.get(key) || [];
-    if (!list.includes(name)) list.push(name);
-    byDecls.set(key, list);
-  }
-  cached = { file, names, byDecls };
-  return cached;
-}
-
-const SAFE_VARIANTS = new Set(["sm", "md", "lg", "dark", "hover", "focus", "active", "focus-visible", "focus-within", "disabled", "group-hover", "first", "last", "odd", "even"]);
-
-/**
- * Native Omnia class for a Tailwind-style token, or null.
- * @returns {{ native: string } | { collision: true } | null}
- */
-export function nativeFor(token, ctx, index) {
-  const p = parseToken(token, ctx);
-  if (p.foreign || p.important || !p.body) return null;
-  if (!p.variants.every((v) => SAFE_VARIANTS.has(v))) return null;
-  const r = resolveToken(p.neg ? "-" + p.utility : p.utility, ctx);
-  if (!r || r.marker) return r?.marker ? { native: token } : null;
-  if (r.rules.length !== 1 || r.rules[0].media.length || r.rules[0].selectors.length !== 1) return null;
-  const rule = r.rules[0];
-  if (rule.selectors[0] !== `.${esc(p.neg ? "-" + p.utility : p.utility)}`) return null;
-  const key = rule.decls.map(([k, v]) => `${k}:${v.replace(/\s+/g, " ")}`).join(";");
-  const list = index.byDecls.get(normDecls(key));
-  if (!list) return index.names.has(p.utility) ? { collision: true } : null;
-  const base = list.includes(p.utility) ? p.utility : [...list].sort((a, b) => a.length - b.length)[0];
-  const native = p.variants.length ? `${p.variants.join(":")}:${base}` : base;
-  if (p.variants.length && !index.names.has(native)) return null;
-  return { native };
-}
+// File: packages/migrate/src/native.mjs
+// Codemod brain: find the native OmniaCSS class that has exactly the same declarations as a Tailwind-style class.
+// The index is read from the shipped @birdycom/omniacss CSS, so it always matches the installed version.
+// Author: Serge Cools | Framework: OmniaCSS
+
+import fs from "node:fs";
+import path from "node:path";
+import { createRequire } from "node:module";
+import { fileURLToPath } from "node:url";
+import { parseToken, resolveToken } from "./resolve.mjs";
+import { esc } from "./variants.mjs";
+
+const here = path.dirname(fileURLToPath(import.meta.url));
+
+function findOmniaCss(cwd) {
+  const tries = [
+    () => createRequire(path.join(cwd, "package.json")).resolve("@birdycom/omniacss/dist/omnia.css"),
+    () => createRequire(import.meta.url).resolve("@birdycom/omniacss/dist/omnia.css"),
+    () => path.resolve(here, "../../core/dist/omnia.css"),
+  ];
+  for (const t of tries) { try { const p = t(); if (fs.existsSync(p)) return p; } catch { /* next */ } }
+  throw new Error("@birdycom/omniacss-migrate: cannot find @birdycom/omniacss/dist/omnia.css (npm install @birdycom/omniacss)");
+}
+
+const normDecls = (body) =>
+  body.replace(/\/\*[\s\S]*?\*\//g, "").split(";").map((s) => s.trim().replace(/\s+/g, " ")).filter(Boolean).map((s) => s.replace(/\s*:\s*/, ":")).join(";");
+
+let cached;
+
+/** Index of Omnia's own classes: declarations -> class names, plus the set of every class name. */
+export function loadOmniaIndex(cwd = process.cwd()) {
+  const file = findOmniaCss(cwd);
+  if (cached?.file === file) return cached;
+  const css = fs.readFileSync(file, "utf8").replace(/\r\n/g, "\n");
+  const names = new Set();
+  for (const m of css.matchAll(/\.((?:\\.|[A-Za-z0-9_-])+)/g)) names.add(m[1].replace(/\\(.)/g, "$1"));
+  const byDecls = new Map();
+  for (const m of css.matchAll(/^\.((?:\\.|[A-Za-z0-9_-])+) \{\n([^}]*)\}/gm)) {
+    const name = m[1].replace(/\\(.)/g, "$1");
+    const key = normDecls(m[2]);
+    if (!key) continue;
+    const list = byDecls.get(key) || [];
+    if (!list.includes(name)) list.push(name);
+    byDecls.set(key, list);
+  }
+  cached = { file, names, byDecls };
+  return cached;
+}
+
+const SAFE_VARIANTS = new Set(["sm", "md", "lg", "dark", "hover", "focus", "active", "focus-visible", "focus-within", "disabled", "group-hover", "first", "last", "odd", "even"]);
+
+/**
+ * Native Omnia class for a Tailwind-style token, or null.
+ * @returns {{ native: string } | { collision: true } | null}
+ */
+export function nativeFor(token, ctx, index) {
+  const p = parseToken(token, ctx);
+  if (p.foreign || p.important || !p.body) return null;
+  if (!p.variants.every((v) => SAFE_VARIANTS.has(v))) return null;
+  const r = resolveToken(p.neg ? "-" + p.utility : p.utility, ctx);
+  if (!r || r.marker) return r?.marker ? { native: token } : null;
+  if (r.rules.length !== 1 || r.rules[0].media.length || r.rules[0].selectors.length !== 1) return null;
+  const rule = r.rules[0];
+  if (rule.selectors[0] !== `.${esc(p.neg ? "-" + p.utility : p.utility)}`) return null;
+  const key = rule.decls.map(([k, v]) => `${k}:${v.replace(/\s+/g, " ")}`).join(";");
+  const list = index.byDecls.get(normDecls(key));
+  if (!list) return index.names.has(p.utility) ? { collision: true } : null;
+  const base = list.includes(p.utility) ? p.utility : [...list].sort((a, b) => a.length - b.length)[0];
+  const native = p.variants.length ? `${p.variants.join(":")}:${base}` : base;
+  if (p.variants.length && !index.names.has(native)) return null;
+  return { native };
+}