@csszyx/cli 0.10.7 → 0.10.9

package/dist/bin.mjs

@@ -6,18 +6,18 @@ import path__default from 'node:path';
 import fs from 'fs-extra';
 import ora from 'ora';
 import pc from 'picocolors';
+import { readFile } from 'node:fs/promises';
+import { transformSourceCode, transform, sortStrings } from '@csszyx/compiler';
+import fg from 'fast-glob';
 import { parseExpression } from '@babel/parser';
-import { transform } from '@csszyx/compiler';
-import { i as transformHtmlSourceSimple, t as transformSource, h as generateTypes } from './shared/cli.C2lx9IpE.mjs';
+import { i as transformHtmlSourceSimple, t as transformSource, h as generateTypes } from './shared/cli.DXHBKEV9.mjs';
 import { execa } from 'execa';
 import prompts from 'prompts';
 import readline from 'node:readline';
-import fg from 'fast-glob';
 import { runNextPrebuild } from '@csszyx/unplugin/next-prebuild';
 import { NextSafelistWatcher } from '@csszyx/unplugin/next-watcher';
 import { watch } from 'chokidar';
 import { Minimatch } from 'minimatch';
-import 'node:fs/promises';
 import 'node:url';
 import 'tailwindcss/resolveConfig.js';
 import '@babel/types';
@@ -178,6 +178,81 @@ function formatBytes(bytes) {
   return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
 }
 
+const DEFAULT_IGNORE$1 = [
+  "**/node_modules/**",
+  "**/dist/**",
+  "**/build/**",
+  "**/.next/**",
+  "**/.nuxt/**",
+  "**/.astro/**"
+];
+async function check(options = {}) {
+  const cwd = options.cwd ?? process.cwd();
+  const patterns = options.pattern ? [options.pattern] : ["**/*.{jsx,tsx}"];
+  const ignore = [...DEFAULT_IGNORE$1, ...options.ignore ?? []];
+  process.env.CSSZYX_NO_PROJECT_SCAN_HINT = "1";
+  printHeader("csszyx check \u2014 static sz diagnostics");
+  const s = spinner.start("Scanning for files...");
+  let files;
+  try {
+    files = await fg(patterns, { cwd, ignore, absolute: true });
+  } catch (err) {
+    s.fail("File scan failed");
+    printWarn(`Could not scan files: ${err instanceof Error ? err.message : String(err)}`);
+    process.exitCode = 1;
+    return;
+  }
+  s.succeed(`Found ${files.length} files`);
+  const issues = [];
+  let currentFile = "";
+  const originalWarn = console.warn;
+  console.warn = (...args) => {
+    const message = args.map(String).join(" ");
+    if (message.startsWith("[csszyx]")) {
+      issues.push({ file: currentFile, message: message.replace(/^\[csszyx\]\s*/, "") });
+    }
+  };
+  try {
+    for (const file of files) {
+      let source;
+      try {
+        source = await readFile(file, "utf8");
+      } catch {
+        continue;
+      }
+      if (!source.includes("sz")) {
+        continue;
+      }
+      currentFile = path__default.relative(cwd, file);
+      try {
+        transformSourceCode(source, file, { rootDir: cwd });
+      } catch {
+      }
+    }
+  } finally {
+    console.warn = originalWarn;
+  }
+  if (issues.length === 0) {
+    printSuccess(`No sz issues found across ${files.length} files.`);
+    return;
+  }
+  const byFile = /* @__PURE__ */ new Map();
+  for (const { file, message } of issues) {
+    const list = byFile.get(file) ?? [];
+    list.push(message);
+    byFile.set(file, list);
+  }
+  for (const [file, messages] of byFile) {
+    printWarn(file);
+    for (const message of messages) {
+      printInfo(`  ${message}`);
+    }
+  }
+  printWarn(`
+\u2716 ${issues.length} sz issue(s) in ${byFile.size} file(s).`);
+  process.exitCode = 1;
+}
+
 function detectFramework(cwd) {
   try {
     const pkgPath = path__default.join(cwd, "package.json");
@@ -1445,6 +1520,71 @@ function normalizeDebounceMs(debounceMs) {
   return parsed;
 }
 
+const DEFAULT_IGNORE = [
+  "**/node_modules/**",
+  "**/dist/**",
+  "**/build/**",
+  "**/.next/**",
+  "**/.nuxt/**",
+  "**/.astro/**"
+];
+const CLASS_SELECTOR_RE = /\.(-?[a-z_][\w-]*)/gi;
+function stripNonSelectorText(css) {
+  return css.replace(/\/\*[\s\S]*?\*\//g, " ").replace(/\/\/[^\n]*/g, " ").replace(/url\([^)]*\)/gi, " ").replace(/'[^']*'/g, " ").replace(/"[^"]*"/g, " ");
+}
+function looksLikeToken(name) {
+  return /^[a-z][a-z0-9]{0,2}$/i.test(name);
+}
+async function scanCollisions(options = {}) {
+  const cwd = options.cwd ?? process.cwd();
+  const patterns = options.pattern ? [options.pattern] : ["**/*.{css,scss,sass,less}"];
+  const ignore = [...DEFAULT_IGNORE, ...options.ignore ?? []];
+  printHeader("csszyx scan-collisions \u2014 mangle token risks");
+  const s = spinner.start("Scanning stylesheets...");
+  let files;
+  try {
+    files = await fg(patterns, { cwd, ignore, absolute: true });
+  } catch (err) {
+    s.fail("Stylesheet scan failed");
+    printWarn(`Could not scan files: ${err instanceof Error ? err.message : String(err)}`);
+    process.exitCode = 1;
+    return;
+  }
+  s.succeed(`Scanned ${files.length} stylesheet(s)`);
+  const risky = /* @__PURE__ */ new Map();
+  for (const file of files) {
+    let css;
+    try {
+      css = await readFile(file, "utf8");
+    } catch {
+      continue;
+    }
+    const rel = path__default.relative(cwd, file);
+    for (const match of stripNonSelectorText(css).matchAll(CLASS_SELECTOR_RE)) {
+      const name = match[1];
+      if (looksLikeToken(name)) {
+        (risky.get(name) ?? risky.set(name, /* @__PURE__ */ new Set()).get(name))?.add(rel);
+      }
+    }
+  }
+  if (risky.size === 0) {
+    printSuccess("No collision-prone class names found \u2014 mangling is safe to enable.");
+    return;
+  }
+  const names = sortStrings(risky.keys());
+  printWarn(`${names.length} class name(s) could collide with a mangled token:`);
+  for (const name of names) {
+    const where = [...risky.get(name) ?? []].slice(0, 3).join(", ");
+    printInfo(`  .${name}  (in ${where})`);
+  }
+  printInfo("\nPreferred: rename these in your own CSS to something specific");
+  printInfo("  (e.g. `.x` \u2192 `.resize-handle-x`) \u2014 short names also clash on");
+  printInfo("  specificity with other libraries.");
+  printInfo("\nFor names in a third-party stylesheet you cannot edit, reserve them:");
+  printInfo(`  production: { mangle: true, mangleExclude: ${JSON.stringify(names)} }`);
+  process.exitCode = 1;
+}
+
 const cli = cac("csszyx");
 normalizeNextCommandAlias(process.argv);
 function readCliVersion() {
@@ -1500,6 +1640,23 @@ cli.command("doctor", "Diagnose mangling issues").option("--verbose", "Show deta
     cwd: options.cwd
   });
 });
+cli.command("check", "Scan the whole project for unknown/aliased sz keys (CI-friendly)").option("--pattern <glob>", "Glob of source files to scan").option("--ignore <glob>", "Extra ignore glob (repeatable)").option("--cwd <dir>", "Current working directory").action(async (options) => {
+  await check({
+    cwd: options.cwd,
+    pattern: options.pattern,
+    ignore: options.ignore ? Array.isArray(options.ignore) ? options.ignore : [options.ignore] : void 0
+  });
+});
+cli.command(
+  "scan-collisions",
+  "Find class names that could collide with a mangled token (for production.mangleExclude)"
+).option("--pattern <glob>", "Glob of stylesheet files to scan").option("--ignore <glob>", "Extra ignore glob (repeatable)").option("--cwd <dir>", "Current working directory").action(async (options) => {
+  await scanCollisions({
+    cwd: options.cwd,
+    pattern: options.pattern,
+    ignore: options.ignore ? Array.isArray(options.ignore) ? options.ignore : [options.ignore] : void 0
+  });
+});
 cli.command("explain <sz>", "Print the Tailwind className an sz object compiles to").action(
   (sz) => {
     explain(sz);

package/dist/index.mjs

@@ -1,9 +1,9 @@
-export { c as classNameToSzObject, e as extractScreenKeys, a as extractSpacingKeys, f as findConfigFile, b as flattenColors, g as generateAndWriteTypes, d as generateTypeDeclarations, h as generateTypes, t as migrateSource, s as scanTailwindConfig, w as writeDeclarationFile } from './shared/cli.C2lx9IpE.mjs';
+export { c as classNameToSzObject, e as extractScreenKeys, a as extractSpacingKeys, f as findConfigFile, b as flattenColors, g as generateAndWriteTypes, d as generateTypeDeclarations, h as generateTypes, t as migrateSource, s as scanTailwindConfig, w as writeDeclarationFile } from './shared/cli.DXHBKEV9.mjs';
 import 'node:path';
 import 'node:fs';
 import 'node:fs/promises';
 import 'node:url';
+import '@csszyx/compiler';
 import 'tailwindcss/resolveConfig.js';
 import '@babel/parser';
 import '@babel/types';
-import '@csszyx/compiler';

package/dist/shared/{cli.C2lx9IpE.mjs → cli.DXHBKEV9.mjs}

@@ -2,10 +2,10 @@ import { resolve, dirname } from 'node:path';
 import { existsSync, writeFileSync } from 'node:fs';
 import { mkdir } from 'node:fs/promises';
 import { pathToFileURL } from 'node:url';
+import { sortStrings, REMOVED_BOOLEAN_SUGAR, SUGGESTION_MAP } from '@csszyx/compiler';
 import resolveConfig from 'tailwindcss/resolveConfig.js';
 import { parse } from '@babel/parser';
 import * as t from '@babel/types';
-import { REMOVED_BOOLEAN_SUGAR, SUGGESTION_MAP } from '@csszyx/compiler';
 
 const CONFIG_FILES = [
   "tailwind.config.ts",
@@ -69,7 +69,7 @@ function flattenColors(colors) {
       }
     }
   }
-  return result.sort();
+  return sortStrings(result);
 }
 function extractSpacingKeys(spacing) {
   return Object.keys(spacing).sort((a, b) => {
@@ -869,113 +869,6 @@ async function generateTypes(options = {}) {
   }
 }
 
-function generateSzExpression(obj) {
-  return `{${objectToString(obj)}}`;
-}
-function generateSzHtmlValue(obj, braces = false) {
-  const s = objectToString(obj);
-  if (braces) {
-    return s;
-  }
-  if (s.startsWith("{ ") && s.endsWith(" }")) {
-    return s.slice(2, -2);
-  }
-  if (s.startsWith("{") && s.endsWith("}")) {
-    return s.slice(1, -1).trim();
-  }
-  return s;
-}
-function generateSzObjectLiteral(obj) {
-  return objectToString(obj);
-}
-function objectToString(obj, indent = 0) {
-  const entries = Object.entries(obj);
-  if (entries.length === 0) {
-    return "{}";
-  }
-  const spaces = " ".repeat(indent);
-  const innerSpaces = " ".repeat(indent + 2);
-  if (entries.length <= 2 && !hasDeepNesting(obj)) {
-    const parts = entries.map(([k, v]) => `${formatKey(k)}: ${formatValue(v, indent)}`);
-    return `{ ${parts.join(", ")} }`;
-  }
-  const lines = entries.map(
-    ([k, v]) => `${innerSpaces}${formatKey(k)}: ${formatValue(v, indent + 2)},`
-  );
-  return `{
-${lines.join("\n")}
-${spaces}}`;
-}
-function hasDeepNesting(obj) {
-  return Object.values(obj).some(
-    (v) => typeof v === "object" && v !== null && !isColorOpacityObj(v) && !isGradientObj(v)
-  );
-}
-function isColorOpacityObj(v) {
-  return typeof v === "object" && v !== null && "color" in v && "op" in v;
-}
-function isGradientObj(v) {
-  return typeof v === "object" && v !== null && "gradient" in v;
-}
-function formatKey(key) {
-  if (/^[a-z_$][\w$]*$/i.test(key)) {
-    return key;
-  }
-  return `'${key}'`;
-}
-function formatValue(value, indent) {
-  if (value === true) {
-    return "true";
-  }
-  if (value === false) {
-    return "false";
-  }
-  if (value === null) {
-    return "null";
-  }
-  if (typeof value === "number") {
-    return String(value);
-  }
-  if (typeof value === "string") {
-    return `'${escapeString(value)}'`;
-  }
-  if (Array.isArray(value)) {
-    const items = value.map((v) => formatValue(v, indent));
-    return `[${items.join(", ")}]`;
-  }
-  if (typeof value === "object") {
-    if (isColorOpacityObj(value)) {
-      const parts = [`color: '${escapeString(String(value.color))}'`];
-      if (typeof value.op === "number") {
-        parts.push(`op: ${value.op}`);
-      } else {
-        parts.push(`op: '${escapeString(String(value.op))}'`);
-      }
-      return `{ ${parts.join(", ")} }`;
-    }
-    if (isGradientObj(value)) {
-      const grad = value;
-      const parts = [`gradient: '${grad.gradient}'`];
-      if ("dir" in grad) {
-        if (typeof grad.dir === "number") {
-          parts.push(`dir: ${grad.dir}`);
-        } else {
-          parts.push(`dir: '${escapeString(String(grad.dir))}'`);
-        }
-      }
-      if ("in" in grad) {
-        parts.push(`in: '${escapeString(String(grad.in))}'`);
-      }
-      return `{ ${parts.join(", ")} }`;
-    }
-    return objectToString(value, indent);
-  }
-  return String(value);
-}
-function escapeString(s) {
-  return s.replace(/\\/g, "\\\\").replace(/'/g, "\\'");
-}
-
 const REVERSE_PROPERTY_MAP = {
   // Background (ambiguous — disambiguated in class-parser)
   bg: "bg",
@@ -2474,6 +2367,113 @@ function parseStringValue(value) {
   return value;
 }
 
+function generateSzExpression(obj) {
+  return `{${objectToString(obj)}}`;
+}
+function generateSzHtmlValue(obj, braces = false) {
+  const s = objectToString(obj);
+  if (braces) {
+    return s;
+  }
+  if (s.startsWith("{ ") && s.endsWith(" }")) {
+    return s.slice(2, -2);
+  }
+  if (s.startsWith("{") && s.endsWith("}")) {
+    return s.slice(1, -1).trim();
+  }
+  return s;
+}
+function generateSzObjectLiteral(obj) {
+  return objectToString(obj);
+}
+function objectToString(obj, indent = 0) {
+  const entries = Object.entries(obj);
+  if (entries.length === 0) {
+    return "{}";
+  }
+  const spaces = " ".repeat(indent);
+  const innerSpaces = " ".repeat(indent + 2);
+  if (entries.length <= 2 && !hasDeepNesting(obj)) {
+    const parts = entries.map(([k, v]) => `${formatKey(k)}: ${formatValue(v, indent)}`);
+    return `{ ${parts.join(", ")} }`;
+  }
+  const lines = entries.map(
+    ([k, v]) => `${innerSpaces}${formatKey(k)}: ${formatValue(v, indent + 2)},`
+  );
+  return `{
+${lines.join("\n")}
+${spaces}}`;
+}
+function hasDeepNesting(obj) {
+  return Object.values(obj).some(
+    (v) => typeof v === "object" && v !== null && !isColorOpacityObj(v) && !isGradientObj(v)
+  );
+}
+function isColorOpacityObj(v) {
+  return typeof v === "object" && v !== null && "color" in v && "op" in v;
+}
+function isGradientObj(v) {
+  return typeof v === "object" && v !== null && "gradient" in v;
+}
+function formatKey(key) {
+  if (/^[a-z_$][\w$]*$/i.test(key)) {
+    return key;
+  }
+  return `'${key}'`;
+}
+function formatValue(value, indent) {
+  if (value === true) {
+    return "true";
+  }
+  if (value === false) {
+    return "false";
+  }
+  if (value === null) {
+    return "null";
+  }
+  if (typeof value === "number") {
+    return String(value);
+  }
+  if (typeof value === "string") {
+    return `'${escapeString(value)}'`;
+  }
+  if (Array.isArray(value)) {
+    const items = value.map((v) => formatValue(v, indent));
+    return `[${items.join(", ")}]`;
+  }
+  if (typeof value === "object") {
+    if (isColorOpacityObj(value)) {
+      const parts = [`color: '${escapeString(String(value.color))}'`];
+      if (typeof value.op === "number") {
+        parts.push(`op: ${value.op}`);
+      } else {
+        parts.push(`op: '${escapeString(String(value.op))}'`);
+      }
+      return `{ ${parts.join(", ")} }`;
+    }
+    if (isGradientObj(value)) {
+      const grad = value;
+      const parts = [`gradient: '${grad.gradient}'`];
+      if ("dir" in grad) {
+        if (typeof grad.dir === "number") {
+          parts.push(`dir: ${grad.dir}`);
+        } else {
+          parts.push(`dir: '${escapeString(String(grad.dir))}'`);
+        }
+      }
+      if ("in" in grad) {
+        parts.push(`in: '${escapeString(String(grad.in))}'`);
+      }
+      return `{ ${parts.join(", ")} }`;
+    }
+    return objectToString(value, indent);
+  }
+  return String(value);
+}
+function escapeString(s) {
+  return s.replace(/\\/g, "\\\\").replace(/'/g, "\\'");
+}
+
 function tokenize(className) {
   return className.trim().split(/\s+/).filter(Boolean);
 }
@@ -3244,6 +3244,24 @@ function normalizeSzObject(obj, replacements) {
       count++;
       continue;
     }
+    if (keyName === "font" && key.start != null && key.end != null) {
+      let fontValue = null;
+      if (t.isStringLiteral(prop.value)) {
+        fontValue = prop.value.value;
+      } else if (t.isNumericLiteral(prop.value)) {
+        fontValue = String(prop.value.value);
+      }
+      const resolved = fontValue !== null ? disambiguateFont(fontValue)?.prop : void 0;
+      if (resolved && resolved !== "font") {
+        replacements.push({
+          start: key.start,
+          end: key.end,
+          text: t.isStringLiteral(key) ? `'${resolved}'` : resolved
+        });
+        count++;
+        continue;
+      }
+    }
     const suggestion = SUGGESTION_MAP[keyName];
     if (suggestion && isCleanCanonicalTarget(suggestion) && suggestion !== keyName && key.start != null && key.end != null) {
       replacements.push({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@csszyx/cli",
-  "version": "0.10.7",
+  "version": "0.10.9",
   "description": "Command-line tools for csszyx",
   "keywords": [
     "csszyx",
@@ -49,9 +49,9 @@
     "picocolors": "^1.0.0",
     "prompts": "^2.4.2",
     "tailwindcss": "^3.4.1",
-    "@csszyx/compiler": "0.10.7",
-    "@csszyx/unplugin": "0.10.7",
-    "@csszyx/types": "0.10.7"
+    "@csszyx/compiler": "0.10.9",
+    "@csszyx/unplugin": "0.10.9",
+    "@csszyx/types": "0.10.9"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
@@ -59,7 +59,7 @@
     "@types/prompts": "^2.4.9",
     "typescript": "^6.0.3",
     "unbuild": "^3.6.1",
-    "vitest": "^4.1.6"
+    "vitest": "^4.1.9"
   },
   "sideEffects": false,
   "engines": {