react-icons-sprite 1.2.0-rc.1 → 1.2.0-rc.2

package/dist/{transform-module-Chln1wen.mjs → transform-module-3mbTFhoj.mjs}

@@ -256,12 +256,44 @@ const scanJsxReferencePropEdits = (code, symbols, componentName, usedSymbols, re
 		if (symbols.items[componentLocal] || ignoredComponentLocals.has(componentLocal)) continue;
 		const tagEnd = findJsxOpeningTagEnd(code, cursor);
 		if (tagEnd === -1) continue;
-		const attributes = code.slice(cursor, tagEnd);
-		for (const match of attributes.matchAll(/(\s[A-Za-z_$][\w$.-]*(?::[A-Za-z_$][\w$.-]*)?\s*=\s*\{\s*)([A-Za-z_$][\w$]*)(\s*\})/g)) {
-			const iconLocal = match[2];
+		let attributeCursor = cursor;
+		while (attributeCursor < tagEnd) {
+			while (isWhitespace(code[attributeCursor])) attributeCursor += 1;
+			if (attributeCursor >= tagEnd || code[attributeCursor] === "/") break;
+			if (code[attributeCursor] === "{") {
+				const expressionEnd = findJsxExpressionEnd(code, attributeCursor);
+				attributeCursor = expressionEnd === -1 ? tagEnd : expressionEnd + 1;
+				continue;
+			}
+			if (!isIdentifierStart(code[attributeCursor])) {
+				attributeCursor += 1;
+				continue;
+			}
+			attributeCursor += 1;
+			while (isJsxAttributeNamePart(code[attributeCursor])) attributeCursor += 1;
+			while (isWhitespace(code[attributeCursor])) attributeCursor += 1;
+			if (code[attributeCursor] !== "=") continue;
+			attributeCursor += 1;
+			while (isWhitespace(code[attributeCursor])) attributeCursor += 1;
+			const valueStart = attributeCursor;
+			if (code[valueStart] === "\"" || code[valueStart] === "'") {
+				attributeCursor = skipQuotedString(code, valueStart);
+				continue;
+			}
+			if (code[valueStart] !== "{") continue;
+			const expressionEnd = findJsxExpressionEnd(code, valueStart);
+			if (expressionEnd === -1 || expressionEnd > tagEnd) {
+				attributeCursor = tagEnd;
+				continue;
+			}
+			attributeCursor = expressionEnd + 1;
+			const expression = code.slice(valueStart + 1, expressionEnd);
+			const iconMatch = /^(\s*)([A-Za-z_$][\w$]*)(\s*)$/.exec(expression);
+			if (!iconMatch) continue;
+			const iconLocal = iconMatch[2];
 			const symbol = symbols.items[iconLocal];
 			if (!symbol || isFontAwesomeIconPack(symbol.pack) || isHugeiconsIconPack(symbol.pack)) continue;
-			const iconLocalStart = cursor + match.index + match[1].length;
+			const iconLocalStart = valueStart + 1 + iconMatch[1].length;
 			edits.push({
 				type: "replace",
 				from: iconLocalStart,
@@ -278,6 +310,50 @@ const scanJsxReferencePropEdits = (code, symbols, componentName, usedSymbols, re
 		count
 	};
 };
+const isJsxAttributeNamePart = (char) => {
+	return isIdentifierPart(char) || char === "-" || char === "." || char === ":";
+};
+const skipQuotedString = (code, start) => {
+	const quote = code[start];
+	let cursor = start + 1;
+	while (cursor < code.length) {
+		if (code[cursor] === "\\") {
+			cursor += 2;
+			continue;
+		}
+		if (code[cursor] === quote) return cursor + 1;
+		cursor += 1;
+	}
+	return code.length;
+};
+const findJsxExpressionEnd = (code, start) => {
+	let quote = null;
+	let braceDepth = 0;
+	for (let index = start; index < code.length; index += 1) {
+		const char = code[index];
+		if (quote) {
+			if (char === "\\") {
+				index += 1;
+				continue;
+			}
+			if (char === quote) quote = null;
+			continue;
+		}
+		if (char === "\"" || char === "'" || char === "`") {
+			quote = char;
+			continue;
+		}
+		if (char === "{") {
+			braceDepth += 1;
+			continue;
+		}
+		if (char === "}") {
+			braceDepth -= 1;
+			if (braceDepth === 0) return index;
+		}
+	}
+	return -1;
+};
 const hasIconIdAttribute = (code, start, end) => {
 	for (let index = start; index < end; index += 1) {
 		if (code.charCodeAt(index) !== 105 || code.charCodeAt(index + 1) !== 99 || code.charCodeAt(index + 2) !== 111 || code.charCodeAt(index + 3) !== 110 || code.charCodeAt(index + 4) !== 73 || code.charCodeAt(index + 5) !== 100) continue;

package/dist/vite/plugin.mjs

@@ -1,7 +1,7 @@
 import { REACT_ICONS_SPRITE_URL_PLACEHOLDER } from "../index.mjs";
 import { a as createCollector, r as DEFAULT_ICON_SOURCES } from "../compute-icon-id-Xx4G3fva.mjs";
 import { t as buildSprite } from "../build-sprite-CxqvU2LE.mjs";
-import { t as transformModule } from "../transform-module-Chln1wen.mjs";
+import { t as transformModule } from "../transform-module-3mbTFhoj.mjs";
 import { createHash } from "node:crypto";
 //#region src/vite/plugin.ts
 const reactIconsSprite = (options = {}) => {

package/dist/webpack/loader.mjs

@@ -1,4 +1,4 @@
-import { t as transformModule } from "../transform-module-Chln1wen.mjs";
+import { t as transformModule } from "../transform-module-3mbTFhoj.mjs";
 import { t as collector } from "../collector-CBRz9R_h.mjs";
 //#region src/webpack/loader.ts
 const reactIconsSpriteLoader = async function(source) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://www.schemastore.org/package.json",
   "name": "react-icons-sprite",
-  "version": "1.2.0-rc.1",
+  "version": "1.2.0-rc.2",
   "type": "module",
   "description": "A lightweight Vite, Rsbuild and Webpack plugin for react-icons that builds a single SVG sprite and rewrites icons to <use>, reducing bundle size and runtime overhead.",
   "author": "Jure Rotar <hello@jurerotar.com>",