styled-components-to-stylex-codemod 0.0.35 → 0.0.36

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { o as assertValidAdapterInput, r as defineAdapter, s as describeValue, t as mergeMarkerDeclarations } from "./merge-markers-Bp-ELxFV.mjs";
+import { o as assertValidAdapterInput, r as defineAdapter, s as describeValue, t as mergeMarkerDeclarations } from "./merge-markers-B4EyveCx.mjs";
 import { t as Logger } from "./logger-fIHHMZYO.mjs";
 import { run } from "jscodeshift/src/Runner.js";
 import { fileURLToPath } from "node:url";

package/dist/{merge-markers-Bp-ELxFV.mjs → merge-markers-B4EyveCx.mjs}

@@ -107,10 +107,7 @@ function assertAdapterShape(candidate, where, allowAutoExtIf) {
 		"",
 		`Docs/examples: ${ADAPTER_DOCS_URL}`
 	].join("\n"));
-	if (!(typeof externalInterface === "function" || allowAutoExtIf && externalInterface === "auto")) {
-		const expected = allowAutoExtIf ? "adapter.externalInterface must be a function or \"auto\"." : "adapter.externalInterface must be a function.";
-		throw new Error([`${where}: ${expected}`, `Received: externalInterface=${describeValue(externalInterface)}`].join("\n"));
-	}
+	if (!(typeof externalInterface === "function" || allowAutoExtIf && externalInterface === "auto")) throw new Error([`${where}: ${allowAutoExtIf ? "adapter.externalInterface must be a function or \"auto\"." : "adapter.externalInterface must be a function."}`, `Received: externalInterface=${describeValue(externalInterface)}`].join("\n"));
 	const styleMerger = obj?.styleMerger;
 	if (styleMerger !== null && styleMerger !== void 0) {
 		if (typeof styleMerger !== "object") throw new Error([

package/dist/transform.d.mts

@@ -1,6 +1,5 @@
 import { n as WarningLog, r as Adapter } from "./logger-BoGU2nCP.mjs";
 import { API, FileInfo, Options } from "jscodeshift";
-
 //#region src/internal/transform-types.d.ts
 /** A sidecar .stylex.ts file containing defineMarker() declarations. */
 interface SidecarFile {

package/dist/transform.mjs

@@ -1,5 +1,5 @@
 import { t as createModuleResolver } from "./resolve-imports-BlxKezSJ.mjs";
-import { a as assertValidAdapter, i as isDirectionalResult, n as DEFAULT_THEME_HOOK, t as mergeMarkerDeclarations } from "./merge-markers-Bp-ELxFV.mjs";
+import { a as assertValidAdapter, i as isDirectionalResult, n as DEFAULT_THEME_HOOK, t as mergeMarkerDeclarations } from "./merge-markers-B4EyveCx.mjs";
 import { t as Logger } from "./logger-fIHHMZYO.mjs";
 import { a as isPrettierIgnoreComment, c as looksLikeLength, d as sanitizeIdentifier, i as isBackgroundImageValue, l as lowerFirst, n as capitalize, o as isValidIdentifierName, r as escapeRegex, s as kebabToCamelCase, t as camelToKebabCase, u as normalizeWhitespace } from "./string-utils-Bq7DbB2x.mjs";
 import { n as parseStyledTemplateLiteral, t as PLACEHOLDER_RE } from "./styled-css-Bu2bjAUW.mjs";
@@ -1366,20 +1366,50 @@ function rewriteCssVarsInAstNodeRoot(args) {
 }
 function rewriteCssVarsInStyleObjectImpl(obj, ctx) {
 	for (const [k, v] of Object.entries(obj)) {
-		if (v && typeof v === "object") {
-			if (isAstNode(v)) {
-				const replacement = rewriteCssVarsInAstNodeAndMaybeSimplify(v, ctx);
-				if (replacement) obj[k] = replacement;
+		if (k.startsWith("--")) {
+			const rewrittenValue = rewriteCssVarsInStyleObjectValue(v, ctx);
+			const result = ctx.resolveValue({
+				kind: "cssVariable",
+				name: k,
+				filePath: ctx.filePath,
+				...typeof v === "string" ? { definedValue: v } : {}
+			});
+			if (!result) {
+				obj[k] = rewrittenValue;
+				continue;
+			}
+			delete obj[k];
+			if (result.dropDefinition) continue;
+			const keyExpr = ctx.parseExpr(result.expr);
+			if (!keyExpr) {
+				obj[k] = rewrittenValue;
 				continue;
 			}
-			rewriteCssVarsInStyleObjectImpl(v, ctx);
+			for (const imp of result.imports ?? []) ctx.addImport(imp);
+			const computedKeys = Array.isArray(obj.__computedKeys) ? obj.__computedKeys : [];
+			computedKeys.push({
+				keyExpr,
+				value: rewrittenValue,
+				prepend: true,
+				originalCssVariableName: k
+			});
+			obj.__computedKeys = computedKeys;
 			continue;
 		}
-		if (typeof v === "string") obj[k] = rewriteCssVarsInString({
-			raw: v,
-			...ctx
-		});
+		obj[k] = rewriteCssVarsInStyleObjectValue(v, ctx);
+	}
+}
+function rewriteCssVarsInStyleObjectValue(value, ctx) {
+	if (value && typeof value === "object") {
+		if (isAstNode(value)) return rewriteCssVarsInAstNodeAndMaybeSimplify(value, ctx) ?? value;
+		rewriteCssVarsInStyleObjectImpl(value, ctx);
+		return value;
 	}
+	if (typeof value === "string") return rewriteCssVarsInString({
+		raw: value,
+		...ctx
+	});
+	return value;
 }
 /**
 * Walks an AST node (e.g. TemplateLiteral, ArrowFunctionExpression) to find `var(...)`
@@ -6826,6 +6856,11 @@ function objectToAst(j, obj) {
 	const computedKeys = Array.isArray(computedKeysRaw) ? computedKeysRaw : [];
 	const props = [];
 	for (const s of spreads) props.push(j.spreadElement(j.identifier(s)));
+	for (const entry of computedKeys) {
+		if (!entry.prepend) continue;
+		const prop = computedKeyEntryToProp(j, entry);
+		if (prop) props.push(prop);
+	}
 	for (const [key, value] of Object.entries(obj)) {
 		if (key === "__spreads") continue;
 		if (key === "__propComments") continue;
@@ -6858,20 +6893,25 @@ function objectToAst(j, obj) {
 		props.push(prop);
 	}
 	for (const entry of computedKeys) {
-		if (!entry.keyExpr || !isAstNode(entry.keyExpr)) continue;
-		const valueAst = entry.value && typeof entry.value === "object" && !isAstNode(entry.value) ? objectToAst(j, entry.value) : literalToAst(j, entry.value);
-		const prop = j.property("init", entry.keyExpr, valueAst);
-		prop.computed = true;
-		if (entry.leadingComment) prop.comments = [{
-			type: "CommentLine",
-			value: ` ${entry.leadingComment}`,
-			leading: true,
-			trailing: false
-		}];
-		props.push(prop);
+		if (entry.prepend) continue;
+		const prop = computedKeyEntryToProp(j, entry);
+		if (prop) props.push(prop);
 	}
 	return j.objectExpression(props);
 }
+function computedKeyEntryToProp(j, entry) {
+	if (!entry.keyExpr || !isAstNode(entry.keyExpr)) return null;
+	const valueAst = entry.value && typeof entry.value === "object" && !isAstNode(entry.value) ? objectToAst(j, entry.value) : literalToAst(j, entry.value);
+	const prop = j.property("init", entry.keyExpr, valueAst);
+	prop.computed = true;
+	if (entry.leadingComment) prop.comments = [{
+		type: "CommentLine",
+		value: ` ${entry.leadingComment}`,
+		leading: true,
+		trailing: false
+	}];
+	return prop;
+}
 function literalToAst(j, value) {
 	if (isAstNode(value)) return value;
 	if (value === null) return j.literal(null);
@@ -23182,7 +23222,7 @@ function finalizeDeclProcessing(ctx) {
 	];
 	for (const bucket of bucketsForVarRewrite) rewriteCssVarsInStyleObject(bucket, localVarValues, varsToDrop);
 	for (const fnAst of styleFnDecls.values()) if (fnAst && typeof fnAst === "object" && isAstNode(fnAst)) rewriteCssVarsInAstNode(fnAst, localVarValues, varsToDrop);
-	for (const name of varsToDrop) for (const bucket of bucketsForVarRewrite) delete bucket[name];
+	for (const name of varsToDrop) for (const bucket of bucketsForVarRewrite) dropCssVariableDefinitionsFromBucket(bucket, name);
 	const hasPseudoBlockInterpolation = (() => {
 		if (!decl.rawCss) return false;
 		const pseudoBlockRe = /&:[a-z-]+(?:\([^)]*\))?\s*\{([^}]*)\}/gi;
@@ -23431,6 +23471,31 @@ function finalizeDeclProcessing(ctx) {
 	if (styleFnDecls.has(decl.styleKey) && Object.keys(styleObj).length === 0) decl.skipBaseStyleRef = true;
 	if (inlineStyleProps.length) decl.inlineStyleProps = inlineStyleProps;
 }
+function dropCssVariableDefinitionsFromBucket(bucket, name) {
+	delete bucket[name];
+	const computedKeys = bucket.__computedKeys;
+	if (Array.isArray(computedKeys)) {
+		const retained = computedKeys.filter((entry) => {
+			return readComputedEntryCssVariableName(entry) !== name;
+		});
+		if (retained.length === 0) delete bucket.__computedKeys;
+		else if (retained.length !== computedKeys.length) bucket.__computedKeys = retained;
+	}
+	for (const [key, value] of Object.entries(bucket)) {
+		if (key.startsWith("__")) continue;
+		if (!isStyleObjectForCssVarDrop(value)) continue;
+		dropCssVariableDefinitionsFromBucket(value, name);
+	}
+}
+function readComputedEntryCssVariableName(entry) {
+	if (!entry || typeof entry !== "object" || Array.isArray(entry)) return null;
+	if (!("originalCssVariableName" in entry)) return null;
+	const cssVariableName = entry.originalCssVariableName;
+	return typeof cssVariableName === "string" ? cssVariableName : null;
+}
+function isStyleObjectForCssVarDrop(value) {
+	return Boolean(value && typeof value === "object" && !Array.isArray(value) && !isAstNode(value));
+}
 /**
 * Inserts styleFnDecls entries into resolvedStyleObjects right after the last
 * entry belonging to the current component. This ensures dynamic style functions
@@ -29495,7 +29560,18 @@ function createLowerRulesState(ctx) {
 		enumValueMap,
 		crossFileSelectorsByLocal,
 		inlineKeyframeNameMap: void 0,
+		/**
+		* File-level bail flag. Used only for bails that cannot be scoped to a single
+		* declaration (e.g. invariant violations before per-decl processing begins).
+		* Per-decl bails set `currentDecl.skipTransform = true` instead so the file
+		* can still be partially transformed.
+		*/
 		bail: false,
+		/**
+		* Set at the start of each decl's processing loop iteration. When a handler
+		* calls markBail/bailUnsupported, this is the decl that gets marked skipped.
+		* When null, markBail falls back to the file-level bail flag.
+		*/
 		currentDecl: null,
 		markBail: () => {
 			if (state.currentDecl) {

package/package.json

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