styled-components-to-stylex-codemod 0.0.30 → 0.0.31

package/dist/transform.mjs

@@ -3637,8 +3637,10 @@ function normalizeStylisAstToIR(stylisAst, slots, options = {}) {
 			const propsArr = Array.isArray(node.props) ? node.props : null;
 			const rule = ensureRule((() => {
 				if (!stripFormFeedInSelectors || !selectorValue.includes("\f") || !propsArr?.length) return selectorRaw;
-				const stringProps = propsArr.filter((p) => typeof p === "string");
-				if (stringProps.some((p) => p.includes("::")) && !selectorRaw.includes("::")) return stringProps.map((p) => `&${p}`).join(",");
+				const resolved = propsArr.filter((p) => typeof p === "string").map((p) => `&${p}`).join(",");
+				const hasSiblingCombinator = (s) => /[+~]/.test(s.replace(/\[[^\]]*\]/g, ""));
+				if (hasSiblingCombinator(selectorRaw) || hasSiblingCombinator(resolved)) return selectorRaw;
+				if (resolved.length > selectorRaw.length) return resolved;
 				return selectorRaw;
 			})(), atRuleStack);
 			const children = node.children;
@@ -14547,13 +14549,18 @@ function parseSingleSelector(selector) {
 			kind: "unsupported",
 			reason: "attribute selector"
 		};
-		if (pseudoClasses.length > 0 || pseudoElements.length > 0) return {
+		if (pseudoElements.length > 0) return {
 			kind: "unsupported",
-			reason: "attribute selector with pseudo"
+			reason: "attribute selector with pseudo-element"
+		};
+		const attrStr = attributes.map((a) => a.toString()).join("");
+		if (pseudoClasses.length > 0) return {
+			kind: "pseudo",
+			pseudos: [`${buildPseudoString(pseudoClasses)}:is(${attrStr})`]
 		};
 		return {
 			kind: "pseudo",
-			pseudos: [`:is(${attributes.map((a) => a.toString()).join("")})`]
+			pseudos: [`:is(${attrStr})`]
 		};
 	}
 	if (!hasNesting && (pseudoClasses.length > 0 || pseudoElements.length > 0)) {}

package/package.json

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