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

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

@@ -237,6 +237,123 @@ const scanJsxIconEdits = (code, symbols, componentName, usedSymbols, register, h
 		count
 	};
 };
+const scanJsxReferencePropEdits = (code, symbols, componentName, usedSymbols, register, ignoredComponentLocals) => {
+	if (symbols.size === 0) return {
+		edits: [],
+		count: 0
+	};
+	const edits = [];
+	let count = 0;
+	for (let index = code.indexOf("<"); index !== -1; index = code.indexOf("<", index + 1)) {
+		let cursor = index + 1;
+		while (isWhitespace(code[cursor])) cursor += 1;
+		if (code[cursor] === "/") continue;
+		if (!isIdentifierStart(code[cursor])) continue;
+		const componentStart = cursor;
+		cursor += 1;
+		while (isIdentifierPart(code[cursor])) cursor += 1;
+		const componentLocal = code.slice(componentStart, cursor);
+		if (symbols.items[componentLocal] || ignoredComponentLocals.has(componentLocal)) continue;
+		const tagEnd = findJsxOpeningTagEnd(code, cursor);
+		if (tagEnd === -1) continue;
+		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 = valueStart + 1 + iconMatch[1].length;
+			edits.push({
+				type: "replace",
+				from: iconLocalStart,
+				to: iconLocalStart + iconLocal.length,
+				value: `(props) => <${componentName} {...props} iconId="${symbol.iconId}" />`
+			});
+			count += 1;
+			usedSymbols.add(iconLocal);
+			register(symbol.pack, symbol.exportName);
+		}
+	}
+	return {
+		edits,
+		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;
@@ -466,6 +583,82 @@ const consumeTrailingWhitespace = (code, start) => {
 	while (to < code.length && isWhitespaceCode(code.charCodeAt(to))) to += 1;
 	return to;
 };
+const editRange = (edit) => {
+	if (edit.type === "insert") return null;
+	return [edit.from, edit.to];
+};
+const rangeContains = ([start, end], index) => {
+	return index >= start && index < end;
+};
+const collectUsedLocalsOutsideRanges = (code, usedLocals, ignoredRanges) => {
+	const ranges = [...ignoredRanges].sort((left, right) => left[0] - right[0]);
+	const found = /* @__PURE__ */ new Set();
+	let rangeIndex = 0;
+	let quote = null;
+	let lineComment = false;
+	let blockComment = false;
+	for (let index = 0; index < code.length; index += 1) {
+		while (rangeIndex < ranges.length && ranges[rangeIndex][1] <= index) rangeIndex += 1;
+		const ignoredRange = ranges[rangeIndex];
+		if (ignoredRange && rangeContains(ignoredRange, index)) {
+			index = ignoredRange[1] - 1;
+			continue;
+		}
+		const char = code[index];
+		const next = code[index + 1];
+		if (lineComment) {
+			if (char === "\n" || char === "\r") lineComment = false;
+			continue;
+		}
+		if (blockComment) {
+			if (char === "*" && next === "/") {
+				blockComment = false;
+				index += 1;
+			}
+			continue;
+		}
+		if (quote) {
+			if (char === "\\") {
+				index += 1;
+				continue;
+			}
+			if (char === quote) quote = null;
+			continue;
+		}
+		if (char === "/" && next === "/") {
+			lineComment = true;
+			index += 1;
+			continue;
+		}
+		if (char === "/" && next === "*") {
+			blockComment = true;
+			index += 1;
+			continue;
+		}
+		if (char === "\"" || char === "'") {
+			quote = char;
+			continue;
+		}
+		if (!isIdentifierStart(char)) continue;
+		const start = index;
+		index += 1;
+		while (isIdentifierPart(code[index])) index += 1;
+		const local = code.slice(start, index);
+		if (usedLocals.has(local)) found.add(local);
+		index -= 1;
+	}
+	return found;
+};
+const filterRemovableUsedLocals = (code, imports, usedLocals, usageEdits) => {
+	const ignoredRanges = [...imports.map((item) => item.declarationRange), ...usageEdits.flatMap((edit) => {
+		const range = editRange(edit);
+		return range ? [range] : [];
+	})];
+	const liveLocals = collectUsedLocalsOutsideRanges(code, usedLocals, ignoredRanges);
+	const removable = /* @__PURE__ */ new Set();
+	for (const local of usedLocals) if (!liveLocals.has(local)) removable.add(local);
+	return removable;
+};
 const transformModule = (code, id, register, sources = DEFAULT_ICON_SOURCES, options = {}) => {
 	const { sourceMap = false } = options;
 	if (!fastFilter(code)) return {
@@ -492,17 +685,21 @@ const transformModule = (code, id, register, sources = DEFAULT_ICON_SOURCES, opt
 		localName: ICON_COMPONENT_NAME
 	};
 	const used = /* @__PURE__ */ new Set();
+	const fontAwesomeComponents = hasPotentialFontAwesomeUsage ? scanFontAwesomeComponents(code) : /* @__PURE__ */ new Set();
+	const hugeiconsComponents = hasPotentialHugeiconsUsage ? scanHugeiconsComponents(code) : /* @__PURE__ */ new Set();
 	const usedFontAwesomeComponents = /* @__PURE__ */ new Set();
 	const usedHugeiconsComponents = /* @__PURE__ */ new Set();
+	const ignoredIconPropComponentLocals = /* @__PURE__ */ new Set([...fontAwesomeComponents, ...hugeiconsComponents]);
 	const jsxScan = scanJsxIconEdits(code, table, spriteIconImport.localName, used, register, code.includes("iconId"));
-	const fontAwesomeUsages = hasPotentialFontAwesomeUsage ? scanFontAwesomeUsages(code, table, scanFontAwesomeComponents(code)) : [];
-	const hugeiconsUsages = hasPotentialHugeiconsUsage ? scanHugeiconsUsages(code, table, scanHugeiconsComponents(code)) : [];
-	if (jsxScan.count === 0 && !fontAwesomeUsages.length && !hugeiconsUsages.length) return {
+	const referencePropScan = scanJsxReferencePropEdits(code, table, spriteIconImport.localName, used, register, ignoredIconPropComponentLocals);
+	const fontAwesomeUsages = hasPotentialFontAwesomeUsage ? scanFontAwesomeUsages(code, table, fontAwesomeComponents) : [];
+	const hugeiconsUsages = hasPotentialHugeiconsUsage ? scanHugeiconsUsages(code, table, hugeiconsComponents) : [];
+	if (jsxScan.count === 0 && referencePropScan.count === 0 && !fontAwesomeUsages.length && !hugeiconsUsages.length) return {
 		code,
 		map: null,
 		anyReplacements: false
 	};
-	const edits = jsxScan.edits;
+	const edits = [...jsxScan.edits, ...referencePropScan.edits];
 	const registeredFontAwesomeIcons = /* @__PURE__ */ new Set();
 	for (const usage of fontAwesomeUsages) {
 		edits.push({
@@ -555,10 +752,11 @@ const transformModule = (code, id, register, sources = DEFAULT_ICON_SOURCES, opt
 			register(usage.pack, usage.exportName);
 		}
 	}
-	const cleanupEdits = cleanupScannedImports(code, scannedImports, used);
+	const removableUsed = filterRemovableUsedLocals(code, scannedImports, used, edits);
+	const cleanupEdits = cleanupScannedImports(code, scannedImports, removableUsed);
 	const cleanupFontAwesomeEdits = usedFontAwesomeComponents.size ? cleanupScannedFontAwesomeComponentImports(code, usedFontAwesomeComponents) : [];
 	const cleanupHugeiconsEdits = usedHugeiconsComponents.size ? cleanupScannedHugeiconsComponentImports(code, usedHugeiconsComponents) : [];
-	const canUsePresortedEdits = cleanupFontAwesomeEdits.length === 0 && cleanupHugeiconsEdits.length === 0;
+	const canUsePresortedEdits = referencePropScan.count === 0 && cleanupFontAwesomeEdits.length === 0 && cleanupHugeiconsEdits.length === 0;
 	const allEdits = canUsePresortedEdits ? [...cleanupEdits, ...edits] : [
 		...edits,
 		...cleanupEdits,

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-1am5uV8-.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-1am5uV8-.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.1.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>",