styled-components-to-stylex-codemod 0.0.58 → 0.0.60

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { a as ImportSource, i as AdapterInput, o as MarkerFileContext, s as defineAdapter, t as CollectedWarning } from "./logger-B9VD--XI.mjs";
+import { a as ImportSource, i as AdapterInput, o as MarkerFileContext, s as defineAdapter, t as CollectedWarning } from "./logger-Byc7DAuP.mjs";
 
 //#region src/run.d.ts
 interface RunTransformOptions {

package/dist/{logger-B9VD--XI.d.mts → logger-Byc7DAuP.d.mts}

@@ -125,7 +125,8 @@ type CallResolveContext = {
   /**
    * Call arguments.
    * - literals are surfaced precisely
-   * - theme member access can be surfaced as `{ kind: "theme", path }`
+   * - theme object/member access can be surfaced as `{ kind: "theme", path }`
+   *   (`path === ""` means the whole theme object)
    * - everything else is `unknown`
    */
   args: Array<{
@@ -958,7 +959,7 @@ declare function defineAdapter<T extends AdapterInput>(adapter: T): T;
 //#endregion
 //#region src/internal/logger.d.ts
 type Severity = "info" | "warning" | "error";
-type WarningType = "`css` helper function switch must return css templates in all branches" | "`css` helper usage as a function call (css(...)) is not supported" | "`css` helper used outside of a styled component template cannot be statically transformed" | "Adapter helper call in border interpolation did not resolve to a single CSS value" | "Adapter resolveCall returned an unparseable styles expression" | "Adapter resolveCall returned an unparseable value expression" | "Adapter resolveCall returned StyleX styles for helper call where a CSS value was expected" | "Adapter resolved an imported helper call as StyleX styles without replacing the RuleSet helper" | "Adapter resolveCall returned undefined for helper call" | "Adapter resolveBaseComponent threw an error" | "Adapter resolved StyleX styles cannot be applied under nested selectors/at-rules" | "Adapter resolved StyleX styles inside pseudo selector but did not provide cssText for property expansion — add cssText to resolveCall result to enable pseudo-wrapping" | "Adapter resolved imported StyleX value under nested selectors/at-rules but did not provide cssText for property expansion — add cssText to resolveValue result to enable pseudo-wrapping" | 'Adapter resolveCall cssText could not be parsed as CSS declarations — expected semicolon-separated property: value pairs (e.g. "white-space: nowrap; overflow: hidden;")' | 'Adapter resolveValue cssText could not be parsed as CSS declarations — expected semicolon-separated property: value pairs (e.g. "white-space: nowrap; overflow: hidden;")' | "Adapter resolveValue returned an unparseable value expression" | "Adapter resolveValue returned undefined for imported value" | "Imported constant cannot be referenced inside stylex.create() — move it into a `.stylex` defineConsts/defineVars group (or map it via adapter.resolveValue)" | "Arrow function: body is not a recognized pattern (expected ternary, logical, call, or member expression)" | "Arrow function: conditional branches could not be resolved to static or theme values" | "Arrow function: helper call body is not supported" | "Arrow function: indexed theme lookup pattern not matched" | "Arrow function: logical expression pattern not supported" | "Arrow function: prop access cannot be converted to style function for this CSS property" | "Arrow function: theme access path could not be resolved" | "Component selectors like `${OtherComponent}:hover &` are not directly representable in StyleX. Manual refactor is required" | "Conditional `css` block: !important is not supported in StyleX" | "Conditional `css` block: unsupported or mixed @-rules require manual handling" | "CSS block contains unsupported at-rule (only @media, @container, and @supports are supported; mixed nested at-rules require manual handling)" | "Conditional `css` block: dynamic interpolation could not be resolved to a single component prop" | "Conditional `css` block: failed to parse expression" | "Conditional `css` block: missing CSS property name" | "Conditional `css` block: missing interpolation expression" | "Conditional `css` block: mixed static/dynamic values with non-theme expressions cannot be safely transformed" | "Conditional `css` block: multiple interpolation slots in a single property value" | "Conditional `css` block: finite ternary before a later overlapping declaration requires manual source-order handling" | "Conditional `css` block: runtime pseudo-alias styles are not supported" | "Conditional `css` block: ternary branch value could not be resolved (imported values require adapter support)" | "Conditional `css` block: ternary expressions inside pseudo selectors are not supported" | "Conditional `css` block: media query interpolation must be a simple imported reference (expressions like `value + 1` are not supported)" | "Conditional `css` block: unsupported selector" | "Directional border helper styles are not supported" | "Multi-slot border interpolation could not be resolved" | "Resolved border helper value could not be expanded to longhand properties" | "Resolved conditional border variant could not be expanded to longhand properties" | "createGlobalStyle is not supported in StyleX. Global styles should be handled separately (e.g., in a CSS file or using CSS reset libraries)" | "Failed to parse theme expressions" | "Heterogeneous background values (mix of gradients and colors) not currently supported" | "Higher-order styled factory wrappers (e.g. hoc(styled)) are not supported" | "Imported CSS helper mixins: cannot determine inherited properties for correct pseudo selector handling" | "Local helper function returns CSS that cannot be decomposed into individual properties" | "Local helper function computes CSS values that cannot be statically traced to the component prop" | "Unsupported background shorthand: multiple components cannot be mapped to a single StyleX longhand" | "Styled-components specificity hacks like `&&` / `&&&` are not representable in StyleX" | "Theme-dependent block-level conditional could not be fully resolved (branches may contain dynamic interpolations)" | "Theme-dependant call expression could not be resolved (e.g. theme helper calls like theme.highlight() are not supported)" | "Theme value with fallback (props.theme.X ?? / || default) cannot be resolved statically — use adapter.resolveValue to map theme paths to StyleX tokens" | "Theme-dependent nested prop access requires a project-specific theme source (e.g. useTheme())" | "Theme-dependent template literals require a project-specific theme source (e.g. useTheme())" | "Theme prop overrides on styled components are not supported" | "Universal selectors (`*`) are currently unsupported" | "Unsupported call expression (expected imported helper(...) or imported helper(...)(...))" | "Unsupported conditional test in shouldForwardProp" | "Unsupported .attrs() callback pattern" | "Unsupported .attrs() object value" | "Unsupported .attrs() object/array value on a styled component sharing a multi-declarator statement" | "Unsupported .attrs() object/array value on a styled component whose name is shadowed in another scope" | "Unsupported shouldForwardProp pattern (only !prop.startsWith(), ![].includes(prop), and prop !== are supported)" | "Unsupported interpolation: arrow function" | "Unsupported interpolation: call expression" | "Unsupported interpolation: identifier" | "css helper with prop-based interpolation cannot be reused as a mixin" | "Unsupported interpolation: member expression" | "Unsupported interpolation: multiple dynamic slots in one declaration" | "Unsupported interpolation: property" | "Unsupported interpolation: unknown" | `Unsupported CSS property "${string}" cannot be emitted in StyleX` | "Dynamic logical scroll shorthand cannot be expanded — bind a specific longhand (e.g. scroll-padding-inline-start) instead" | "Imported runtime condition root collides with a component prop of the same name" | "Mixed logical and physical scroll properties cannot be normalized without a known writing-mode" | "Unsupported nested conditional interpolation" | "Unsupported prop-based inline style expression cannot be safely inlined" | "Unsupported prop-based inline style props.theme access is not supported" | "Unsupported selector interpolation: imported value in selector position" | "Unsupported: media query interpolation must be a simple imported reference (expressions like `value + 1` are not supported)" | "Unsupported selector: class selector" | "Unsupported selector: comma-separated selectors must all be simple pseudos or pseudo-elements" | "Unsupported selector: descendant pseudo selector (space before pseudo)" | "Unsupported selector: adjacent sibling combinator" | "Unsupported selector: descendant/child/sibling selector" | "Unsupported selector: conditional css block inside pseudo-element selector" | "Unsupported selector: interpolated pseudo selector" | "Unsupported selector: pseudo-class on pseudo-element selector" | "Unsupported selector: unsupported pseudo-element" | "Unsupported selector: sibling combinator" | "Unsupported selector: unresolved interpolation in sibling selector" | "Unsupported selector: ambiguous element selector" | "Unsupported selector: attribute selector on unsupported element" | "Unsupported selector: element selector on exported component" | "Unsupported selector: element selector with combined ancestor and child pseudos" | "Unsupported selector: element selector with dynamic children" | "Unsupported selector: element selector with plain intrinsic children" | "Unsupported selector: element selector pseudo collision" | "Unsupported selector: cross-file component selector target has no JSX usage in this file" | "Unsupported selector: unresolved interpolation in cross-file component selector" | "Unsupported selector: unresolved interpolation in descendant component selector" | "Unsupported selector: unresolved interpolation in attribute selector" | "Unsupported selector: unresolved interpolation in element selector" | "Unsupported selector: unresolved interpolation in reverse component selector" | "Unsupported selector: unresolved interpolation in cross-component sibling selector" | "Unsupported selector: grouped reverse selector references different components" | "Unsupported selector: computed media query inside ancestor attribute selector" | "Unsupported selector: computed media query inside cross-component sibling selector" | "Unsupported selector: computed media query inside sibling selector" | "Unsupported selector: computed media query inside :has() component selector" | "Unsupported: a property combines a computed at-rule key (from resolveSelector) with a static at-rule key on the same property — StyleX emits computed keys last, so the original cascade order between the at-rules cannot be preserved" | "Unsupported selector: cross-file :has() component selector not yet supported" | "Unsupported selector: unresolved interpolation in :has() component selector" | "Unsupported selector: unknown component selector" | "Unsupported selector: component selector with child pseudo" | "Unsupported selector: component selector target has no patchable JSX usage under selector parent" | "Unsupported selector: compound pseudo selector" | "Unsupported css`` mixin: after-base mixin style is not a plain object" | "Unsupported css`` mixin: nested contextual conditions in after-base mixin" | "Unsupported css`` mixin: cannot infer base default for after-base contextual override (base value is non-literal)" | "css`` helper function interpolation references closure variable that cannot be hoisted" | "Using styled-components components as mixins is not supported; use css`` mixins or strings instead" | "Partial migration left styled-components declarations unconverted" | "styled(ImportedComponent) wraps a component whose file uses styled-components — convert the base component's file first to avoid CSS cascade conflicts" | "Partial transform would have a StyleX leaf wrap a styled-components base — the extending component was transformed but its base was not, so the leaf's StyleX overrides cannot reliably beat the base's styled-components styles" | "Partial transform would leave a StyleX child reveal targeting a styled-components ancestor — the component-selector ancestor was not converted, so it cannot render the marker the child's stylex.when.ancestor() reveal needs; the child is preserved as styled-components to keep the reveal working" | "Conditional StyleX default would override an unproven earlier style for the same property" | "Flat StyleX value would erase earlier conditional property states" | "Forwarded sx conditional default would override an unproven wrapped component base style" | "Wrapped component does not accept className or sx for generated StyleX styles" | "Wrapped component sx prop targets an inner element for a root style property" | "Wrapped component sx prop rejects logical CSS properties that cannot be preserved losslessly" | "Wrapped component sx prop does not accept generated StyleX property" | "Transient $-prefixed props renamed on exported component — update consumer call sites to use the new prop names" | "Shorthand property has an opaque value that StyleX will expand to longhands — use `directional` in resolveValue to return separate longhand tokens" | "animation shorthand contains a var() with no classifiable fallback — its longhand position cannot be determined statically; bind the variable to a specific longhand (e.g. animation-duration: var(--x)) instead";
+type WarningType = "`css` helper function switch must return css templates in all branches" | "`css` helper usage as a function call (css(...)) is not supported" | "`css` helper used outside of a styled component template cannot be statically transformed" | "Adapter helper call in border interpolation did not resolve to a single CSS value" | "Adapter resolveCall returned an unparseable styles expression" | "Adapter resolveCall returned an unparseable value expression" | "Adapter resolveCall returned StyleX styles for helper call where a CSS value was expected" | "Adapter resolved an imported helper call as StyleX styles without replacing the RuleSet helper" | "Adapter resolveCall returned undefined for helper call" | "Adapter resolveBaseComponent threw an error" | "Adapter resolved className-only helper cannot be applied under nested selectors/at-rules" | "Adapter resolved StyleX styles cannot be applied under nested selectors/at-rules" | "Adapter resolved StyleX styles inside pseudo selector but did not provide cssText for property expansion — add cssText to resolveCall result to enable pseudo-wrapping" | "Adapter resolved imported StyleX value under nested selectors/at-rules but did not provide cssText for property expansion — add cssText to resolveValue result to enable pseudo-wrapping" | 'Adapter resolveCall cssText could not be parsed as CSS declarations — expected semicolon-separated property: value pairs (e.g. "white-space: nowrap; overflow: hidden;")' | 'Adapter resolveValue cssText could not be parsed as CSS declarations — expected semicolon-separated property: value pairs (e.g. "white-space: nowrap; overflow: hidden;")' | "Adapter resolveValue returned an unparseable value expression" | "Adapter resolveValue returned undefined for imported value" | "Imported constant cannot be referenced inside stylex.create() — move it into a `.stylex` defineConsts/defineVars group (or map it via adapter.resolveValue)" | "Arrow function: body is not a recognized pattern (expected ternary, logical, call, or member expression)" | "Arrow function: conditional branches could not be resolved to static or theme values" | "Arrow function: helper call body is not supported" | "Arrow function: indexed theme lookup pattern not matched" | "Arrow function: logical expression pattern not supported" | "Arrow function: prop access cannot be converted to style function for this CSS property" | "Arrow function: theme access path could not be resolved" | "Component selectors like `${OtherComponent}:hover &` are not directly representable in StyleX. Manual refactor is required" | "Conditional `css` block: !important is not supported in StyleX" | "Conditional `css` block: unsupported or mixed @-rules require manual handling" | "CSS block contains unsupported at-rule (only @media, @container, and @supports are supported; mixed nested at-rules require manual handling)" | "Conditional `css` block: dynamic interpolation could not be resolved to a single component prop" | "Conditional `css` block: failed to parse expression" | "Conditional `css` block: missing CSS property name" | "Conditional `css` block: missing interpolation expression" | "Conditional `css` block: mixed static/dynamic values with non-theme expressions cannot be safely transformed" | "Conditional `css` block: multiple interpolation slots in a single property value" | "Conditional `css` block: finite ternary before a later overlapping declaration requires manual source-order handling" | "Conditional `css` block: runtime pseudo-alias styles are not supported" | "Conditional `css` block: ternary branch value could not be resolved (imported values require adapter support)" | "Conditional `css` block: ternary expressions inside pseudo selectors are not supported" | "Conditional `css` block: media query interpolation must be a simple imported reference (expressions like `value + 1` are not supported)" | "Conditional `css` block: unsupported selector" | "Directional border helper styles are not supported" | "Multi-slot border interpolation could not be resolved" | "Resolved border helper value could not be expanded to longhand properties" | "Resolved conditional border variant could not be expanded to longhand properties" | "createGlobalStyle is not supported in StyleX. Global styles should be handled separately (e.g., in a CSS file or using CSS reset libraries)" | "Failed to parse theme expressions" | "Heterogeneous background values (mix of gradients and colors) not currently supported" | "Higher-order styled factory wrappers (e.g. hoc(styled)) are not supported" | "Imported CSS helper mixins: cannot determine inherited properties for correct pseudo selector handling" | "Local helper function returns CSS that cannot be decomposed into individual properties" | "Local helper function computes CSS values that cannot be statically traced to the component prop" | "Unsupported background shorthand: multiple components cannot be mapped to a single StyleX longhand" | "Styled-components specificity hacks like `&&` / `&&&` are not representable in StyleX" | "Theme-dependent block-level conditional could not be fully resolved (branches may contain dynamic interpolations)" | "Theme-dependant call expression could not be resolved (e.g. theme helper calls like theme.highlight() are not supported)" | "Theme value with fallback (props.theme.X ?? / || default) cannot be resolved statically — use adapter.resolveValue to map theme paths to StyleX tokens" | "Theme-dependent nested prop access requires a project-specific theme source (e.g. useTheme())" | "Theme-dependent template literals require a project-specific theme source (e.g. useTheme())" | "Theme prop overrides on styled components are not supported" | "Universal selectors (`*`) are currently unsupported" | "Unsupported call expression (expected imported helper(...) or imported helper(...)(...))" | "Unsupported conditional test in shouldForwardProp" | "Unsupported .attrs() callback pattern" | "Unsupported .attrs() object value" | "Unsupported .attrs() object/array value on a styled component sharing a multi-declarator statement" | "Unsupported .attrs() object/array value on a styled component whose name is shadowed in another scope" | "Unsupported shouldForwardProp pattern (only !prop.startsWith(), ![].includes(prop), and prop !== are supported)" | "Unsupported interpolation: arrow function" | "Unsupported interpolation: call expression" | "Unsupported interpolation: identifier" | "css helper with prop-based interpolation cannot be reused as a mixin" | "Unsupported interpolation: member expression" | "Unsupported interpolation: multiple dynamic slots in one declaration" | "Unsupported interpolation: property" | "Unsupported interpolation: unknown" | `Unsupported CSS property "${string}" cannot be emitted in StyleX` | "Dynamic logical scroll shorthand cannot be expanded — bind a specific longhand (e.g. scroll-padding-inline-start) instead" | "Prop-dependent dynamic style function cannot also carry a computed media-query override for the same property — split into static conditional styles or bind the media value separately" | "Imported runtime condition root collides with a component prop of the same name" | "Mixed logical and physical scroll properties cannot be normalized without a known writing-mode" | "Unsupported nested conditional interpolation" | "Unsupported prop-based inline style expression cannot be safely inlined" | "Unsupported prop-based inline style props.theme access is not supported" | "Unsupported selector interpolation: imported value in selector position" | "Unsupported: media query interpolation must be a simple imported reference (expressions like `value + 1` are not supported)" | "Unsupported selector: class selector" | "Unsupported selector: comma-separated selectors must all be simple pseudos or pseudo-elements" | "Unsupported selector: descendant pseudo selector (space before pseudo)" | "Unsupported selector: adjacent sibling combinator" | "Unsupported selector: descendant/child/sibling selector" | "Unsupported selector: conditional css block inside pseudo-element selector" | "Unsupported selector: interpolated pseudo selector" | "Unsupported selector: pseudo-class on pseudo-element selector" | "Unsupported selector: unsupported pseudo-element" | "Unsupported selector: sibling combinator" | "Unsupported selector: unresolved interpolation in sibling selector" | "Unsupported selector: ambiguous element selector" | "Unsupported selector: attribute selector on unsupported element" | "Unsupported selector: element selector on exported component" | "Unsupported selector: element selector with combined ancestor and child pseudos" | "Unsupported selector: element selector with dynamic children" | "Unsupported selector: element selector with plain intrinsic children" | "Unsupported selector: element selector pseudo collision" | "Unsupported selector: cross-file component selector target has no JSX usage in this file" | "Unsupported selector: unresolved interpolation in cross-file component selector" | "Unsupported selector: unresolved interpolation in descendant component selector" | "Unsupported selector: unresolved interpolation in attribute selector" | "Unsupported selector: unresolved interpolation in element selector" | "Unsupported selector: unresolved interpolation in reverse component selector" | "Unsupported selector: unresolved interpolation in cross-component sibling selector" | "Unsupported selector: grouped reverse selector references different components" | "Unsupported selector: computed media query inside ancestor attribute selector" | "Unsupported selector: computed media query inside cross-component sibling selector" | "Unsupported selector: computed media query inside sibling selector" | "Unsupported selector: computed media query inside :has() component selector" | "Unsupported: a property combines a computed at-rule key (from resolveSelector) with a static at-rule key on the same property — StyleX emits computed keys last, so the original cascade order between the at-rules cannot be preserved" | "Unsupported selector: cross-file :has() component selector not yet supported" | "Unsupported selector: unresolved interpolation in :has() component selector" | "Unsupported selector: unknown component selector" | "Unsupported selector: component selector with child pseudo" | "Unsupported selector: component selector target has no patchable JSX usage under selector parent" | "Unsupported selector: compound pseudo selector" | "Unsupported css`` mixin: after-base mixin style is not a plain object" | "Unsupported css`` mixin: nested contextual conditions in after-base mixin" | "Unsupported css`` mixin: cannot infer base default for after-base contextual override (base value is non-literal)" | "css`` helper function interpolation references closure variable that cannot be hoisted" | "Using styled-components components as mixins is not supported; use css`` mixins or strings instead" | "Partial migration left styled-components declarations unconverted" | "styled(ImportedComponent) wraps a component whose file uses styled-components — convert the base component's file first to avoid CSS cascade conflicts" | "Partial transform would have a StyleX leaf wrap a styled-components base — the extending component was transformed but its base was not, so the leaf's StyleX overrides cannot reliably beat the base's styled-components styles" | "Partial transform would leave a StyleX child reveal targeting a styled-components ancestor — the component-selector ancestor was not converted, so it cannot render the marker the child's stylex.when.ancestor() reveal needs; the child is preserved as styled-components to keep the reveal working" | "Conditional StyleX default would override an unproven earlier style for the same property" | "Flat StyleX value would erase earlier conditional property states" | "Forwarded sx conditional default would override an unproven wrapped component base style" | "Wrapped component does not accept className or sx for generated StyleX styles" | "Wrapped component sx prop targets an inner element for a root style property" | "Wrapped component sx prop rejects logical CSS properties that cannot be preserved losslessly" | "Wrapped component sx prop does not accept generated StyleX property" | "Transient $-prefixed props renamed on exported component — update consumer call sites to use the new prop names" | "Shorthand property has an opaque value that StyleX will expand to longhands — use `directional` in resolveValue to return separate longhand tokens" | "animation shorthand contains a var() with no classifiable fallback — its longhand position cannot be determined statically; bind the variable to a specific longhand (e.g. animation-duration: var(--x)) instead";
 interface WarningLog {
   severity: Severity;
   type: WarningType;

package/dist/transform.d.mts

@@ -1,4 +1,4 @@
-import { n as WarningLog, r as Adapter } from "./logger-B9VD--XI.mjs";
+import { n as WarningLog, r as Adapter } from "./logger-Byc7DAuP.mjs";
 import { API, FileInfo, Options } from "jscodeshift";
 //#region src/internal/prepass/typescript-analysis.d.ts
 interface TypeScriptPrepassMetadata {

package/dist/transform.mjs

@@ -2940,6 +2940,49 @@ function isSlotBindingOrJsxTagReference(idNode, parent) {
 	}
 }
 //#endregion
+//#region src/internal/utilities/import-source.ts
+/**
+* Helpers for converting an `ImportSource` into the textual specifier used in
+* an emitted `import` declaration, and into a writable absolute file path.
+*/
+/**
+* Convert an `ImportSource` to a module specifier string for use in import declarations.
+* - `kind: "specifier"` → returned as-is.
+* - `kind: "absolutePath"` → returned as a relative path from `filePath`'s directory,
+*   prefixed with `./` when needed.
+*
+* Pass `stripTsExtension: true` to drop a trailing `.ts`/`.tsx` from the relative
+* specifier (e.g. when emitting an import to a sidecar `.stylex.ts` file).
+*/
+function importSourceToModuleSpecifier(source, filePath, options = {}) {
+	if (source.kind === "specifier") return source.value;
+	let rel = relative(dirname(filePath), source.value).split(sep).join("/");
+	if (options.stripTsExtension) rel = rel.replace(/\.tsx?$/, "");
+	if (!rel.startsWith(".")) rel = `./${rel}`;
+	return rel;
+}
+/**
+* Resolve an `ImportSource` to an absolute file path for writing the sidecar file.
+* - `kind: "absolutePath"` → returned as-is.
+* - `kind: "specifier"` → resolved relative to `filePath`'s directory; appends `.ts`
+*   when the result has no `.{j,t}sx?` extension.
+*/
+function importSourceToAbsolutePath(source, filePath) {
+	if (source.kind === "absolutePath") return source.value;
+	let resolved = join(dirname(filePath), source.value);
+	if (!/\.[jt]sx?$/.test(resolved)) resolved += ".ts";
+	return resolved;
+}
+/**
+* Throws if `source` is structurally invalid for use as a module reference,
+* with a `label` prefixed for caller context. Used by the merger import step
+* which validates user-provided adapter configuration at use-time.
+*/
+function assertValidImportSource(source, label) {
+	if (typeof source.value !== "string" || source.value.trim() === "") throw new Error(`Invalid ${label}: expected non-empty string, got ${JSON.stringify(source.value)}`);
+	if (source.kind === "absolutePath" && !isAbsolute(source.value)) throw new Error(`Invalid ${label}: expected absolute path, got ${JSON.stringify(source.value)}`);
+}
+//#endregion
 //#region src/internal/utilities/component-value-references.ts
 /**
 * True when this Identifier path is a non-JSX value reference to a styled component (not its
@@ -3261,17 +3304,21 @@ function getCalleeIdentName(callee) {
 function callArgFromNode(node, propsParamName, themeBindingName) {
 	if (!node || typeof node !== "object") return { kind: "unknown" };
 	const type = node.type;
+	if (type === "Identifier" && typeof themeBindingName === "string" && themeBindingName && node.name === themeBindingName) return {
+		kind: "theme",
+		path: ""
+	};
 	if (type === "MemberExpression") {
 		if (typeof propsParamName === "string" && propsParamName) {
 			const parts = getMemberPathFromIdentifier(node, propsParamName);
-			if (parts && parts[0] === "theme" && parts.length > 1) return {
+			if (parts && parts[0] === "theme") return {
 				kind: "theme",
 				path: parts.slice(1).join(".")
 			};
 		}
 		if (typeof themeBindingName === "string" && themeBindingName) {
 			const parts = getMemberPathFromIdentifier(node, themeBindingName);
-			if (parts && parts.length > 0) return {
+			if (parts) return {
 				kind: "theme",
 				path: parts.join(".")
 			};
@@ -5530,7 +5577,7 @@ function collectStylexCreateMaps(ast, moduleBindings) {
 		for (const node of Array.isArray(declaration.declarations) ? declaration.declarations : []) {
 			if (!isRecord(node) || node.type !== "VariableDeclarator") continue;
 			const id = node.id;
-			const init = node.init;
+			const init = unwrapExpression(node.init);
 			if (!isIdentifier(id) || !isRecord(init) || !isStylexCreateCall$1(init)) continue;
 			const stylesArg = getCallArguments(init)[0];
 			if (!isObjectExpression$1(stylesArg)) continue;
@@ -5588,11 +5635,14 @@ function readStyleObjectProps(styleObject, moduleBindings, dynamicValueNames = /
 		const resolution = resolveConstReference(property.value, moduleBindings);
 		if (resolution.kind === "unresolved") {
 			if (dynamicValueNames.has(resolution.name)) props.set(key, { kind: "dynamic" });
-			else complete = false;
+			else props.set(key, { kind: "unknownConditionalMap" });
 			continue;
 		}
 		const valueNode = resolution.node;
-		if (isObjectExpression$1(valueNode) && objectExpressionHasUnreadProperties(valueNode)) complete = false;
+		if (isObjectExpression$1(valueNode) && objectExpressionHasUnreadProperties(valueNode)) {
+			props.set(key, { kind: "unknownConditionalMap" });
+			continue;
+		}
 		const value = readAstPropertyShape(valueNode, moduleBindings);
 		if (value.kind !== "absent") props.set(key, value);
 	}
@@ -5971,6 +6021,10 @@ function analyzeStyleEntry(styleEntry, prop, called) {
 	};
 	const value = styleEntry.props.get(prop);
 	if (!value) return { kind: "absent" };
+	if (value.kind === "unknownConditionalMap") return {
+		kind: "variableConditionalMap",
+		conditionKeys: []
+	};
 	if (styleEntry.kind === "function" || called || value.kind === "dynamic") return value.kind === "conditionalMap" ? {
 		kind: "variableConditionalMap",
 		conditionKeys: value.conditionKeys
@@ -6232,7 +6286,7 @@ function isSxExpression(node, sxBindings) {
 }
 function unwrapExpression(node) {
 	let current = node;
-	while (isRecord(current) && (current.type === "TSAsExpression" || current.type === "TSTypeAssertion" || current.type === "ParenthesizedExpression")) current = current.expression;
+	while (isRecord(current) && (current.type === "TSAsExpression" || current.type === "TSTypeAssertion" || current.type === "TSNonNullExpression" || current.type === "TSSatisfiesExpression" || current.type === "ParenthesizedExpression")) current = current.expression;
 	return current;
 }
 function unwrapAssignmentPattern(node) {
@@ -6279,10 +6333,22 @@ function getFunctionParams(node) {
 }
 function readPropertyKey$1(property) {
 	const key = property.key;
+	if (property.computed === true) return readComputedPropertyKey(key);
 	if (isIdentifier(key)) return key.name;
 	if (isRecord(key) && (key.type === "StringLiteral" || key.type === "Literal")) return typeof key.value === "string" ? key.value : null;
 	return null;
 }
+function readComputedPropertyKey(key) {
+	const literalKey = readStringLiteralKey(key);
+	if (literalKey) return literalKey;
+	if (!isRecord(key) || key.type !== "MemberExpression") return null;
+	const memberKey = readStringLiteralKey(key.property);
+	return memberKey?.startsWith("--") ? memberKey : null;
+}
+function readStringLiteralKey(key) {
+	if (!isRecord(key) || key.type !== "StringLiteral" && key.type !== "Literal") return null;
+	return typeof key.value === "string" ? key.value : null;
+}
 function isStaticValue(value) {
 	return typeof value === "string" || typeof value === "number" || typeof value === "boolean" || value === null;
 }
@@ -9879,17 +9945,24 @@ function analyzeBeforeEmitStep(ctx) {
 		if (j(p).closest(j.TaggedTemplateExpression).filter((tp) => ctx.isStyledTag(tp.node.tag)).size() > 0) return false;
 		return true;
 	}).size() > 0;
-	const existingImportLocals = /* @__PURE__ */ new Set();
+	const existingImportBindings = /* @__PURE__ */ new Map();
 	root.find(j.ImportDeclaration).forEach((p) => {
 		const specs = p.node.specifiers ?? [];
+		const sourceValue = typeof p.node.source?.value === "string" ? p.node.source.value : null;
 		for (const s of specs) {
 			if (s?.importKind === "type") continue;
 			const local = s?.local?.type === "Identifier" ? s.local.name : s?.type === "ImportDefaultSpecifier" && s.local?.type === "Identifier" ? s.local.name : s?.type === "ImportNamespaceSpecifier" && s.local?.type === "Identifier" ? s.local.name : null;
-			if (local && isUsedOutsideStyledTemplates(local)) existingImportLocals.add(local);
+			if (local && isUsedOutsideStyledTemplates(local)) {
+				const imported = s?.type === "ImportDefaultSpecifier" ? "default" : s?.type === "ImportNamespaceSpecifier" ? "*" : s?.imported?.name ?? s?.imported?.value ?? null;
+				existingImportBindings.set(local, sourceValue !== null && typeof imported === "string" ? {
+					imported,
+					source: sourceValue
+				} : null);
+			}
 		}
 	});
 	const resolverImportAliases = /* @__PURE__ */ new Map();
-	const usedLocals = new Set(existingImportLocals);
+	const usedLocals = new Set(existingImportBindings.keys());
 	const makeUniqueLocal = (base) => {
 		let candidate = base;
 		let i = 1;
@@ -9903,7 +9976,10 @@ function analyzeBeforeEmitStep(ctx) {
 	for (const imp of ctx.resolverImports.values()) for (const n of imp.names ?? []) {
 		const desired = n.local ?? n.imported;
 		if (!desired) continue;
-		if (existingImportLocals.has(desired)) {
+		if (existingImportBindings.has(desired)) {
+			const existingBinding = existingImportBindings.get(desired);
+			const resolverModuleSpecifier = importSourceToModuleSpecifier(imp.from, file.path, { stripTsExtension: true });
+			if (existingBinding && existingBinding.imported === n.imported && existingBinding.source === resolverModuleSpecifier) continue;
 			const alias = makeUniqueLocal(`${desired}Vars`);
 			resolverImportAliases.set(desired, alias);
 			n.local = alias;
@@ -13254,20 +13330,44 @@ function findStylexCreateBlockEnd(code, blockStart) {
 	let blockEnd = blockStart;
 	let inString = null;
 	let escaped = false;
+	let inLineComment = false;
+	let inBlockComment = false;
 	for (let i = blockStart; i < code.length && depth > 0; i++) {
 		const ch = code[i];
-		if (escaped) {
-			escaped = false;
+		const next = code[i + 1];
+		if (inLineComment) {
+			if (ch === "\n") inLineComment = false;
 			continue;
 		}
-		if (ch === "\\") {
-			escaped = true;
+		if (inBlockComment) {
+			if (ch === "*" && next === "/") {
+				inBlockComment = false;
+				i++;
+			}
 			continue;
 		}
 		if (inString) {
+			if (escaped) {
+				escaped = false;
+				continue;
+			}
+			if (ch === "\\") {
+				escaped = true;
+				continue;
+			}
 			if (ch === inString) inString = null;
 			continue;
 		}
+		if (ch === "/" && next === "/") {
+			inLineComment = true;
+			i++;
+			continue;
+		}
+		if (ch === "/" && next === "*") {
+			inBlockComment = true;
+			i++;
+			continue;
+		}
 		if (ch === "\"" || ch === "'" || ch === "`") {
 			inString = ch;
 			continue;
@@ -13303,10 +13403,79 @@ function transformStylexCreateBlocks(code, transformBlock) {
 /**
 * Remove blank lines inside stylex.create({...}) blocks.
 * Finds each `stylex.create({` and tracks brace depth to the matching `})`,
-* then removes blank lines between properties within that region.
+* then drops every blank line within that region so style entries stay adjacent.
+* Blank lines inside multiline template-literal values are preserved, since they
+* are part of the CSS value and removing them would not be lossless.
 */
 function removeBlankLinesInStylexCreate(code) {
-	return transformStylexCreateBlocks(code, (blockContent) => blockContent.replace(/(\n\s*\},)\n\n+(\s+(?:[a-zA-Z_$][a-zA-Z0-9_$]*|["'].*?["']|\d+|::[a-zA-Z-]+|@[a-zA-Z-]+|:[a-zA-Z-]+)\s*:)/g, "$1\n$2").replace(/,\n\n+(\s+(?:[a-zA-Z_$"']|\/\/|\/\*))/g, ",\n$1").replace(/content:\s+"\\"([\s\S]*?)\\""/g, "content: '\"$1\"'").replace(/content:\s+"'\s*([\s\S]*?)\s*'"/g, "content: '\"$1\"'"));
+	return transformStylexCreateBlocks(code, (blockContent) => {
+		const lines = blockContent.split("\n");
+		const protectedLines = protectedLineStarts(blockContent, lines.length);
+		const kept = [];
+		for (let i = 0; i < lines.length; i++) {
+			const line = lines[i] ?? "";
+			if (!protectedLines[i] && line.trim() === "") continue;
+			kept.push(line);
+		}
+		return kept.join("\n").replace(/content:\s+"\\"([\s\S]*?)\\""/g, "content: '\"$1\"'").replace(/content:\s+"'\s*([\s\S]*?)\s*'"/g, "content: '\"$1\"'");
+	});
+}
+/**
+* Returns, per line, whether that line *starts* inside a region where blank
+* lines are content and must be preserved: a multiline template-literal value or
+* a multiline block comment. Backticks inside comments or other string literals
+* are ignored, so an unmatched backtick in a preserved comment cannot flip the
+* template state and corrupt a following template value.
+*/
+function protectedLineStarts(code, lineCount) {
+	const protectedLines = Array.from({ length: lineCount }).fill(false);
+	let inString = null;
+	let inLineComment = false;
+	let inBlockComment = false;
+	let escaped = false;
+	let line = 0;
+	for (let i = 0; i < code.length; i++) {
+		const ch = code[i];
+		const next = code[i + 1];
+		if (ch === "\n") {
+			line++;
+			inLineComment = false;
+			if (line < lineCount) protectedLines[line] = inString === "`" || inBlockComment;
+			continue;
+		}
+		if (inLineComment) continue;
+		if (inBlockComment) {
+			if (ch === "*" && next === "/") {
+				inBlockComment = false;
+				i++;
+			}
+			continue;
+		}
+		if (inString) {
+			if (escaped) {
+				escaped = false;
+				continue;
+			}
+			if (ch === "\\") {
+				escaped = true;
+				continue;
+			}
+			if (ch === inString) inString = null;
+			continue;
+		}
+		if (ch === "/" && next === "/") {
+			inLineComment = true;
+			i++;
+			continue;
+		}
+		if (ch === "/" && next === "*") {
+			inBlockComment = true;
+			i++;
+			continue;
+		}
+		if (ch === "\"" || ch === "'" || ch === "`") inString = ch;
+	}
+	return protectedLines;
 }
 /**
 * Indents lines inside multiline template literal object values so each continuation
@@ -17914,49 +18083,6 @@ function rewriteCssHelpersStep(ctx) {
 	return CONTINUE;
 }
 //#endregion
-//#region src/internal/utilities/import-source.ts
-/**
-* Helpers for converting an `ImportSource` into the textual specifier used in
-* an emitted `import` declaration, and into a writable absolute file path.
-*/
-/**
-* Convert an `ImportSource` to a module specifier string for use in import declarations.
-* - `kind: "specifier"` → returned as-is.
-* - `kind: "absolutePath"` → returned as a relative path from `filePath`'s directory,
-*   prefixed with `./` when needed.
-*
-* Pass `stripTsExtension: true` to drop a trailing `.ts`/`.tsx` from the relative
-* specifier (e.g. when emitting an import to a sidecar `.stylex.ts` file).
-*/
-function importSourceToModuleSpecifier(source, filePath, options = {}) {
-	if (source.kind === "specifier") return source.value;
-	let rel = relative(dirname(filePath), source.value).split(sep).join("/");
-	if (options.stripTsExtension) rel = rel.replace(/\.tsx?$/, "");
-	if (!rel.startsWith(".")) rel = `./${rel}`;
-	return rel;
-}
-/**
-* Resolve an `ImportSource` to an absolute file path for writing the sidecar file.
-* - `kind: "absolutePath"` → returned as-is.
-* - `kind: "specifier"` → resolved relative to `filePath`'s directory; appends `.ts`
-*   when the result has no `.{j,t}sx?` extension.
-*/
-function importSourceToAbsolutePath(source, filePath) {
-	if (source.kind === "absolutePath") return source.value;
-	let resolved = join(dirname(filePath), source.value);
-	if (!/\.[jt]sx?$/.test(resolved)) resolved += ".ts";
-	return resolved;
-}
-/**
-* Throws if `source` is structurally invalid for use as a module reference,
-* with a `label` prefixed for caller context. Used by the merger import step
-* which validates user-provided adapter configuration at use-time.
-*/
-function assertValidImportSource(source, label) {
-	if (typeof source.value !== "string" || source.value.trim() === "") throw new Error(`Invalid ${label}: expected non-empty string, got ${JSON.stringify(source.value)}`);
-	if (source.kind === "absolutePath" && !isAbsolute(source.value)) throw new Error(`Invalid ${label}: expected absolute path, got ${JSON.stringify(source.value)}`);
-}
-//#endregion
 //#region src/internal/utilities/import-insertion.ts
 /**
 * Return the index of the LAST top-level `ImportDeclaration` in `body`, or -1
@@ -29143,8 +29269,8 @@ function extractThemePath(memberExpr, info) {
 	return parts.join(".");
 }
 function tryResolveArrowFnHelperCallWithThemeArg(node, ctx) {
-	const expr = getPropArrowFn(node);
-	if (!expr) return null;
+	if (!isArrowFunctionExpression(node.expr)) return null;
+	const expr = node.expr;
 	const info = getArrowFnThemeParamInfo(expr);
 	if (!info) return null;
 	const body = getFunctionBodyExpr(expr);
@@ -29154,15 +29280,14 @@ function tryResolveArrowFnHelperCallWithThemeArg(node, ctx) {
 	const propsParamName = info.kind === "propsParam" ? info.propsName : void 0;
 	const themeBindingName = info.kind === "themeBinding" ? info.themeName : void 0;
 	if (!args.some((arg) => {
-		if (!arg || arg.type !== "MemberExpression") return false;
+		if (!arg) return false;
+		if (arg.type === "Identifier" && typeof themeBindingName === "string" && arg.name === themeBindingName) return true;
+		if (arg.type !== "MemberExpression") return false;
 		if (propsParamName) {
 			const parts = getMemberPathFromIdentifier(arg, propsParamName);
-			return parts !== null && parts[0] === "theme" && parts.length > 1;
-		}
-		if (themeBindingName) {
-			const parts = getMemberPathFromIdentifier(arg, themeBindingName);
-			return parts !== null && parts.length > 0;
+			return parts !== null && parts[0] === "theme";
 		}
+		if (themeBindingName) return getMemberPathFromIdentifier(arg, themeBindingName) !== null;
 		return false;
 	})) return null;
 	const simple = resolveImportedHelperCall$1(body, ctx, propsParamName, node.css.property, themeBindingName);
@@ -38259,13 +38384,12 @@ function preScanCssHelperPlaceholders(ctx) {
 				} else {
 					const importEntry = importMap?.get(calleeName);
 					if (importEntry) {
-						const resolved = resolveCall({
+						if (!isResolvedImportedHelperForPreScan(resolveCall({
 							callSiteFilePath: filePath,
 							calleeImportedName: importEntry.importedName,
 							calleeSource: importEntry.source,
 							args: []
-						});
-						if (!resolved || !("expr" in resolved)) {
+						}), rule)) {
 							hasImportedCssHelper = true;
 							importedCssHelperLoc ??= getNodeLocStart(expr);
 						}
@@ -38298,6 +38422,12 @@ function preScanCssHelperPlaceholders(ctx) {
 	}
 	return true;
 }
+function isResolvedImportedHelperForPreScan(resolved, rule) {
+	if (!resolved) return false;
+	if ("expr" in resolved) return true;
+	if ("extraClassNames" in resolved) return rule.selector.trim() === "&" && (rule.atRuleStack ?? []).length === 0;
+	return false;
+}
 //#endregion
 //#region src/internal/lower-rules/borders.ts
 function tryHandleInterpolatedBorder(ctx, args) {
@@ -42036,9 +42166,13 @@ function calleeKey(callee) {
 //#endregion
 //#region src/internal/lower-rules/resolved-style-function-handlers.ts
 function tryHandleResolvedStyleFunctionNode(rc) {
-	const { ctx, d, media, pseudos, res, slotId, loc, avoidNames, flags, addResolverImports, bailUnsupportedLocal, annotateScalarParams, tryEmitIdentityVariantBuckets, tryEmitTransformedObservedVariantBuckets, shouldPreserveNumericCssTextForProp } = rc;
+	const { ctx, d, media, pseudos, resolvedSelectorMedia, res, slotId, loc, avoidNames, flags, addResolverImports, bailUnsupportedLocal, annotateScalarParams, tryEmitIdentityVariantBuckets, tryEmitTransformedObservedVariantBuckets, shouldPreserveNumericCssTextForProp } = rc;
 	const { state, decl, styleObj, styleFnFromProps, styleFnDecls, inlineStyleProps, annotateParamFromJsxProp } = ctx;
 	const { j, filePath, warnings, parseExpr, resolveCall, warnPropInlineStyle, resolveImportInScope, resolveImportForExpr } = state;
+	if (resolvedSelectorMedia && d.property && (decl.shouldForwardProp || res?.type === "emitStyleFunctionFromPropsObject" || res?.type === "emitStyleFunctionWithDefault" || res?.type === "emitStyleFunction")) {
+		bailUnsupportedLocal(decl, "Prop-dependent dynamic style function cannot also carry a computed media-query override for the same property — split into static conditional styles or bind the media value separately");
+		return true;
+	}
 	if (res && res.type === "emitStyleFunctionFromPropsObject") if (!d.property) {} else {
 		const e = decl.templateExpressions[slotId];
 		if (e?.type !== "ArrowFunctionExpression" && e?.type !== "FunctionExpression") {
@@ -42565,13 +42699,36 @@ function tryHandleResolvedDynamicNode(rc) {
 			expr: exprAst,
 			afterBase: hasStaticPropsBefore
 		});
+		if (resolvedStylesUsesThemeArg(res)) markDeclNeedsUseThemeHook(decl);
 		if (res.extraClassNames) collectExtraClassNames(res.extraClassNames);
 		notifyResolvedStylesArg();
 		decl.needsWrapperComponent = true;
 		return true;
 	}
 	if (res && res.type === "resolvedClassNames") {
+		if (rule.selector.trim() !== "&" || (rule.atRuleStack ?? []).length) {
+			const resolveCallMeta = res.resolveCallContext && res.resolveCallResult ? {
+				resolveCallContext: res.resolveCallContext,
+				resolveCallResult: res.resolveCallResult
+			} : void 0;
+			warnings.push({
+				severity: "warning",
+				type: "Adapter resolved className-only helper cannot be applied under nested selectors/at-rules",
+				loc,
+				context: resolveCallMeta ? {
+					selector: rule.selector,
+					atRuleStack: rule.atRuleStack,
+					...resolveCallMeta
+				} : {
+					selector: rule.selector,
+					atRuleStack: rule.atRuleStack
+				}
+			});
+			flags.bail = true;
+			return true;
+		}
 		collectExtraClassNames(res.extraClassNames);
+		if (resolvedStylesUsesThemeArg(res)) markDeclNeedsUseThemeHook(decl);
 		decl.needsWrapperComponent = true;
 		return true;
 	}
@@ -43090,6 +43247,9 @@ function tryHandleResolvedDynamicNode(rc) {
 	}
 	return tryHandleResolvedStyleFunctionNode(rc);
 }
+function resolvedStylesUsesThemeArg(res) {
+	return res.resolveCallContext?.args?.some((arg) => arg.kind === "theme") ?? false;
+}
 //#endregion
 //#region src/internal/lower-rules/rule-interpolated-declaration.ts
 function handleInterpolatedDeclaration(args) {
@@ -43105,7 +43265,7 @@ function handleInterpolatedDeclaration(args) {
 			if (isJsxPropOptional(propName)) addUndefinedToParamType(j, param);
 		});
 	};
-	const { api, j, filePath, warnings, resolverImports, keyframesNames, parseExpr, resolveValue, resolveCall, importMap, cssHelperNames, cssHelperObjectMembers, declByLocalName, cssHelperValuesByKey, staticPropertyValues, applyCssHelperMixin, hasLocalThemeBinding, resolveThemeValue, resolveThemeValueFromFn, getOrCreateLocalStylexVar } = state;
+	const { api, j, filePath, warnings, resolverImports, keyframesNames, parseExpr, resolveValue, resolveCall, importMap, cssHelperNames, cssHelperObjectMembers, declByLocalName, cssHelperValuesByKey, staticPropertyValues, localFunctionIdentifierNames, applyCssHelperMixin, hasLocalThemeBinding, resolveThemeValue, resolveThemeValueFromFn, getOrCreateLocalStylexVar } = state;
 	const avoidNames = new Set(importMap.keys());
 	if (state.bail) return;
 	if (d.value.kind !== "interpolated") return;
@@ -43146,6 +43306,15 @@ function handleInterpolatedDeclaration(args) {
 		flags
 	});
 	for (let _i = 0; _i < 1; _i++) {
+		if (flags.bail) break;
+		for (const part of d.value.parts ?? []) {
+			if (part?.kind !== "slot" || part.slotId === void 0) continue;
+			const slotExpr = decl.templateExpressions[part.slotId];
+			if (slotExpr?.type === "Identifier" && slotExpr.name && localFunctionIdentifierNames.has(slotExpr.name)) {
+				bailUnsupportedLocal(decl, "Unsupported interpolation: identifier");
+				break;
+			}
+		}
 		if (flags.bail) break;
 		if (tryHandleMappedFunctionColor(d)) continue;
 		if (tryHandleAnimation({
@@ -46176,10 +46345,13 @@ function createLowerRulesState(ctx) {
 	};
 	const staticPropertyValues = /* @__PURE__ */ new Map();
 	const staticIdentifierValues = /* @__PURE__ */ new Map();
+	const localFunctionIdentifierNames = /* @__PURE__ */ new Set();
 	root.find(j.VariableDeclarator).forEach((p) => {
 		if (!isTopLevelConstDeclarator(p)) return;
 		const node = p.node;
 		if (node.id?.type !== "Identifier" || !node.id.name) return;
+		const initType = node.init?.type;
+		if (initType === "ArrowFunctionExpression" || initType === "FunctionExpression") localFunctionIdentifierNames.add(node.id.name);
 		const staticValue = literalToStaticValue(node.init, { allowStaticArrowFunctions: false });
 		if (staticValue !== null) staticIdentifierValues.set(node.id.name, staticValue);
 	});
@@ -46308,6 +46480,7 @@ function createLowerRulesState(ctx) {
 		mixinValuesByKey,
 		staticPropertyValues,
 		staticIdentifierValues,
+		localFunctionIdentifierNames,
 		usedCssHelperFunctions: /* @__PURE__ */ new Set(),
 		warnPropInlineStyle,
 		applyCssHelperMixin,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "styled-components-to-stylex-codemod",
-  "version": "0.0.58",
+  "version": "0.0.60",
   "description": "Codemod to transform styled-components to StyleX",
   "keywords": [
     "codemod",