styled-components-to-stylex-codemod 0.0.40 → 0.0.42

package/dist/{bridge-consumer-patcher-31jI1854.mjs → bridge-consumer-patcher-DNsxze1l.mjs}

@@ -1,6 +1,6 @@
 import { n as toRealPath } from "./path-utils-BIpoL4Ue.mjs";
 import { r as escapeRegex } from "./string-utils-DD9wdRHW.mjs";
-import { t as isSelectorContext } from "./selector-context-heuristic-6_jSRGkZ.mjs";
+import { t as isSelectorContext } from "./selector-context-heuristic-CGggN74M.mjs";
 import { readFileSync } from "node:fs";
 //#region src/internal/bridge-consumer-patcher.ts
 /**

package/dist/{compute-leaf-set-C-xis90s.mjs → compute-leaf-set-Be5Cgxnr.mjs}

@@ -1,4 +1,4 @@
-import { o as resolveBarrelReExportBinding, r as findImportSource } from "./extract-external-interface-DbzIPO0Z.mjs";
+import { o as resolveBarrelReExportBinding, r as findImportSource } from "./extract-external-interface-B61N1a6q.mjs";
 //#region src/internal/prepass/compute-leaf-set.ts
 /**
 * Computes which styled-component bindings are "leaves" for leaves-only mode:

package/dist/{extract-external-interface-DbzIPO0Z.mjs → extract-external-interface-B61N1a6q.mjs}

@@ -348,7 +348,7 @@ function getFileExportsRe(name) {
 	}
 	return re;
 }
-function fileImportsFrom(usageSrc, usageFile, name, defFile, resolve) {
+function fileImportsFrom(usageSrc, usageFile, name, defFile, resolve, read) {
 	const [namedRe, defaultRe] = getFileImportsFromRes(name);
 	namedRe.lastIndex = 0;
 	defaultRe.lastIndex = 0;
@@ -358,11 +358,17 @@ function fileImportsFrom(usageSrc, usageFile, name, defFile, resolve) {
 		const specifier = match[1];
 		if (!specifier) continue;
 		const resolved = resolve(specifier, usageFile);
-		if (resolved && path.resolve(resolved) === path.resolve(defFile)) return true;
+		if (resolved && importCanReferenceDefinition(resolved, name, defFile, resolve, read)) return true;
 		if (specifier.endsWith(stem) || specifier.endsWith(`${parent}/${stem}`) || specifier.endsWith(parent)) return true;
 	}
 	return false;
 }
+function importCanReferenceDefinition(resolvedImport, name, defFile, resolve, read) {
+	if (path.resolve(resolvedImport) === path.resolve(defFile)) return true;
+	if (!read) return false;
+	const reExportedFile = resolveBarrelReExport(resolvedImport, name, resolve, read);
+	return reExportedFile !== null && path.resolve(reExportedFile) === path.resolve(defFile);
+}
 const fileImportsFromReCache = /* @__PURE__ */ new Map();
 function getFileImportsFromRes(name) {
 	let cached = fileImportsFromReCache.get(name);

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { a as CollectedWarning, c as MarkerFileContext, l as defineAdapter, n as TransformMode, o as AdapterInput, s as ImportSource } from "./transform-types-DUT5eSAm.mjs";
+import { a as CollectedWarning, c as MarkerFileContext, l as defineAdapter, n as TransformMode, o as AdapterInput, s as ImportSource } from "./transform-types-CQjiY4Yp.mjs";
 
 //#region src/run.d.ts
 interface RunTransformOptions {
@@ -44,7 +44,11 @@ interface RunTransformOptions {
    */
   print?: boolean;
   /**
-   * jscodeshift parser to use
+   * jscodeshift parser to use.
+   *
+   * When set to `"ts"` or `"tsx"` (including the default), runTransform also
+   * builds TypeScript compiler metadata for more accurate wrapper interfaces.
+   *
    * @default "tsx"
    */
   parser?: "babel" | "babylon" | "flow" | "ts" | "tsx";

package/dist/index.mjs

@@ -1,6 +1,6 @@
-import { o as assertValidAdapterInput, r as defineAdapter, s as describeValue, t as mergeMarkerDeclarations } from "./merge-markers-BC5YNB7D.mjs";
-import { a as resolveBarrelReExport, s as Logger } from "./extract-external-interface-DbzIPO0Z.mjs";
-import { r as extractStyledDefBasesFromSource } from "./compute-leaf-set-C-xis90s.mjs";
+import { c as describeValue, i as defineAdapter, n as mergeMarkerDeclarations, s as assertValidAdapterInput, t as transformedComponentAcceptsSx } from "./sx-surface-DBy6tOUv.mjs";
+import { a as resolveBarrelReExport, s as Logger } from "./extract-external-interface-B61N1a6q.mjs";
+import { r as extractStyledDefBasesFromSource } from "./compute-leaf-set-Be5Cgxnr.mjs";
 import { n as toRealPath } from "./path-utils-BIpoL4Ue.mjs";
 import jscodeshift from "jscodeshift";
 import { fileURLToPath, pathToFileURL } from "node:url";
@@ -149,10 +149,12 @@ async function runTransform(options) {
 	const { createModuleResolver } = await import("./resolve-imports-DgSAddIF.mjs").then((n) => n.n);
 	const sharedResolver = createModuleResolver();
 	filePaths = orderFilesByLocalImportDependencies(filePaths, sharedResolver, toRealPath);
-	const { runPrepass } = await import("./run-prepass-jnJbdfxU.mjs");
+	const { runPrepass } = await import("./run-prepass-COJ2IOPl.mjs");
 	const absoluteFiles = filePaths.map((f) => resolve(f));
 	const absoluteConsumers = consumerFilePaths.map((f) => resolve(f));
 	let prepassResult;
+	const prepassStartedAt = performance.now();
+	Logger.info(`Prepass: starting (${absoluteFiles.length} file${absoluteFiles.length === 1 ? "" : "s"}, ${absoluteConsumers.length} consumer${absoluteConsumers.length === 1 ? "" : "s"}, parser=${parser})\n`);
 	try {
 		prepassResult = await runPrepass({
 			filesToTransform: absoluteFiles,
@@ -164,9 +166,10 @@ async function runTransform(options) {
 			leavesOnly,
 			resolveBaseComponent: adapterInput.resolveBaseComponent
 		});
+		Logger.info(`Prepass: completed in ${formatElapsedSeconds(prepassStartedAt)}s\n`);
 	} catch (err) {
 		if (adapterInput.externalInterface === "auto") throw createAutoPrepassFailureError(err, consumerPatterns, parser);
-		Logger.warn(`Prepass failed, continuing without cross-file analysis: ${err instanceof Error ? err.message : String(err)}`);
+		Logger.warn(`Prepass failed after ${formatElapsedSeconds(prepassStartedAt)}s, continuing without cross-file analysis: ${err instanceof Error ? err.message : String(err)}`);
 		prepassResult = {
 			crossFileInfo: {
 				selectorUsages: /* @__PURE__ */ new Map(),
@@ -176,13 +179,16 @@ async function runTransform(options) {
 				globalLeafKeys: leavesOnly ? /* @__PURE__ */ new Set() : void 0
 			},
 			consumerAnalysis: void 0,
-			forwardedAsConsumers: /* @__PURE__ */ new Map()
+			forwardedAsConsumers: /* @__PURE__ */ new Map(),
+			typeScriptMetadata: void 0
 		};
 	}
 	const transformedFiles = /* @__PURE__ */ new Set();
+	const transformedFileSources = /* @__PURE__ */ new Map();
 	const crossFilePrepassResult = {
 		...prepassResult.crossFileInfo,
-		transformedFiles
+		transformedFiles,
+		typeScriptMetadata: prepassResult.typeScriptMetadata
 	};
 	const resolvedAdapter = (() => {
 		if (adapterInput.externalInterface === "auto" && prepassResult.consumerAnalysis) {
@@ -243,12 +249,17 @@ async function runTransform(options) {
 					if (!resolvedImport) return;
 					const resolvedPath = toRealPath(resolvedImport);
 					const definitionSourcePath = resolveExistingSourcePath(resolveBarrelReExport(resolvedPath, ctx.importedName, prepassResolve, cachedRead) ?? resolvedPath);
-					if (!transformedFiles.has(toRealPath(definitionSourcePath))) return;
 					const autoInterfaceNames = ctx.importedName === "default" ? [ctx.localName, ctx.importedName] : [ctx.importedName];
 					const styledDefinitionNames = getStyledDefinitionNames(definitionSourcePath);
 					const sourceComponentNames = ctx.importedName === "default" ? [ctx.localName, getDefaultExportedName(definitionSourcePath)].filter((name) => typeof name === "string") : [ctx.importedName];
-					const definitionSource = cachedRead(definitionSourcePath);
-					if (!(definitionSource.includes("sx?: stylex.StyleXStyles") && sourceComponentNames.some((name) => definitionSource.includes(name))) && !sourceComponentNames.some((name) => styledDefinitionNames.has(name))) return;
+					if (findTypedComponentMetadata(prepassResult.typeScriptMetadata, definitionSourcePath, sourceComponentNames)?.supportsSxProp === true) return { acceptsSx: true };
+					if (transformedComponentAcceptsSx({
+						absolutePath: definitionSourcePath,
+						componentNames: sourceComponentNames,
+						sourceOverrides: transformedFileSources
+					})) return { acceptsSx: true };
+					if (!transformedFiles.has(toRealPath(definitionSourcePath))) return;
+					if (!sourceComponentNames.some((name) => styledDefinitionNames.has(name))) return;
 					return autoInterfaceNames.map((name) => lookupAutoExternalInterface(definitionSourcePath, name)).find((result) => result !== void 0)?.styles ? { acceptsSx: true } : void 0;
 				}
 			};
@@ -297,7 +308,7 @@ async function runTransform(options) {
 		sidecarFiles,
 		bridgeResults,
 		transformedFiles,
-		transformedFileSources: /* @__PURE__ */ new Map(),
+		transformedFileSources,
 		transientPropRenames,
 		allowPartialMigration: options.allowPartialMigration ?? (leavesOnly ? true : false),
 		transformMode: leavesOnly ? "leavesOnly" : options.transformMode ?? "all",
@@ -309,7 +320,7 @@ async function runTransform(options) {
 	const result = await runTransformSequentially(transformModule, filePaths, runnerOptions);
 	if (sidecarFiles.size > 0 && !dryRun) for (const [sidecarPath, content] of sidecarFiles) await writeFile(sidecarPath, mergeSidecarContent(sidecarPath, content), "utf-8");
 	if (bridgeResults.size > 0 && !dryRun) {
-		const { buildConsumerReplacements, patchConsumerFile } = await import("./bridge-consumer-patcher-31jI1854.mjs");
+		const { buildConsumerReplacements, patchConsumerFile } = await import("./bridge-consumer-patcher-DNsxze1l.mjs");
 		const consumerReplacements = buildConsumerReplacements(crossFilePrepassResult.selectorUsages, bridgeResults, transformedFiles);
 		const patchedFiles = [];
 		for (const [consumerPath, replacements] of consumerReplacements) {
@@ -322,7 +333,7 @@ async function runTransform(options) {
 		if (formatterCommands && patchedFiles.length > 0) await runFormatters(formatterCommands, patchedFiles);
 	}
 	if (prepassResult.forwardedAsConsumers.size > 0 && !dryRun) {
-		const { buildForwardedAsReplacements, patchConsumerForwardedAs } = await import("./forwarded-as-consumer-patcher-BYCrqzRm.mjs");
+		const { buildForwardedAsReplacements, patchConsumerForwardedAs } = await import("./forwarded-as-consumer-patcher-DoVqLOgw.mjs");
 		const forwardedAsReplacements = buildForwardedAsReplacements(prepassResult.forwardedAsConsumers, transformedFiles);
 		const patchedFiles = [];
 		for (const [consumerPath, entries] of forwardedAsReplacements) {
@@ -335,7 +346,7 @@ async function runTransform(options) {
 		if (formatterCommands && patchedFiles.length > 0) await runFormatters(formatterCommands, patchedFiles);
 	}
 	if (transientPropRenames.size > 0 && !dryRun) {
-		const { collectTransientPropPatches } = await import("./transient-prop-consumer-patcher-DdIYPSFk.mjs");
+		const { collectTransientPropPatches } = await import("./transient-prop-consumer-patcher-BX-LeC2B.mjs");
 		const patches = collectTransientPropPatches({
 			transientPropRenames,
 			consumerFilePaths: consumerFilePaths.map((p) => resolve(p)),
@@ -376,6 +387,15 @@ function createAutoPrepassFailureError(err, consumerPatterns, parser) {
 		`consumerPaths: ${consumerPatterns.length > 0 ? consumerPatterns.join(", ") : "(none)"}`
 	].join("\n"));
 }
+function formatElapsedSeconds(startedAt) {
+	return ((performance.now() - startedAt) / 1e3).toFixed(1);
+}
+function findTypedComponentMetadata(metadata, filePath, componentNames) {
+	if (!metadata) return;
+	const names = new Set(componentNames);
+	const resolvedFilePath = toRealPath(filePath);
+	return metadata.files.find((file) => file.filePath === resolvedFilePath)?.components.find((component) => names.has(component.name));
+}
 /**
 * Merge new sidecar marker content into an existing .stylex.ts file, preserving
 * user-owned exports (e.g. defineVars). If the file doesn't exist, returns content as-is.