tailwindcss-patch 8.2.3 → 8.3.0

package/dist/{chunk-KH3TRSVT.mjs → chunk-SN7IO2IS.mjs}

@@ -285,105 +285,6 @@ function groupTokensByFile(report, options) {
   }, {});
 }
 
-// src/options/legacy.ts
-function normalizeLegacyFeatures(patch) {
-  const apply = patch?.applyPatches;
-  const extend = apply?.extendLengthUnits;
-  let extendOption = false;
-  if (extend && typeof extend === "object") {
-    extendOption = {
-      ...extend,
-      enabled: true
-    };
-  } else if (extend === true) {
-    extendOption = {
-      enabled: true,
-      units: ["rpx"],
-      overwrite: patch?.overwrite
-    };
-  }
-  return {
-    exposeContext: apply?.exportContext ?? true,
-    extendLengthUnits: extendOption
-  };
-}
-function fromLegacyOptions(options) {
-  if (!options) {
-    return {};
-  }
-  const patch = options.patch;
-  const features = normalizeLegacyFeatures(patch);
-  const output = patch?.output;
-  const tailwindConfig = patch?.tailwindcss;
-  const tailwindVersion = tailwindConfig?.version;
-  const tailwindV2 = tailwindConfig?.v2;
-  const tailwindV3 = tailwindConfig?.v3;
-  const tailwindV4 = tailwindConfig?.v4;
-  const tailwindConfigPath = tailwindV3?.config ?? tailwindV2?.config;
-  const tailwindCwd = tailwindV3?.cwd ?? tailwindV2?.cwd ?? patch?.cwd;
-  return {
-    cwd: patch?.cwd,
-    overwrite: patch?.overwrite,
-    filter: patch?.filter,
-    cache: typeof options.cache === "boolean" ? options.cache : options.cache ? {
-      ...options.cache,
-      enabled: options.cache.enabled ?? true
-    } : void 0,
-    output: output ? {
-      file: output.filename,
-      pretty: output.loose ? 2 : false,
-      removeUniversalSelector: output.removeUniversalSelector
-    } : void 0,
-    tailwind: {
-      packageName: patch?.packageName,
-      version: tailwindVersion,
-      resolve: patch?.resolve,
-      config: tailwindConfigPath,
-      cwd: tailwindCwd,
-      v2: tailwindV2,
-      v3: tailwindV3,
-      v4: tailwindV4
-    },
-    features: {
-      exposeContext: features.exposeContext,
-      extendLengthUnits: features.extendLengthUnits
-    }
-  };
-}
-function fromUnifiedConfig(registry) {
-  if (!registry) {
-    return {};
-  }
-  const tailwind = registry.tailwind;
-  const output = registry.output;
-  const pretty = (() => {
-    if (output?.pretty === void 0) {
-      return void 0;
-    }
-    if (typeof output.pretty === "boolean") {
-      return output.pretty ? 2 : false;
-    }
-    return output.pretty;
-  })();
-  return {
-    output: output ? {
-      file: output.file,
-      pretty,
-      removeUniversalSelector: output.stripUniversalSelector
-    } : void 0,
-    tailwind: tailwind ? {
-      version: tailwind.version,
-      packageName: tailwind.package,
-      resolve: tailwind.resolve,
-      config: tailwind.config,
-      cwd: tailwind.cwd,
-      v2: tailwind.legacy,
-      v3: tailwind.classic,
-      v4: tailwind.next
-    } : void 0
-  };
-}
-
 // src/options/normalize.ts
 import process2 from "process";
 import path2 from "pathe";
@@ -479,9 +380,12 @@ function normalizeExtendLengthUnitsOptions(features) {
   };
 }
 function normalizeTailwindV4Options(v4, fallbackBase) {
-  const base = v4?.base ? path2.resolve(v4.base) : fallbackBase;
+  const configuredBase = v4?.base ? path2.resolve(v4.base) : void 0;
+  const base = configuredBase ?? fallbackBase;
   const cssEntries = Array.isArray(v4?.cssEntries) ? v4.cssEntries.filter((entry) => Boolean(entry)).map((entry) => path2.resolve(entry)) : [];
-  const sources = v4?.sources?.length ? v4.sources : [
+  const userSources = v4?.sources;
+  const hasUserDefinedSources = Boolean(userSources?.length);
+  const sources = hasUserDefinedSources ? userSources : [
     {
       base,
       pattern: "**/*",
@@ -490,9 +394,11 @@ function normalizeTailwindV4Options(v4, fallbackBase) {
   ];
   return {
     base,
+    configuredBase,
     css: v4?.css,
     cssEntries,
-    sources
+    sources,
+    hasUserDefinedSources
   };
 }
 function normalizeTailwindOptions(tailwind, projectRoot) {
@@ -598,13 +504,31 @@ async function collectClassesFromTailwindV4(options) {
   if (!v4Options) {
     return set;
   }
-  const sources = v4Options.sources?.map((source) => {
-    return {
-      base: source.base ?? v4Options.base ?? process3.cwd(),
+  const toAbsolute = (value) => {
+    if (!value) {
+      return void 0;
+    }
+    return path3.isAbsolute(value) ? value : path3.resolve(options.projectRoot, value);
+  };
+  const resolvedConfiguredBase = toAbsolute(v4Options.configuredBase);
+  const resolvedDefaultBase = toAbsolute(v4Options.base) ?? process3.cwd();
+  const resolveSources = (base) => {
+    if (!v4Options.sources?.length) {
+      return void 0;
+    }
+    if (!v4Options.hasUserDefinedSources && !resolvedConfiguredBase) {
+      return v4Options.sources.map((source) => ({
+        base,
+        pattern: source.pattern,
+        negated: source.negated
+      }));
+    }
+    return v4Options.sources.map((source) => ({
+      base: source.base ?? base,
       pattern: source.pattern,
       negated: source.negated
-    };
-  });
+    }));
+  };
   if (v4Options.cssEntries.length > 0) {
     for (const entry of v4Options.cssEntries) {
       const filePath = path3.isAbsolute(entry) ? entry : path3.resolve(options.projectRoot, entry);
@@ -612,9 +536,12 @@ async function collectClassesFromTailwindV4(options) {
         continue;
       }
       const css = await fs3.readFile(filePath, "utf8");
+      const entryDir = path3.dirname(filePath);
+      const baseForEntry = resolvedConfiguredBase ?? entryDir;
+      const sources = resolveSources(baseForEntry);
       const candidates = await extractValidCandidates({
         cwd: options.projectRoot,
-        base: v4Options.base,
+        base: baseForEntry,
         css,
         sources
       });
@@ -625,9 +552,11 @@ async function collectClassesFromTailwindV4(options) {
       }
     }
   } else {
+    const baseForCss = resolvedConfiguredBase ?? resolvedDefaultBase;
+    const sources = resolveSources(baseForCss);
     const candidates = await extractValidCandidates({
       cwd: options.projectRoot,
-      base: v4Options.base,
+      base: baseForCss,
       css: v4Options.css,
       sources
     });
@@ -733,6 +662,105 @@ import { getPackageInfoSync } from "local-pkg";
 import path8 from "pathe";
 import { coerce } from "semver";
 
+// src/options/legacy.ts
+function normalizeLegacyFeatures(patch) {
+  const apply = patch?.applyPatches;
+  const extend = apply?.extendLengthUnits;
+  let extendOption = false;
+  if (extend && typeof extend === "object") {
+    extendOption = {
+      ...extend,
+      enabled: true
+    };
+  } else if (extend === true) {
+    extendOption = {
+      enabled: true,
+      units: ["rpx"],
+      overwrite: patch?.overwrite
+    };
+  }
+  return {
+    exposeContext: apply?.exportContext ?? true,
+    extendLengthUnits: extendOption
+  };
+}
+function fromLegacyOptions(options) {
+  if (!options) {
+    return {};
+  }
+  const patch = options.patch;
+  const features = normalizeLegacyFeatures(patch);
+  const output = patch?.output;
+  const tailwindConfig = patch?.tailwindcss;
+  const tailwindVersion = tailwindConfig?.version;
+  const tailwindV2 = tailwindConfig?.v2;
+  const tailwindV3 = tailwindConfig?.v3;
+  const tailwindV4 = tailwindConfig?.v4;
+  const tailwindConfigPath = tailwindV3?.config ?? tailwindV2?.config;
+  const tailwindCwd = tailwindV3?.cwd ?? tailwindV2?.cwd ?? patch?.cwd;
+  return {
+    cwd: patch?.cwd,
+    overwrite: patch?.overwrite,
+    filter: patch?.filter,
+    cache: typeof options.cache === "boolean" ? options.cache : options.cache ? {
+      ...options.cache,
+      enabled: options.cache.enabled ?? true
+    } : void 0,
+    output: output ? {
+      file: output.filename,
+      pretty: output.loose ? 2 : false,
+      removeUniversalSelector: output.removeUniversalSelector
+    } : void 0,
+    tailwind: {
+      packageName: patch?.packageName,
+      version: tailwindVersion,
+      resolve: patch?.resolve,
+      config: tailwindConfigPath,
+      cwd: tailwindCwd,
+      v2: tailwindV2,
+      v3: tailwindV3,
+      v4: tailwindV4
+    },
+    features: {
+      exposeContext: features.exposeContext,
+      extendLengthUnits: features.extendLengthUnits
+    }
+  };
+}
+function fromUnifiedConfig(registry) {
+  if (!registry) {
+    return {};
+  }
+  const tailwind = registry.tailwind;
+  const output = registry.output;
+  const pretty = (() => {
+    if (output?.pretty === void 0) {
+      return void 0;
+    }
+    if (typeof output.pretty === "boolean") {
+      return output.pretty ? 2 : false;
+    }
+    return output.pretty;
+  })();
+  return {
+    output: output ? {
+      file: output.file,
+      pretty,
+      removeUniversalSelector: output.stripUniversalSelector
+    } : void 0,
+    tailwind: tailwind ? {
+      version: tailwind.version,
+      packageName: tailwind.package,
+      resolve: tailwind.resolve,
+      config: tailwind.config,
+      cwd: tailwind.cwd,
+      v2: tailwind.legacy,
+      v3: tailwind.classic,
+      v4: tailwind.next
+    } : void 0
+  };
+}
+
 // src/patching/operations/export-context/index.ts
 import fs5 from "fs-extra";
 import path6 from "pathe";
@@ -774,8 +802,8 @@ function transformProcessTailwindFeaturesReturnContextV2(content) {
   });
   let hasPatched = false;
   traverse(ast, {
-    FunctionDeclaration(path9) {
-      const node = path9.node;
+    FunctionDeclaration(path10) {
+      const node = path10.node;
       if (node.id?.name !== "processTailwindFeatures" || node.body.body.length !== 1 || !t.isReturnStatement(node.body.body[0])) {
         return;
       }
@@ -806,8 +834,8 @@ function transformPostcssPluginV2(content, options) {
   const ast = parse(content);
   let hasPatched = false;
   traverse(ast, {
-    Program(path9) {
-      const program = path9.node;
+    Program(path10) {
+      const program = path10.node;
       const index = program.body.findIndex((statement) => {
         return t.isFunctionDeclaration(statement) && statement.id?.name === "_default";
       });
@@ -841,11 +869,11 @@ function transformPostcssPluginV2(content, options) {
         );
       }
     },
-    FunctionDeclaration(path9) {
+    FunctionDeclaration(path10) {
       if (hasPatched) {
         return;
       }
-      const fn = path9.node;
+      const fn = path10.node;
       if (fn.id?.name !== "_default") {
         return;
       }
@@ -934,8 +962,8 @@ function transformProcessTailwindFeaturesReturnContext(content) {
   const ast = parse(content);
   let hasPatched = false;
   traverse(ast, {
-    FunctionDeclaration(path9) {
-      const node = path9.node;
+    FunctionDeclaration(path10) {
+      const node = path10.node;
       if (node.id?.name !== "processTailwindFeatures" || node.body.body.length !== 1) {
         return;
       }
@@ -967,8 +995,8 @@ function transformPostcssPlugin(content, { refProperty }) {
   const valueMember = t2.memberExpression(refIdentifier, t2.identifier("value"));
   let hasPatched = false;
   traverse(ast, {
-    Program(path9) {
-      const program = path9.node;
+    Program(path10) {
+      const program = path10.node;
       const index = program.body.findIndex((statement) => {
         return t2.isExpressionStatement(statement) && t2.isAssignmentExpression(statement.expression) && t2.isMemberExpression(statement.expression.left) && t2.isFunctionExpression(statement.expression.right) && statement.expression.right.id?.name === "tailwindcss";
       });
@@ -1006,11 +1034,11 @@ function transformPostcssPlugin(content, { refProperty }) {
         );
       }
     },
-    FunctionExpression(path9) {
+    FunctionExpression(path10) {
       if (hasPatched) {
         return;
       }
-      const fn = path9.node;
+      const fn = path10.node;
       if (fn.id?.name !== "tailwindcss" || fn.body.body.length !== 1) {
         return;
       }
@@ -1176,21 +1204,21 @@ function updateLengthUnitsArray(content, options) {
   let arrayRef;
   let changed = false;
   traverse(ast, {
-    Identifier(path9) {
-      if (path9.node.name === variableName && t3.isVariableDeclarator(path9.parent) && t3.isArrayExpression(path9.parent.init)) {
-        arrayRef = path9.parent.init;
+    Identifier(path10) {
+      if (path10.node.name === variableName && t3.isVariableDeclarator(path10.parent) && t3.isArrayExpression(path10.parent.init)) {
+        arrayRef = path10.parent.init;
         const existing = new Set(
-          path9.parent.init.elements.map((element) => t3.isStringLiteral(element) ? element.value : void 0).filter(Boolean)
+          path10.parent.init.elements.map((element) => t3.isStringLiteral(element) ? element.value : void 0).filter(Boolean)
         );
         for (const unit of units) {
           if (!existing.has(unit)) {
-            path9.parent.init.elements = path9.parent.init.elements.map((element) => {
+            path10.parent.init.elements = path10.parent.init.elements.map((element) => {
               if (t3.isStringLiteral(element)) {
                 return t3.stringLiteral(element.value);
               }
               return element;
             });
-            path9.parent.init.elements.push(t3.stringLiteral(unit));
+            path10.parent.init.elements.push(t3.stringLiteral(unit));
             changed = true;
           }
         }
@@ -1271,13 +1299,13 @@ function applyExtendLengthUnitsPatchV4(rootDir, options) {
     const { code, file, match } = item;
     const ast = parse(match[0], { sourceType: "unambiguous" });
     traverse(ast, {
-      ArrayExpression(path9) {
+      ArrayExpression(path10) {
         for (const unit of opts.units) {
-          if (path9.node.elements.some((element) => t3.isStringLiteral(element) && element.value === unit)) {
+          if (path10.node.elements.some((element) => t3.isStringLiteral(element) && element.value === unit)) {
             item.hasPatched = true;
             return;
           }
-          path9.node.elements.push(t3.stringLiteral(unit));
+          path10.node.elements.push(t3.stringLiteral(unit));
         }
       }
     });
@@ -1530,6 +1558,287 @@ var TailwindcssPatcher = class {
   }
 };
 
+// src/cli/commands.ts
+import process5 from "process";
+import { CONFIG_NAME, getConfig, initConfig } from "@tailwindcss-mangle/config";
+
+// ../../node_modules/.pnpm/defu@6.1.4/node_modules/defu/dist/defu.mjs
+function isPlainObject(value) {
+  if (value === null || typeof value !== "object") {
+    return false;
+  }
+  const prototype = Object.getPrototypeOf(value);
+  if (prototype !== null && prototype !== Object.prototype && Object.getPrototypeOf(prototype) !== null) {
+    return false;
+  }
+  if (Symbol.iterator in value) {
+    return false;
+  }
+  if (Symbol.toStringTag in value) {
+    return Object.prototype.toString.call(value) === "[object Module]";
+  }
+  return true;
+}
+function _defu(baseObject, defaults, namespace = ".", merger) {
+  if (!isPlainObject(defaults)) {
+    return _defu(baseObject, {}, namespace, merger);
+  }
+  const object = Object.assign({}, defaults);
+  for (const key in baseObject) {
+    if (key === "__proto__" || key === "constructor") {
+      continue;
+    }
+    const value = baseObject[key];
+    if (value === null || value === void 0) {
+      continue;
+    }
+    if (merger && merger(object, key, value, namespace)) {
+      continue;
+    }
+    if (Array.isArray(value) && Array.isArray(object[key])) {
+      object[key] = [...value, ...object[key]];
+    } else if (isPlainObject(value) && isPlainObject(object[key])) {
+      object[key] = _defu(
+        value,
+        object[key],
+        (namespace ? `${namespace}.` : "") + key.toString(),
+        merger
+      );
+    } else {
+      object[key] = value;
+    }
+  }
+  return object;
+}
+function createDefu(merger) {
+  return (...arguments_) => (
+    // eslint-disable-next-line unicorn/no-array-reduce
+    arguments_.reduce((p, c) => _defu(p, c, "", merger), {})
+  );
+}
+var defu = createDefu();
+var defuFn = createDefu((object, key, currentValue) => {
+  if (object[key] !== void 0 && typeof currentValue === "function") {
+    object[key] = currentValue(object[key]);
+    return true;
+  }
+});
+var defuArrayFn = createDefu((object, key, currentValue) => {
+  if (Array.isArray(object[key]) && typeof currentValue === "function") {
+    object[key] = currentValue(object[key]);
+    return true;
+  }
+});
+
+// ../shared/src/utils.ts
+var defuOverrideArray = createDefu((obj, key, value) => {
+  if (Array.isArray(obj[key]) && Array.isArray(value)) {
+    obj[key] = value;
+    return true;
+  }
+});
+var preserveClassNames = [
+  // https://tailwindcss.com/docs/transition-timing-function start
+  // https://github.com/sonofmagic/tailwindcss-mangle/issues/21
+  "ease-out",
+  "ease-linear",
+  "ease-in",
+  "ease-in-out"
+  // https://tailwindcss.com/docs/transition-timing-function end
+];
+var preserveClassNamesMap = preserveClassNames.reduce((acc, cur) => {
+  acc[cur] = true;
+  return acc;
+}, {});
+var acceptChars = [..."abcdefghijklmnopqrstuvwxyz"];
+
+// src/cli/commands.ts
+import cac from "cac";
+import fs8 from "fs-extra";
+import path9 from "pathe";
+var tailwindcssPatchCommands = [
+  "install",
+  "extract",
+  "tokens",
+  "init"
+];
+function createTailwindcssPatchCli(options = {}) {
+  const cli = cac(options.name ?? "tw-patch");
+  mountTailwindcssPatchCommands(cli, options.mountOptions);
+  return cli;
+}
+function mountTailwindcssPatchCommands(cli, options = {}) {
+  const prefix = options.commandPrefix ?? "";
+  const selectedCommands = options.commands ?? tailwindcssPatchCommands;
+  const TOKEN_FORMATS = ["json", "lines", "grouped-json"];
+  const registrars = {
+    install() {
+      const { name, aliases } = resolveCommandNames("install", options, prefix);
+      const command = cli.command(name, "Apply Tailwind CSS runtime patches").option("--cwd <dir>", "Working directory", { default: process5.cwd() }).action(async (args) => {
+        const patchOptions = await loadPatchOptions(args.cwd);
+        const patcher = new TailwindcssPatcher(patchOptions);
+        await patcher.patch();
+        logger_default.success("Tailwind CSS runtime patched successfully.");
+      });
+      aliases.forEach((alias) => command.alias(alias));
+    },
+    extract() {
+      const { name, aliases } = resolveCommandNames("extract", options, prefix);
+      const command = cli.command(name, "Collect generated class names into a cache file").option("--cwd <dir>", "Working directory", { default: process5.cwd() }).option("--output <file>", "Override output file path").option("--format <format>", "Output format (json|lines)").option("--css <file>", "Tailwind CSS entry CSS when using v4").option("--no-write", "Skip writing to disk").action(async (args) => {
+        const overrides = {};
+        if (args.output || args.format) {
+          overrides.output = {
+            file: args.output,
+            format: args.format
+          };
+        }
+        if (args.css) {
+          overrides.tailwind = {
+            v4: {
+              cssEntries: [args.css]
+            }
+          };
+        }
+        const patchOptions = await loadPatchOptions(args.cwd, overrides);
+        const patcher = new TailwindcssPatcher(patchOptions);
+        const result = await patcher.extract({ write: args.write });
+        if (result.filename) {
+          logger_default.success(`Collected ${result.classList.length} classes \u2192 ${result.filename}`);
+        } else {
+          logger_default.success(`Collected ${result.classList.length} classes.`);
+        }
+      });
+      aliases.forEach((alias) => command.alias(alias));
+    },
+    tokens() {
+      const { name, aliases } = resolveCommandNames("tokens", options, prefix);
+      const command = cli.command(name, "Extract Tailwind tokens with file/position metadata").option("--cwd <dir>", "Working directory", { default: process5.cwd() }).option("--output <file>", "Override output file path", { default: ".tw-patch/tw-token-report.json" }).option("--format <format>", "Output format (json|lines|grouped-json)", { default: "json" }).option("--group-key <key>", "Grouping key for grouped-json output (relative|absolute)", { default: "relative" }).option("--no-write", "Skip writing to disk").action(async (args) => {
+        const patchOptions = await loadPatchOptions(args.cwd);
+        const patcher = new TailwindcssPatcher(patchOptions);
+        const report = await patcher.collectContentTokens();
+        const shouldWrite = args.write ?? true;
+        let format = args.format ?? "json";
+        if (!TOKEN_FORMATS.includes(format)) {
+          format = "json";
+        }
+        const targetFile = args.output ?? ".tw-patch/tw-token-report.json";
+        const groupKey = args.groupKey === "absolute" ? "absolute" : "relative";
+        const buildGrouped = () => groupTokensByFile(report, {
+          key: groupKey,
+          stripAbsolutePaths: groupKey !== "absolute"
+        });
+        const grouped = format === "grouped-json" ? buildGrouped() : null;
+        const resolveGrouped = () => grouped ?? buildGrouped();
+        if (shouldWrite) {
+          const target = path9.resolve(targetFile);
+          await fs8.ensureDir(path9.dirname(target));
+          if (format === "json") {
+            await fs8.writeJSON(target, report, { spaces: 2 });
+          } else if (format === "grouped-json") {
+            await fs8.writeJSON(target, resolveGrouped(), { spaces: 2 });
+          } else {
+            const lines = report.entries.map(formatTokenLine);
+            await fs8.writeFile(target, `${lines.join("\n")}
+`, "utf8");
+          }
+          logger_default.success(
+            `Collected ${report.entries.length} tokens (${format}) \u2192 ${target.replace(process5.cwd(), ".")}`
+          );
+        } else {
+          logger_default.success(`Collected ${report.entries.length} tokens from ${report.filesScanned} files.`);
+          if (format === "lines") {
+            const preview = report.entries.slice(0, 5).map(formatTokenLine).join("\n");
+            if (preview) {
+              logger_default.log("");
+              logger_default.info(preview);
+              if (report.entries.length > 5) {
+                logger_default.info(`\u2026and ${report.entries.length - 5} more.`);
+              }
+            }
+          } else if (format === "grouped-json") {
+            const map = resolveGrouped();
+            const { preview, moreFiles } = formatGroupedPreview(map);
+            if (preview) {
+              logger_default.log("");
+              logger_default.info(preview);
+              if (moreFiles > 0) {
+                logger_default.info(`\u2026and ${moreFiles} more files.`);
+              }
+            }
+          } else {
+            const previewEntries = report.entries.slice(0, 3);
+            if (previewEntries.length) {
+              logger_default.log("");
+              logger_default.info(JSON.stringify(previewEntries, null, 2));
+            }
+          }
+        }
+        if (report.skippedFiles.length) {
+          logger_default.warn("Skipped files:");
+          for (const skipped of report.skippedFiles) {
+            logger_default.warn(`  \u2022 ${skipped.file} (${skipped.reason})`);
+          }
+        }
+      });
+      aliases.forEach((alias) => command.alias(alias));
+    },
+    init() {
+      const { name, aliases } = resolveCommandNames("init", options, prefix);
+      const command = cli.command(name, "Generate a tailwindcss-patch config file").option("--cwd <dir>", "Working directory", { default: process5.cwd() }).action(async (args) => {
+        await initConfig(args.cwd);
+        logger_default.success(`\u2728 ${CONFIG_NAME}.config.ts initialized!`);
+      });
+      aliases.forEach((alias) => command.alias(alias));
+    }
+  };
+  for (const name of selectedCommands) {
+    const register = registrars[name];
+    if (register) {
+      register();
+    }
+  }
+  return cli;
+}
+async function loadPatchOptions(cwd, overrides) {
+  const { config } = await getConfig(cwd);
+  const legacyConfig = config;
+  const base = config?.registry ? fromUnifiedConfig(config.registry) : legacyConfig?.patch ? fromLegacyOptions({ patch: legacyConfig.patch }) : {};
+  const merged = defu(overrides ?? {}, base);
+  return merged;
+}
+function resolveCommandNames(command, mountOptions, prefix) {
+  const override = mountOptions.commandOptions?.[command];
+  const baseName = override?.name ?? command;
+  const name = addPrefixIfMissing(baseName, prefix);
+  const aliases = (override?.aliases ?? []).map((alias) => addPrefixIfMissing(alias, prefix));
+  return { name, aliases };
+}
+function addPrefixIfMissing(value, prefix) {
+  if (!prefix || value.startsWith(prefix)) {
+    return value;
+  }
+  return `${prefix}${value}`;
+}
+function formatTokenLine(entry) {
+  return `${entry.relativeFile}:${entry.line}:${entry.column} ${entry.rawCandidate} (${entry.start}-${entry.end})`;
+}
+function formatGroupedPreview(map, limit = 3) {
+  const files = Object.keys(map);
+  if (!files.length) {
+    return { preview: "", moreFiles: 0 };
+  }
+  const lines = files.slice(0, limit).map((file) => {
+    const tokens = map[file];
+    const sample = tokens.slice(0, 3).map((token) => token.rawCandidate).join(", ");
+    const suffix = tokens.length > 3 ? ", \u2026" : "";
+    return `${file}: ${tokens.length} tokens (${sample}${suffix})`;
+  });
+  return {
+    preview: lines.join("\n"),
+    moreFiles: Math.max(0, files.length - limit)
+  };
+}
+
 export {
   logger_default,
   CacheStore,
@@ -1538,12 +1847,13 @@ export {
   extractValidCandidates,
   extractProjectCandidatesWithPositions,
   groupTokensByFile,
-  fromLegacyOptions,
-  fromUnifiedConfig,
   normalizeOptions,
   collectClassesFromContexts,
   collectClassesFromTailwindV4,
   loadRuntimeContexts,
   runTailwindBuild,
-  TailwindcssPatcher
+  TailwindcssPatcher,
+  tailwindcssPatchCommands,
+  createTailwindcssPatchCli,
+  mountTailwindcssPatchCommands
 };