tw-migrate 0.8.0 → 0.8.1

package/dist/bin.js

@@ -4,7 +4,7 @@ import { styleText } from "node:util";
 //#region src/bin.ts
 const { version } = {
 	name: "tw-migrate",
-	version: "0.8.0",
+	version: "0.8.1",
 	description: "Preview and migrate React, Vue, and HTML CSS to Tailwind utilities",
 	keywords: [
 		"codemod",

package/dist/index.js

@@ -1,10 +1,10 @@
 import { createRequire } from "node:module";
 import { promisify } from "node:util";
-import { chmod, lstat, readFile, readdir, realpath, rename, rm, stat, writeFile } from "node:fs/promises";
 import { basename, dirname, extname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import * as z from "zod/mini";
 import { FILE_HEADERS_ONLY, createTwoFilesPatch } from "diff";
 import { execFile } from "node:child_process";
+import { chmod, readFile, readdir, realpath, rename, rm, stat, writeFile } from "node:fs/promises";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { parse } from "parse5";
 //#region src/util/diff.ts
@@ -278,12 +278,6 @@ function isStylesheetModule(path) {
 function isProjectInput(workspaceRoot, path) {
 	return isWithin(workspaceRoot, path) && !relative(workspaceRoot, path).split(/[\\/]/).includes("node_modules");
 }
-async function rejectSymlinkTarget(path, root) {
-	for (let current = path; isWithin(root, current); current = dirname(current)) {
-		if ((await lstat(current)).isSymbolicLink()) throw new Error(`Refusing to migrate a symbolic-link target: ${path}`);
-		if (current === root) break;
-	}
-}
 async function* readInBatches(paths) {
 	for (let offset = 0; offset < paths.length; offset += 32) {
 		const batch = paths.slice(offset, offset + 32);
@@ -393,7 +387,6 @@ async function resolveScope(options) {
 	if (explicitStyle && !isStylesheetPath(explicitStyle) && extname(explicitStyle) !== ".vue") throw new TypeError("Only .css, .scss, .sass, .less, and .vue files can be migrated");
 	if (configuredEntry && extname(configuredEntry) !== ".css") throw new TypeError("The Tailwind CSS entry must be a .css file");
 	if (configuredEntry && !(await stat(configuredEntry)).isFile()) throw new TypeError("The Tailwind CSS entry must be a file");
-	for (const path of [explicitStyle, configuredEntry]) if (path) await rejectSymlinkTarget(path, currentPackage);
 	if (explicitStyle && !isWithin(currentPackage, explicitStyle)) throw new TypeError("The selected stylesheet must belong to the current package");
 	for (const path of [explicitStyle, configuredEntry]) {
 		if (path && !allPaths.includes(path)) allPaths.push(path);
@@ -761,12 +754,17 @@ async function loadTailwind(packageRoot, tailwindCss, snapshots, workspaceRoot)
 	const packageJson = tailwindPackageSchema.parse(JSON.parse(await readFile(packagePath, "utf8")));
 	if (!packageJson.version.startsWith("4.")) throw new Error(`Tailwind v4 is required; found ${packageJson.version}.`);
 	const { __unstable__loadDesignSystem: loadDesignSystem } = await loadProjectModule(packageRoot, "tailwindcss", "Tailwind v4 must be installed in the target project.");
-	const css = await snapshotFile(snapshots, tailwindCss);
+	const inputPaths = /* @__PURE__ */ new Set();
+	const readInput = (path) => {
+		inputPaths.add(path);
+		return snapshotFile(snapshots, path);
+	};
+	const css = await readInput(tailwindCss);
 	const base = dirname(tailwindCss);
 	const tailwindRoot = dirname(packagePath);
 	const loadModule = async (id, moduleBase) => {
 		const path = createRequire(join(moduleBase, "package.json")).resolve(id);
-		if (isProjectInput(workspaceRoot, path)) await snapshotFile(snapshots, path);
+		if (isProjectInput(workspaceRoot, path)) await readInput(path);
 		const imported = await import(pathToFileURL(path).href);
 		return {
 			path,
@@ -787,7 +785,7 @@ async function loadTailwind(packageRoot, tailwindCss, snapshots, workspaceRoot)
 		} else if (id.startsWith(".") || isAbsolute(id)) path = resolve(sheetBase, id);
 		else path = projectRequire.resolve(id);
 		return {
-			content: isProjectInput(workspaceRoot, path) ? await snapshotFile(snapshots, path) : await readFile(path, "utf8"),
+			content: isProjectInput(workspaceRoot, path) ? await readInput(path) : await readFile(path, "utf8"),
 			base: dirname(path)
 		};
 	};
@@ -819,6 +817,7 @@ async function loadTailwind(packageRoot, tailwindCss, snapshots, workspaceRoot)
 		themeTokens,
 		referenceTokens,
 		graphSources,
+		inputPaths,
 		loadWith
 	};
 }
@@ -1355,15 +1354,26 @@ function canonicalCandidate(system, candidate) {
 	cache.set(candidate, canonical);
 	return canonical;
 }
-function spellingReservations(styleSources, resolvedExtras, resolvedImports = /* @__PURE__ */ new Set()) {
+function spellingReservations(styleSources, resolvedExtras, resolvedImports = /* @__PURE__ */ new Set(), cache) {
+	const key = JSON.stringify([...resolvedImports].sort());
+	let base = cache?.get(key);
+	if (base === void 0) {
+		base = {
+			names: /* @__PURE__ */ new Set(),
+			prefixes: /* @__PURE__ */ new Set(),
+			unbounded: false,
+			properties: /* @__PURE__ */ new Set(),
+			propertiesUnbounded: false
+		};
+		for (const [path, source] of styleSources) scanStylesheetReservations(path, source, styleSources, base, resolvedImports);
+		cache?.set(key, base);
+	}
 	const reservations = {
-		names: /* @__PURE__ */ new Set(),
-		prefixes: /* @__PURE__ */ new Set(),
-		unbounded: false,
-		properties: /* @__PURE__ */ new Set(),
-		propertiesUnbounded: false
+		...base,
+		names: new Set(base.names),
+		prefixes: new Set(base.prefixes),
+		properties: new Set(base.properties)
 	};
-	for (const [path, source] of styleSources) scanStylesheetReservations(path, source, styleSources, reservations, resolvedImports);
 	for (const [path, source] of resolvedExtras) try {
 		const analysis = stylesheetAnalysis(path, source);
 		for (const name of analysis.classNames) reservations.names.add(name);
@@ -1434,25 +1444,32 @@ function sameShape(left, right) {
 }
 function acceptedCandidateAliases(system, probes, reservations) {
 	const aliases = {};
-	if (reservations.unbounded) return aliases;
+	if (reservations.unbounded || typeof system.canonicalizeCandidates !== "function") return aliases;
 	const prefix = system.theme.prefix;
 	for (const probe of new Set(probes)) {
+		const compiledProbe = system.candidatesToCss([probe])[0];
+		if (compiledProbe == null) continue;
+		let probeShape;
+		try {
+			probeShape = compiledShape(compiledProbe);
+		} catch {
+			continue;
+		}
+		if (probeShape.referencedProperties.length > 0) continue;
 		const canonical = canonicalCandidate(system, probe);
 		if (canonical === null) continue;
 		const unprefixed = prefix !== null && canonical.startsWith(`${prefix}:`) ? canonical.slice(prefix.length + 1) : null;
 		const segment = utilitySegment(canonical).replace(/!$/, "");
 		if (segment.includes("[") || reservedSpelling(reservations, canonical) || unprefixed !== null && reservedSpelling(reservations, unprefixed) || reservedSpelling(reservations, segment)) continue;
-		const [compiledProbe, compiledCanonical] = system.candidatesToCss([probe, canonical]);
-		if (compiledProbe == null || compiledCanonical == null) continue;
-		let probeShape;
+		const compiledCanonical = system.candidatesToCss([canonical])[0];
+		if (compiledCanonical == null) continue;
 		let canonicalShape;
 		try {
-			probeShape = compiledShape(compiledProbe);
 			canonicalShape = compiledShape(compiledCanonical);
 		} catch {
 			continue;
 		}
-		if (canonicalShape.referencedProperties.length > 0 || probeShape.referencedProperties.length > 0 || !sameShape(probeShape.declarations, canonicalShape.declarations)) continue;
+		if (canonicalShape.referencedProperties.length > 0 || !sameShape(probeShape.declarations, canonicalShape.declarations)) continue;
 		aliases[probe] = canonical;
 	}
 	return aliases;
@@ -1745,7 +1762,7 @@ function scannedVariantReservations(sources) {
 */
 function collectMemberMediaConditions(stylesheets, tailwind) {
 	return JSON.parse(collectMediaConditions(JSON.stringify({
-		stylesheets,
+		stylesheets: stylesheets.map(({ vueShadowCss: _shadowCss, vueShadowModuleCss: _shadowModuleCss, ...stylesheet }) => stylesheet),
 		themeTokens: tailwind.themeTokens,
 		tailwindSources: tailwind.graphSources
 	})));
@@ -2691,7 +2708,6 @@ async function preparePackageVue({ packageRoot, styleCompilers, sourceFiles, sty
 		}
 	}
 	for (const file of selected) {
-		await rejectSymlinkTarget(file.path, packageRoot);
 		const analysis = analysisOf(file.path);
 		warnings.push(...analysis.warnings);
 		if (analysis.retained) continue;
@@ -2784,7 +2800,6 @@ async function preparePackageVue({ packageRoot, styleCompilers, sourceFiles, sty
 		if (analysis.retained) continue;
 		const elements = elementsByFile.get(file.path) ?? [];
 		const contextPaths = [...new Set(elements.flatMap((element) => element.cssPaths))];
-		if (contextPaths.length > 0) await rejectSymlinkTarget(file.path, packageRoot);
 		files.set(file.path, {
 			...file,
 			...contextPaths.length > 0 ? {
@@ -2956,6 +2971,8 @@ async function migrate(options = {}) {
 		styleDependents: indexStylesheetDependents(styleSources),
 		vueStyleRanges,
 		entryCatalog: tailwindEntryCatalog(styleSources, scope.pathOwners),
+		loadedTailwind: /* @__PURE__ */ new Map(),
+		stylesheetReservationCache: /* @__PURE__ */ new Map(),
 		ignoredPaths: await scannerIgnoredPaths(workspaceRoot, sourceFiles.map((file) => file.path)),
 		fontAllocations: /* @__PURE__ */ new Map()
 	};
@@ -3194,7 +3211,12 @@ async function preparePackage(context, packageRoot) {
 	if (provenTargets.length === 0 && provenVueStylesheets.length === 0) return vueWarningsOnlyResult(preparedVue, proofWarnings);
 	let tailwind;
 	try {
-		tailwind = await loadTailwind(entryOwner, tailwindPath, snapshots, workspaceRoot);
+		const key = `${entryOwner}\0${tailwindPath}`;
+		tailwind = context.loadedTailwind.get(key);
+		if (tailwind === void 0) {
+			tailwind = await loadTailwind(entryOwner, tailwindPath, snapshots, workspaceRoot);
+			context.loadedTailwind.set(key, tailwind);
+		} else for (const path of tailwind.inputPaths) await snapshotFile(snapshots, path);
 	} catch (error) {
 		return recover(error, isIntegrityError(error));
 	}
@@ -3210,7 +3232,6 @@ async function preparePackage(context, packageRoot) {
 		stylesheets = [];
 		const compilerDependents = /* @__PURE__ */ new Map();
 		for (const stylePath of provenTargets.sort()) {
-			await rejectSymlinkTarget(stylePath, packageRoot);
 			const isPartial = isSassPath(stylePath) && basename(stylePath).startsWith("_");
 			const stylesheet = {
 				cssPath: stylePath,
@@ -3271,7 +3292,7 @@ async function planPreparedGroup(context, members) {
 		return leftPath < rightPath ? -1 : leftPath > rightPath ? 1 : 0;
 	});
 	const entry = active[0].tailwind;
-	const reservations = spellingReservations(context.styleSources, entry.graphSources.map((graphSource) => [`${graphSource.path}.graph.css`, graphSource.source]), new Set(entry.graphSources.map((graphSource) => graphSource.path).filter((path) => path.includes("\0"))));
+	const reservations = spellingReservations(context.styleSources, entry.graphSources.map((graphSource) => [`${graphSource.path}.graph.css`, graphSource.source]), new Set(entry.graphSources.map((graphSource) => graphSource.path).filter((path) => path.includes("\0"))), context.stylesheetReservationCache);
 	const groupFiles = new Map(active.flatMap((member) => member.files.map((file) => [file.path, file])));
 	const mentionedSegments = /* @__PURE__ */ new Set();
 	const mentionedSources = [...[...groupFiles.values()].map((file) => file.source), ...entry.graphSources.map((graphSource) => graphSource.source)];
@@ -3478,7 +3499,7 @@ async function planPreparedGroup(context, members) {
 	} });
 	active = active.filter((remaining) => remaining.stylesheets.length > 0);
 	if (active.length === 0) return results;
-	const groupWritable = !await entryUnsafe(entry.path, workspaceRoot, targetable);
+	const groupWritable = targetable.has(entry.path) && isProjectInput(workspaceRoot, entry.path);
 	const mediaWarnings = [];
 	let extraction;
 	const collections = [];
@@ -3580,13 +3601,29 @@ async function planPreparedGroup(context, members) {
 				htmlStylesheets: merged
 			};
 		}).sort((left, right) => left.path < right.path ? -1 : left.path > right.path ? 1 : 0);
+		const shadowSourceIds = /* @__PURE__ */ new Map();
+		const shadowRefs = (sources) => sources?.map((source) => {
+			let id = shadowSourceIds.get(source);
+			if (id === void 0) {
+				id = shadowSourceIds.size;
+				shadowSourceIds.set(source, id);
+			}
+			return id;
+		});
+		const pooledSheets = sheets.map(({ stylesheet }) => ({
+			...stylesheet,
+			vueShadowCss: shadowRefs(stylesheet.vueShadowCss),
+			vueShadowModuleCss: shadowRefs(stylesheet.vueShadowModuleCss)
+		}));
+		const vueShadowSources = [...shadowSourceIds.keys()];
 		planning: for (;;) {
 			const request = {
-				stylesheets: sheets.map(({ member, stylesheet }, index) => {
+				vueShadowSources,
+				stylesheets: sheets.map(({ member }, index) => {
 					const rules = blocked.get(index);
 					const movesOff = member.sharedProofs !== void 0 || movesDisabled.has(index);
 					return {
-						...stylesheet,
+						...pooledSheets[index],
 						...rules ? { blockedRules: [...rules.values()].map((blockedRule) => blockedRule.ruleId) } : {},
 						...movesOff ? { globalAtRuleMoves: false } : {}
 					};
@@ -3775,10 +3812,6 @@ function accumulateBlockedRules(blocked, plan, failing) {
 	}
 	return progressed;
 }
-async function entryUnsafe(entryPath, workspaceRoot, targetable) {
-	if (!targetable.has(entryPath) || !isProjectInput(workspaceRoot, entryPath)) return true;
-	return (await lstat(entryPath)).isSymbolicLink();
-}
 function atRuleIdentities(key, css) {
 	return css.trim() === "" ? [] : stylesheetAnalysis(key, css).globalAtRuleIdentities;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tw-migrate",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "Preview and migrate React, Vue, and HTML CSS to Tailwind utilities",
   "keywords": [
     "codemod",
@@ -66,11 +66,11 @@
     "vue": "catalog:"
   },
   "optionalDependencies": {
-    "tw-migrate-darwin-arm64": "0.8.0",
-    "tw-migrate-darwin-x64": "0.8.0",
-    "tw-migrate-linux-arm64-gnu": "0.8.0",
-    "tw-migrate-linux-x64-gnu": "0.8.0",
-    "tw-migrate-win32-x64-msvc": "0.8.0"
+    "tw-migrate-darwin-arm64": "0.8.1",
+    "tw-migrate-darwin-x64": "0.8.1",
+    "tw-migrate-linux-arm64-gnu": "0.8.1",
+    "tw-migrate-linux-x64-gnu": "0.8.1",
+    "tw-migrate-win32-x64-msvc": "0.8.1"
   },
   "napi": {
     "binaryName": "tw-migrate",