tailwindcss-patch 8.7.4-alpha.0 → 9.0.0-alpha.2

package/dist/{chunk-6ZDYMYHE.mjs → chunk-VDWTCQ74.mjs}

@@ -20,7 +20,7 @@ import path from "pathe";
 // package.json
 var package_default = {
   name: "tailwindcss-patch",
-  version: "8.7.4-alpha.0",
+  version: "9.0.0-alpha.2",
   description: "patch tailwindcss for exposing context and extract classes",
   author: "ice breaker <1324318532@qq.com>",
   license: "MIT",
@@ -41,17 +41,17 @@ var package_default = {
   ],
   exports: {
     ".": {
-      types: "./dist/index.d.ts",
-      import: "./dist/index.mjs",
-      require: "./dist/index.js"
+      types: "./src/index.ts",
+      import: "./src/index.ts",
+      require: "./src/index.ts"
     },
     "./migration-report.schema.json": "./schema/migration-report.schema.json",
     "./restore-result.schema.json": "./schema/restore-result.schema.json",
     "./validate-result.schema.json": "./schema/validate-result.schema.json"
   },
-  main: "./dist/index.js",
-  module: "./dist/index.mjs",
-  types: "./dist/index.d.ts",
+  main: "./src/index.ts",
+  module: "./src/index.ts",
+  types: "./src/index.ts",
   bin: {
     "tw-patch": "dev/bin.ts",
     "tailwindcss-patch": "dev/bin.ts"
@@ -59,18 +59,23 @@ var package_default = {
   files: [
     "bin",
     "dist",
-    "schema"
+    "schema",
+    "src"
   ],
   scripts: {
     dev: "tsup --watch --sourcemap",
     build: "tsup",
     test: "vitest run",
+    "test:types": "pnpm build && tsd --typings dist/index.d.mts --files test-d/**/*.test-d.ts",
     "test:dev": "vitest",
     "bench:cold-start": "node --import tsx bench/cold-start.ts",
     patch: "tsx dev/bin.ts install",
     r0: "tsx dev/bin.ts extract",
     r1: "tsx dev/bin.ts extract --css index.css"
   },
+  tsd: {
+    directory: "test-d"
+  },
   publishConfig: {
     access: "public",
     registry: "https://registry.npmjs.org/",
@@ -1516,14 +1521,6 @@ ${Date.now()}`, { flag: "wx" });
 import process3 from "process";
 import fs3 from "fs-extra";
 import path2 from "pathe";
-var hasWarnedDeprecatedOptions = false;
-var deprecatedOptionMapping = {
-  cwd: "projectRoot",
-  overwrite: "apply.overwrite",
-  tailwind: "tailwindcss",
-  features: "apply",
-  output: "extract"
-};
 function resolveRealpathSafe(value) {
   const resolved = path2.resolve(value);
   try {
@@ -1668,66 +1665,32 @@ function normalizeTailwindOptions(tailwind, projectRoot) {
     v4
   };
 }
-function resolveOptionSlices(options) {
-  const projectRoot = options.projectRoot ?? options.cwd;
-  const overwrite = options.apply?.overwrite ?? options.overwrite;
-  const tailwind = options.tailwindcss ?? options.tailwind;
-  const exposeContext = options.apply?.exposeContext !== void 0 ? options.apply.exposeContext : options.features?.exposeContext;
-  const extendLengthUnits = options.apply?.extendLengthUnits !== void 0 ? options.apply.extendLengthUnits : options.features?.extendLengthUnits;
-  const write = options.extract?.write ?? options.output?.enabled;
-  const file = options.extract?.file ?? options.output?.file;
-  const format = options.extract?.format ?? options.output?.format;
-  const pretty = options.extract?.pretty ?? options.output?.pretty;
-  const removeUniversalSelector = options.extract?.removeUniversalSelector ?? options.output?.removeUniversalSelector;
-  const extract = {
-    ...write === void 0 ? {} : { write },
-    ...file === void 0 ? {} : { file },
-    ...format === void 0 ? {} : { format },
-    ...pretty === void 0 ? {} : { pretty },
-    ...removeUniversalSelector === void 0 ? {} : { removeUniversalSelector }
-  };
-  return {
-    ...projectRoot === void 0 ? {} : { projectRoot },
-    ...overwrite === void 0 ? {} : { overwrite },
-    ...tailwind === void 0 ? {} : { tailwind },
-    ...Object.keys(extract).length === 0 ? {} : { extract },
-    ...exposeContext === void 0 ? {} : { exposeContext },
-    ...extendLengthUnits === void 0 ? {} : { extendLengthUnits }
-  };
-}
-function findUsedDeprecatedOptions(options) {
-  const result = [];
-  for (const key of Object.keys(deprecatedOptionMapping)) {
-    if (options[key] !== void 0) {
-      result.push(key);
-    }
-  }
-  return result;
-}
-function warnDeprecatedOptionsIfNeeded(options) {
-  if (hasWarnedDeprecatedOptions) {
-    return;
-  }
-  const used = findUsedDeprecatedOptions(options);
+var deprecatedOptionMapping = {
+  cwd: "projectRoot",
+  overwrite: "apply.overwrite",
+  tailwind: "tailwindcss",
+  features: "apply",
+  output: "extract"
+};
+function assertNoDeprecatedOptions(options) {
+  const used = Object.keys(deprecatedOptionMapping).filter((key) => Object.prototype.hasOwnProperty.call(options, key));
   if (used.length === 0) {
     return;
   }
-  hasWarnedDeprecatedOptions = true;
   const mapping = used.map((key) => `${key} -> ${deprecatedOptionMapping[key]}`).join(", ");
-  logger_default.warn(
-    `[deprecated] TailwindcssPatcher options (${used.join(", ")}) are deprecated and will be removed in the next major version. Please migrate to: ${mapping}.`
+  throw new Error(
+    `Legacy TailwindcssPatcher options are no longer supported: ${used.join(", ")}. Use the modern fields instead: ${mapping}.`
   );
 }
 function normalizeOptions(options = {}) {
-  warnDeprecatedOptionsIfNeeded(options);
-  const resolved = resolveOptionSlices(options);
-  const projectRoot = resolveRealpathSafe(resolved.projectRoot ? path2.resolve(resolved.projectRoot) : process3.cwd());
-  const overwrite = resolved.overwrite ?? true;
-  const output = normalizeOutputOptions(resolved.extract);
+  assertNoDeprecatedOptions(options);
+  const projectRoot = resolveRealpathSafe(options.projectRoot ? path2.resolve(options.projectRoot) : process3.cwd());
+  const overwrite = options.apply?.overwrite ?? true;
+  const output = normalizeOutputOptions(options.extract);
   const cache = normalizeCacheOptions(options.cache, projectRoot);
-  const tailwind = normalizeTailwindOptions(resolved.tailwind, projectRoot);
-  const exposeContext = normalizeExposeContextOptions(resolved.exposeContext);
-  const extendLengthUnits = normalizeExtendLengthUnitsOptions(resolved.extendLengthUnits);
+  const tailwind = normalizeTailwindOptions(options.tailwindcss, projectRoot);
+  const exposeContext = normalizeExposeContextOptions(options.apply?.exposeContext);
+  const extendLengthUnits = normalizeExtendLengthUnitsOptions(options.apply?.extendLengthUnits);
   const filter = (className) => {
     if (output.removeUniversalSelector && className === "*") {
       return false;
@@ -1752,122 +1715,70 @@ function normalizeOptions(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"],
-      ...patch?.overwrite === void 0 ? {} : { overwrite: patch.overwrite }
-    };
+var deprecatedRegistryMapping = {
+  output: "extract",
+  tailwind: "tailwindcss"
+};
+var deprecatedTailwindMapping = {
+  package: "packageName",
+  legacy: "v2",
+  classic: "v3",
+  next: "v4"
+};
+function assertNoDeprecatedRegistryOptions(registry) {
+  const usedRegistryKeys = Object.keys(deprecatedRegistryMapping).filter((key) => Object.prototype.hasOwnProperty.call(registry, key));
+  if (usedRegistryKeys.length > 0) {
+    const mapping = usedRegistryKeys.map((key) => `${key} -> ${deprecatedRegistryMapping[key]}`).join(", ");
+    throw new Error(
+      `Legacy registry fields are no longer supported: ${usedRegistryKeys.join(", ")}. Use the modern fields instead: ${mapping}.`
+    );
   }
-  return {
-    exposeContext: apply?.exportContext ?? true,
-    extendLengthUnits: extendOption
-  };
-}
-function fromLegacyOptions(options) {
-  if (!options) {
-    return {};
+  const tailwind = registry.tailwindcss;
+  if (!tailwind) {
+    return;
+  }
+  const usedTailwindKeys = Object.keys(deprecatedTailwindMapping).filter((key) => Object.prototype.hasOwnProperty.call(tailwind, key));
+  if (usedTailwindKeys.length > 0) {
+    const mapping = usedTailwindKeys.map((key) => `${key} -> tailwindcss.${deprecatedTailwindMapping[key]}`).join(", ");
+    throw new Error(
+      `Legacy "registry.tailwindcss" fields are no longer supported: ${usedTailwindKeys.join(", ")}. Use the modern fields instead: ${mapping}.`
+    );
   }
-  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;
-  const normalizedExtract = output ? {
-    ...output.filename === void 0 ? {} : { file: output.filename },
-    pretty: output.loose ? 2 : false,
-    ...output.removeUniversalSelector === void 0 ? {} : { removeUniversalSelector: output.removeUniversalSelector }
-  } : void 0;
-  const normalizedTailwindcss = {
-    ...patch?.packageName === void 0 ? {} : { packageName: patch.packageName },
-    ...tailwindVersion === void 0 ? {} : { version: tailwindVersion },
-    ...patch?.resolve === void 0 ? {} : { resolve: patch.resolve },
-    ...tailwindConfigPath === void 0 ? {} : { config: tailwindConfigPath },
-    ...tailwindCwd === void 0 ? {} : { cwd: tailwindCwd },
-    ...tailwindV2 === void 0 ? {} : { v2: tailwindV2 },
-    ...tailwindV3 === void 0 ? {} : { v3: tailwindV3 },
-    ...tailwindV4 === void 0 ? {} : { v4: tailwindV4 }
-  };
-  const normalizedCache = typeof options.cache === "boolean" ? options.cache : options.cache ? {
-    ...options.cache,
-    enabled: options.cache.enabled ?? true
-  } : void 0;
-  const normalizedApply = {
-    ...patch?.overwrite === void 0 ? {} : { overwrite: patch.overwrite },
-    exposeContext: features.exposeContext,
-    extendLengthUnits: features.extendLengthUnits
-  };
-  return {
-    ...patch?.cwd === void 0 ? {} : { projectRoot: patch.cwd },
-    ...patch?.filter === void 0 ? {} : { filter: patch.filter },
-    ...normalizedCache === void 0 ? {} : { cache: normalizedCache },
-    ...normalizedExtract === void 0 ? {} : { extract: normalizedExtract },
-    ...Object.keys(normalizedTailwindcss).length === 0 ? {} : { tailwindcss: normalizedTailwindcss },
-    apply: normalizedApply
-  };
 }
 function fromUnifiedConfig(registry) {
   if (!registry) {
     return {};
   }
-  const tailwind = registry.tailwindcss ?? registry.tailwind;
-  const modernExtract = registry.extract;
-  const legacyOutput = registry.output;
-  const pretty = (() => {
-    const value = modernExtract?.pretty ?? legacyOutput?.pretty;
-    if (value === void 0) {
-      return void 0;
-    }
-    if (typeof value === "boolean") {
-      return value ? 2 : false;
-    }
-    return value;
-  })();
-  const removeUniversalSelector = modernExtract?.removeUniversalSelector ?? legacyOutput?.stripUniversalSelector;
-  const outputFile = modernExtract?.file ?? legacyOutput?.file;
-  const normalizedExtract = modernExtract || legacyOutput ? {
-    ...modernExtract?.write === void 0 ? {} : { write: modernExtract.write },
-    ...outputFile === void 0 ? {} : { file: outputFile },
-    ...pretty === void 0 ? {} : { pretty },
-    ...removeUniversalSelector === void 0 ? {} : { removeUniversalSelector },
-    ...modernExtract?.format === void 0 ? {} : { format: modernExtract.format }
+  assertNoDeprecatedRegistryOptions(registry);
+  const extract = registry.extract ? {
+    ...registry.extract.write === void 0 ? {} : { write: registry.extract.write },
+    ...registry.extract.file === void 0 ? {} : { file: registry.extract.file },
+    ...registry.extract.format === void 0 ? {} : { format: registry.extract.format },
+    ...registry.extract.pretty === void 0 ? {} : { pretty: registry.extract.pretty },
+    ...registry.extract.removeUniversalSelector === void 0 ? {} : { removeUniversalSelector: registry.extract.removeUniversalSelector }
   } : void 0;
-  const normalizedTailwindcss = tailwind ? {
-    ...tailwind.version === void 0 ? {} : { version: tailwind.version },
-    ...tailwind.packageName === void 0 ? tailwind.package === void 0 ? {} : { packageName: tailwind.package } : { packageName: tailwind.packageName },
-    ...tailwind.resolve === void 0 ? {} : { resolve: tailwind.resolve },
-    ...tailwind.config === void 0 ? {} : { config: tailwind.config },
-    ...tailwind.cwd === void 0 ? {} : { cwd: tailwind.cwd },
-    ...tailwind.v2 === void 0 ? tailwind.legacy === void 0 ? {} : { v2: tailwind.legacy } : { v2: tailwind.v2 },
-    ...tailwind.v3 === void 0 ? tailwind.classic === void 0 ? {} : { v3: tailwind.classic } : { v3: tailwind.v3 },
-    ...tailwind.v4 === void 0 ? tailwind.next === void 0 ? {} : { v4: tailwind.next } : { v4: tailwind.v4 }
+  const tailwindcss = registry.tailwindcss ? {
+    ...registry.tailwindcss.version === void 0 ? {} : { version: registry.tailwindcss.version },
+    ...registry.tailwindcss.packageName === void 0 ? {} : { packageName: registry.tailwindcss.packageName },
+    ...registry.tailwindcss.resolve === void 0 ? {} : { resolve: registry.tailwindcss.resolve },
+    ...registry.tailwindcss.config === void 0 ? {} : { config: registry.tailwindcss.config },
+    ...registry.tailwindcss.cwd === void 0 ? {} : { cwd: registry.tailwindcss.cwd },
+    ...registry.tailwindcss.v2 === void 0 ? {} : { v2: registry.tailwindcss.v2 },
+    ...registry.tailwindcss.v3 === void 0 ? {} : { v3: registry.tailwindcss.v3 },
+    ...registry.tailwindcss.v4 === void 0 ? {} : { v4: registry.tailwindcss.v4 }
   } : void 0;
-  const normalizedApply = registry.apply ? {
+  const apply = registry.apply ? {
     ...registry.apply.overwrite === void 0 ? {} : { overwrite: registry.apply.overwrite },
     ...registry.apply.exposeContext === void 0 ? {} : { exposeContext: registry.apply.exposeContext },
     ...registry.apply.extendLengthUnits === void 0 ? {} : { extendLengthUnits: registry.apply.extendLengthUnits }
   } : void 0;
   return {
     ...registry.projectRoot === void 0 ? {} : { projectRoot: registry.projectRoot },
-    ...normalizedApply === void 0 ? {} : { apply: normalizedApply },
+    ...apply === void 0 ? {} : { apply },
     ...registry.cache === void 0 ? {} : { cache: registry.cache },
     ...registry.filter === void 0 ? {} : { filter: registry.filter },
-    ...normalizedExtract === void 0 ? {} : { extract: normalizedExtract },
-    ...normalizedTailwindcss === void 0 ? {} : { tailwindcss: normalizedTailwindcss }
+    ...extract === void 0 ? {} : { extract },
+    ...tailwindcss === void 0 ? {} : { tailwindcss }
   };
 }
 
@@ -1879,19 +1790,22 @@ var defuPromise;
 function isNodeError(error) {
   return !!error && typeof error === "object" && ("code" in error || "message" in error);
 }
-function isMissingConfigModuleError(error) {
-  if (!isNodeError(error) || error.code !== "MODULE_NOT_FOUND") {
+function isMissingModuleError(error, pkgName2) {
+  if (!isNodeError(error)) {
     return false;
   }
-  const message = error.message ?? "";
-  return message.includes("@tailwindcss-mangle/config");
-}
-function isMissingSharedModuleError(error) {
-  if (!isNodeError(error) || error.code !== "MODULE_NOT_FOUND") {
+  const code = error.code;
+  if (code !== "MODULE_NOT_FOUND" && code !== "ERR_MODULE_NOT_FOUND") {
     return false;
   }
   const message = error.message ?? "";
-  return message.includes("@tailwindcss-mangle/shared");
+  return message.includes(pkgName2) || message.includes(`${pkgName2}/dist/`);
+}
+function isMissingConfigModuleError(error) {
+  return isMissingModuleError(error, "@tailwindcss-mangle/config");
+}
+function isMissingSharedModuleError(error) {
+  return isMissingModuleError(error, "@tailwindcss-mangle/shared");
 }
 async function loadWorkspaceConfigModule() {
   if (!configModulePromise) {
@@ -1922,8 +1836,10 @@ async function loadPatchOptionsForWorkspace(cwd, overrides) {
   const merge = await loadWorkspaceDefu();
   const configModule = await loadWorkspaceConfigModule();
   const { config } = await configModule.getConfig(cwd);
-  const legacyConfig = config;
-  const base = config?.registry ? fromUnifiedConfig(config.registry) : legacyConfig?.patch ? fromLegacyOptions({ patch: legacyConfig.patch }) : {};
+  if (config && typeof config === "object" && "patch" in config && config.patch !== void 0) {
+    throw new Error('Legacy workspace config field "patch" is no longer supported. Move patcher options under "registry".');
+  }
+  const base = config?.registry ? fromUnifiedConfig(config.registry) : {};
   const merged = merge(overrides ?? {}, base);
   return merged;
 }
@@ -2188,14 +2104,12 @@ function groupTokensByFile(report, options) {
   const stripAbsolute = options?.stripAbsolutePaths ?? key !== "absolute";
   return report.entries.reduce((acc, entry) => {
     const bucketKey = key === "absolute" ? entry.file : entry.relativeFile;
-    if (!acc[bucketKey]) {
-      acc[bucketKey] = [];
-    }
+    const bucket = acc[bucketKey] ?? (acc[bucketKey] = []);
     const value = stripAbsolute ? {
       ...entry,
       file: entry.relativeFile
     } : entry;
-    acc[bucketKey].push(value);
+    bucket.push(value);
     return acc;
   }, {});
 }
@@ -2210,18 +2124,22 @@ function isObject(val) {
   return val !== null && typeof val === "object" && Array.isArray(val) === false;
 }
 function spliceChangesIntoString(str, changes) {
-  if (!changes[0]) {
+  const firstChange = changes[0];
+  if (!firstChange) {
     return str;
   }
   changes.sort((a, b) => {
     return a.end - b.end || a.start - b.start;
   });
   let result = "";
-  let previous = changes[0];
+  let previous = firstChange;
   result += str.slice(0, previous.start);
   result += previous.replacement;
   for (let i = 1; i < changes.length; ++i) {
     const change = changes[i];
+    if (!change) {
+      continue;
+    }
     result += str.slice(previous.end, change.start);
     result += change.replacement;
     previous = change;
@@ -2530,7 +2448,12 @@ function transformPostcssPluginV2(content, options) {
       const previous = program.body[index - 1];
       const beforePrevious = program.body[index - 2];
       const alreadyHasVariable = Boolean(
-        previous && t.isVariableDeclaration(previous) && previous.declarations.length === 1 && t.isIdentifier(previous.declarations[0].id) && previous.declarations[0].id.name === refIdentifier.name
+        previous && t.isVariableDeclaration(previous) && previous.declarations.length === 1 && (() => {
+          const declaration = previous.declarations[0];
+          return Boolean(
+            declaration && t.isIdentifier(declaration.id) && declaration.id.name === refIdentifier.name
+          );
+        })()
       );
       const alreadyAssignsExports = Boolean(
         beforePrevious && t.isExpressionStatement(beforePrevious) && t.isAssignmentExpression(beforePrevious.expression) && t.isMemberExpression(beforePrevious.expression.left) && t.isIdentifier(beforePrevious.expression.right) && beforePrevious.expression.right.name === refIdentifier.name && generate(beforePrevious.expression.left).code === generate(exportMember).code
@@ -2691,7 +2614,12 @@ function transformPostcssPlugin(content, { refProperty }) {
       const previousStatement = program.body[index - 1];
       const lastStatement = program.body[program.body.length - 1];
       const alreadyHasVariable = Boolean(
-        previousStatement && t2.isVariableDeclaration(previousStatement) && previousStatement.declarations.length === 1 && t2.isIdentifier(previousStatement.declarations[0].id) && previousStatement.declarations[0].id.name === refIdentifier.name
+        previousStatement && t2.isVariableDeclaration(previousStatement) && previousStatement.declarations.length === 1 && (() => {
+          const declaration = previousStatement.declarations[0];
+          return Boolean(
+            declaration && t2.isIdentifier(declaration.id) && declaration.id.name === refIdentifier.name
+          );
+        })()
       );
       const alreadyAssignsModuleExports = Boolean(
         t2.isExpressionStatement(lastStatement) && t2.isAssignmentExpression(lastStatement.expression) && t2.isMemberExpression(lastStatement.expression.left) && t2.isIdentifier(lastStatement.expression.right) && lastStatement.expression.right.name === refIdentifier.name && generate(lastStatement.expression.left).code === generate(moduleExportsMember).code
@@ -3257,25 +3185,7 @@ function applyTailwindPatches(context) {
   return results;
 }
 
-// src/api/tailwindcss-patcher.ts
-function resolveMajorVersion(version, hint) {
-  if (hint && [2, 3, 4].includes(hint)) {
-    return hint;
-  }
-  if (version) {
-    const coerced = coerce(version);
-    if (coerced) {
-      const major = coerced.major;
-      if (major === 2 || major === 3 || major === 4) {
-        return major;
-      }
-      if (major >= 4) {
-        return 4;
-      }
-    }
-  }
-  return 3;
-}
+// src/runtime/collector.ts
 function resolveTailwindExecutionOptions(normalized, majorVersion) {
   const base = normalized.tailwind;
   if (majorVersion === 2 && base.v2) {
@@ -3298,17 +3208,138 @@ function resolveTailwindExecutionOptions(normalized, majorVersion) {
     postcssPlugin: base.postcssPlugin
   };
 }
+var BaseCollector = class {
+  constructor(packageInfo, options, majorVersion) {
+    this.packageInfo = packageInfo;
+    this.options = options;
+    this.majorVersion = majorVersion;
+  }
+  async patch() {
+    return applyTailwindPatches({
+      packageInfo: this.packageInfo,
+      options: this.options,
+      majorVersion: this.majorVersion
+    });
+  }
+  async getPatchStatus() {
+    return getPatchStatusReport({
+      packageInfo: this.packageInfo,
+      options: this.options,
+      majorVersion: this.majorVersion
+    });
+  }
+  getContexts() {
+    return loadRuntimeContexts(
+      this.packageInfo,
+      this.majorVersion,
+      this.options.features.exposeContext.refProperty
+    );
+  }
+};
+var RuntimeCollector = class extends BaseCollector {
+  constructor(packageInfo, options, majorVersion, snapshotFactory) {
+    super(packageInfo, options, majorVersion);
+    this.snapshotFactory = snapshotFactory;
+  }
+  inFlightBuild;
+  async collectClassSet() {
+    const contexts = this.getContexts();
+    return collectClassesFromContexts(contexts, this.options.filter);
+  }
+  getPatchSnapshot() {
+    return this.snapshotFactory();
+  }
+  async runTailwindBuildIfNeeded() {
+    if (this.inFlightBuild) {
+      return this.inFlightBuild;
+    }
+    const executionOptions = resolveTailwindExecutionOptions(this.options, this.majorVersion);
+    const buildOptions = {
+      cwd: executionOptions.cwd,
+      majorVersion: this.majorVersion,
+      ...executionOptions.config === void 0 ? {} : { config: executionOptions.config },
+      ...executionOptions.postcssPlugin === void 0 ? {} : { postcssPlugin: executionOptions.postcssPlugin }
+    };
+    this.inFlightBuild = runTailwindBuild(buildOptions).then(() => void 0);
+    try {
+      await this.inFlightBuild;
+    } finally {
+      this.inFlightBuild = void 0;
+    }
+  }
+};
+var TailwindV4Collector = class extends BaseCollector {
+  constructor(packageInfo, options, snapshotFactory) {
+    super(packageInfo, options, 4);
+    this.snapshotFactory = snapshotFactory;
+  }
+  snapshotFactory;
+  async collectClassSet() {
+    return collectClassesFromTailwindV4(this.options);
+  }
+  getPatchSnapshot() {
+    return this.snapshotFactory();
+  }
+};
+
+// src/api/tailwindcss-patcher.ts
+function resolveInstalledMajorVersion(version) {
+  if (!version) {
+    return void 0;
+  }
+  const coerced = coerce(version);
+  if (!coerced) {
+    return void 0;
+  }
+  const major = coerced.major;
+  if (major === 2 || major === 3 || major === 4) {
+    return major;
+  }
+  if (major >= 4) {
+    return 4;
+  }
+  return void 0;
+}
+function validateInstalledVersion(packageVersion, expectedMajor, packageName) {
+  const installedMajor = resolveInstalledMajorVersion(packageVersion);
+  if (installedMajor === void 0) {
+    return;
+  }
+  if (installedMajor !== expectedMajor) {
+    throw new Error(
+      `Configured tailwindcss.version=${expectedMajor}, but resolved package "${packageName}" is version ${packageVersion}. Update the configuration or resolve the correct package.`
+    );
+  }
+}
+function resolveMajorVersionOrThrow(configuredMajor, packageVersion, packageName) {
+  if (configuredMajor !== void 0) {
+    validateInstalledVersion(packageVersion, configuredMajor, packageName);
+    return configuredMajor;
+  }
+  const installedMajor = resolveInstalledMajorVersion(packageVersion);
+  if (installedMajor !== void 0) {
+    return installedMajor;
+  }
+  throw new Error(
+    `Unable to infer Tailwind CSS major version from resolved package "${packageName}" (${packageVersion ?? "unknown"}). Set "tailwindcss.version" to 2, 3, or 4 explicitly.`
+  );
+}
+function createCollector(packageInfo, options, majorVersion, snapshotFactory) {
+  if (majorVersion === 4) {
+    return new TailwindV4Collector(packageInfo, options, snapshotFactory);
+  }
+  return new RuntimeCollector(packageInfo, options, majorVersion, snapshotFactory);
+}
 var TailwindcssPatcher = class {
   options;
   packageInfo;
   majorVersion;
   cacheContext;
   cacheStore;
+  collector;
   patchMemo;
-  inFlightBuild;
   constructor(options = {}) {
-    const resolvedOptions = options && typeof options === "object" && "patch" in options ? fromLegacyOptions(options) : options;
-    this.options = normalizeOptions(resolvedOptions);
+    this.options = normalizeOptions(options);
     const packageInfo = getPackageInfoSync(
       this.options.tailwind.packageName,
       this.options.tailwind.resolve
@@ -3317,9 +3348,10 @@ var TailwindcssPatcher = class {
       throw new Error(`Unable to locate Tailwind CSS package "${this.options.tailwind.packageName}".`);
     }
     this.packageInfo = packageInfo;
-    this.majorVersion = resolveMajorVersion(
+    this.majorVersion = resolveMajorVersionOrThrow(
+      this.options.tailwind.versionHint,
       this.packageInfo.version,
-      this.options.tailwind.versionHint
+      this.options.tailwind.packageName
     );
     this.cacheContext = createCacheContextDescriptor(
       this.options,
@@ -3327,56 +3359,30 @@ var TailwindcssPatcher = class {
       this.majorVersion
     );
     this.cacheStore = new CacheStore(this.options.cache, this.cacheContext);
+    this.collector = createCollector(
+      this.packageInfo,
+      this.options,
+      this.majorVersion,
+      () => this.createPatchSnapshot()
+    );
   }
   async patch() {
-    const snapshot = this.createPatchSnapshot();
+    const snapshot = this.collector.getPatchSnapshot();
     if (this.patchMemo && this.patchMemo.snapshot === snapshot) {
       return this.patchMemo.result;
     }
-    const result = applyTailwindPatches({
-      packageInfo: this.packageInfo,
-      options: this.options,
-      majorVersion: this.majorVersion
-    });
+    const result = await this.collector.patch();
     this.patchMemo = {
       result,
-      snapshot: this.createPatchSnapshot()
+      snapshot: this.collector.getPatchSnapshot()
     };
     return result;
   }
   async getPatchStatus() {
-    return getPatchStatusReport({
-      packageInfo: this.packageInfo,
-      options: this.options,
-      majorVersion: this.majorVersion
-    });
+    return this.collector.getPatchStatus();
   }
   getContexts() {
-    return loadRuntimeContexts(
-      this.packageInfo,
-      this.majorVersion,
-      this.options.features.exposeContext.refProperty
-    );
-  }
-  async runTailwindBuildIfNeeded() {
-    if (this.majorVersion === 2 || this.majorVersion === 3) {
-      if (this.inFlightBuild) {
-        return this.inFlightBuild;
-      }
-      const executionOptions = resolveTailwindExecutionOptions(this.options, this.majorVersion);
-      const buildOptions = {
-        cwd: executionOptions.cwd,
-        majorVersion: this.majorVersion,
-        ...executionOptions.config === void 0 ? {} : { config: executionOptions.config },
-        ...executionOptions.postcssPlugin === void 0 ? {} : { postcssPlugin: executionOptions.postcssPlugin }
-      };
-      this.inFlightBuild = runTailwindBuild(buildOptions).then(() => void 0);
-      try {
-        await this.inFlightBuild;
-      } finally {
-        this.inFlightBuild = void 0;
-      }
-    }
+    return this.collector.getContexts();
   }
   createPatchSnapshot() {
     const entries = [];
@@ -3420,11 +3426,14 @@ var TailwindcssPatcher = class {
   }
   async collectClassSet() {
     if (this.majorVersion === 4) {
-      return collectClassesFromTailwindV4(this.options);
+      return this.collector.collectClassSet();
     }
     const contexts = this.getContexts();
     return collectClassesFromContexts(contexts, this.options.filter);
   }
+  async runTailwindBuildIfNeeded() {
+    await this.collector.runTailwindBuildIfNeeded?.();
+  }
   debugCacheRead(meta) {
     if (meta.hit) {
       logger_default.debug(
@@ -4564,7 +4573,7 @@ import fs15 from "fs-extra";
 import path16 from "pathe";
 var DEFAULT_CONFIG_NAME = "tailwindcss-mangle";
 async function installCommandDefaultHandler(_ctx) {
-  const patcher = new TailwindcssPatcher();
+  const patcher = await _ctx.createPatcher();
   await patcher.patch();
   logger_default.success("Tailwind CSS runtime patched successfully.");
 }
@@ -4996,13 +5005,14 @@ function registerTailwindcssPatchCommand(cli, commandName, options, prefix, defa
   const command = cli.command(metadata.name, metadata.description);
   applyCommandOptions(command, metadata.optionDefs);
   command.action(async (args) => {
+    const defaultHandler = defaultCommandHandlers[commandName];
     return runWithCommandHandler(
       cli,
       command,
       commandName,
       args,
       options.commandHandlers?.[commandName],
-      defaultCommandHandlers[commandName]
+      defaultHandler
     );
   });
   metadata.aliases.forEach((alias) => command.alias(alias));