react-icons-sprite 1.0.0 → 1.0.1

package/dist/{build-sprite-j9zt_17z.mjs → build-sprite-DgeWMz2D.mjs}

@@ -1,4 +1,4 @@
-import { r as resolveIconImport, t as computeIconId } from "./compute-icon-id-B590yK7l.mjs";
+import { i as resolveIconImport, t as computeIconId } from "./compute-icon-id-CVIo3z9m.mjs";
 import { existsSync, readFileSync } from "node:fs";
 import path from "node:path";
 import { pathToFileURL } from "node:url";

package/dist/{collector-YV25X1xI.mjs → collector-DxE_zcTH.mjs}

@@ -1,4 +1,4 @@
-import { i as createCollector } from "./compute-icon-id-B590yK7l.mjs";
+import { a as createCollector } from "./compute-icon-id-CVIo3z9m.mjs";
 //#region src/collector.ts
 const collector = createCollector();
 //#endregion

package/dist/{compute-icon-id-B590yK7l.mjs → compute-icon-id-CVIo3z9m.mjs}

@@ -73,4 +73,4 @@ const computeIconId = (pack, iconName) => {
 	return `ri-${normalizePackAlias(pack)}-${iconName}`;
 };
 //#endregion
-export { createCollector as i, DEFAULT_ICON_SOURCES as n, resolveIconImport as r, computeIconId as t };
+export { createCollector as a, resolveIconImport as i, normalizePackAlias as n, DEFAULT_ICON_SOURCES as r, computeIconId as t };

package/dist/{transform-module-zJo6_2rz.mjs → transform-module-CIpNj5Na.mjs}

@@ -1,4 +1,4 @@
-import { n as DEFAULT_ICON_SOURCES, t as computeIconId } from "./compute-icon-id-B590yK7l.mjs";
+import { n as normalizePackAlias, r as DEFAULT_ICON_SOURCES } from "./compute-icon-id-CVIo3z9m.mjs";
 import MagicString from "magic-string";
 //#region src/transform/edit-applier.ts
 const applyEdits = (code, edits) => {
@@ -13,9 +13,9 @@ const applyEdits = (code, edits) => {
 const editStart = (edit) => {
 	return edit.type === "insert" ? edit.pos : edit.from;
 };
-const applyEditsToString = (code, edits) => {
+const applyEditsToString = (code, edits, presorted = false) => {
 	if (!edits.length) return code;
-	const orderedEdits = [...edits].sort((left, right) => {
+	const orderedEdits = presorted ? edits : [...edits].sort((left, right) => {
 		const startDelta = editStart(left) - editStart(right);
 		if (startDelta !== 0) return startDelta;
 		if (left.type === "insert" && right.type !== "insert") return 1;
@@ -41,38 +41,6 @@ const applyEditsToString = (code, edits) => {
 	return result + code.slice(cursor);
 };
 //#endregion
-//#region src/transform/edit-builder.ts
-const buildEdits = (usages, componentName, usedSymbols, register) => {
-	const edits = [];
-	const iconIdCache = /* @__PURE__ */ new Map();
-	for (const usage of usages) {
-		edits.push({
-			type: "replace",
-			from: usage.range[0],
-			to: usage.range[1],
-			value: componentName
-		});
-		if (usage.kind === "opening") {
-			if (!usage.hasIconId) {
-				const key = `${usage.pack}:${usage.exportName}`;
-				let iconId = iconIdCache.get(key);
-				if (!iconId) {
-					iconId = computeIconId(usage.pack, usage.exportName);
-					iconIdCache.set(key, iconId);
-				}
-				edits.push({
-					type: "insert",
-					pos: usage.range[1],
-					value: ` iconId="${iconId}"`
-				});
-			}
-			usedSymbols.add(usage.local);
-			register(usage.pack, usage.exportName);
-		}
-	}
-	return edits;
-};
-//#endregion
 //#region src/transform/fast-filter.ts
 const fastFilter = (code) => {
 	if (!code.includes("<")) return false;
@@ -163,12 +131,23 @@ const scanImportsDetailed = (code, sources) => {
 	return imports;
 };
 const buildScannedSymbolTable = (imports) => {
-	const table = /* @__PURE__ */ new Map();
-	for (const item of imports) for (const specifier of item.specifiers) table.set(specifier.local, {
-		pack: item.pack,
-		exportName: specifier.exportName
-	});
-	return table;
+	const items = Object.create(null);
+	let size = 0;
+	for (const item of imports) {
+		const iconIdPrefix = `ri-${normalizePackAlias(item.pack)}-`;
+		for (const specifier of item.specifiers) {
+			if (items[specifier.local] === void 0) size += 1;
+			items[specifier.local] = {
+				pack: item.pack,
+				exportName: specifier.exportName,
+				iconId: iconIdPrefix + specifier.exportName
+			};
+		}
+	}
+	return {
+		items,
+		size
+	};
 };
 const scanSpriteIconImport = (code) => {
 	IMPORT_RE.lastIndex = 0;
@@ -199,11 +178,17 @@ const isIdentifierPart = (char) => {
 const isWhitespace = (char) => {
 	return char === " " || char === "	" || char === "\n" || char === "\r" || char === "\f";
 };
-const scanJsxIconUsages = (code, symbols) => {
-	if (!symbols.size) return [];
-	const usages = [];
-	for (let index = 0; index < code.length; index += 1) {
-		if (code.charCodeAt(index) !== 60) continue;
+const isWhitespaceCode = (code) => {
+	return code === 32 || code === 9 || code === 10 || code === 13 || code === 12;
+};
+const scanJsxIconEdits = (code, symbols, componentName, usedSymbols, register, hasAnyIconId) => {
+	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;
 		const closing = code[cursor] === "/";
@@ -216,24 +201,35 @@ const scanJsxIconUsages = (code, symbols) => {
 		cursor += 1;
 		while (isIdentifierPart(code[cursor])) cursor += 1;
 		const local = code.slice(localStart, cursor);
-		const symbol = symbols.get(local);
+		const symbol = symbols.items[local];
 		if (!symbol) continue;
-		const kind = closing ? "closing" : "opening";
 		let hasIconId = false;
-		if (!closing) {
+		if (hasAnyIconId && !closing) {
 			const tagEnd = findJsxOpeningTagEnd(code, cursor);
 			hasIconId = tagEnd !== -1 && hasIconIdAttribute(code, cursor, tagEnd);
 		}
-		usages.push({
-			local,
-			range: [localStart, cursor],
-			pack: symbol.pack,
-			exportName: symbol.exportName,
-			kind,
-			hasIconId
+		if (closing || hasIconId) edits.push({
+			type: "replace",
+			from: localStart,
+			to: cursor,
+			value: componentName
 		});
+		else edits.push({
+			type: "replace",
+			from: localStart,
+			to: cursor,
+			value: `${componentName} iconId="${symbol.iconId}"`
+		});
+		count += 1;
+		if (!closing) {
+			usedSymbols.add(local);
+			register(symbol.pack, symbol.exportName);
+		}
 	}
-	return usages;
+	return {
+		edits,
+		count
+	};
 };
 const hasIconIdAttribute = (code, start, end) => {
 	for (let index = start; index < end; index += 1) {
@@ -295,7 +291,7 @@ const scanFontAwesomeUsages = (code, symbols, componentLocals) => {
 		const attributes = code.slice(componentStart + componentLocal.length, tagEnd);
 		const iconMatch = /\sicon\s*=\s*\{\s*([A-Za-z_$][\w$]*)\s*\}/.exec(attributes);
 		if (!iconMatch || iconMatch.index === void 0) continue;
-		const symbol = symbols.get(iconMatch[1]);
+		const symbol = symbols.items[iconMatch[1]];
 		if (!symbol || !isFontAwesomeIconPack(symbol.pack)) continue;
 		const attributeStart = componentStart + componentLocal.length + iconMatch.index;
 		usages.push({
@@ -305,7 +301,8 @@ const scanFontAwesomeUsages = (code, symbols, componentLocals) => {
 			hasIconId: /\biconId\s*=/.test(attributes),
 			iconLocal: iconMatch[1],
 			pack: symbol.pack,
-			exportName: symbol.exportName
+			exportName: symbol.exportName,
+			iconId: symbol.iconId
 		});
 	}
 	return usages;
@@ -365,7 +362,11 @@ const cleanupScannedFontAwesomeComponentImports = (code, usedLocals) => {
 };
 const extendToLineEnd = (code, end) => {
 	let to = end;
-	while (to < code.length && /[ \t]/.test(code[to])) to += 1;
+	while (to < code.length) {
+		const char = code.charCodeAt(to);
+		if (char !== 32 && char !== 9) break;
+		to += 1;
+	}
 	if (code[to] === "\r" && code[to + 1] === "\n") return to + 2;
 	if (code[to] === "\n") return to + 1;
 	return to;
@@ -374,19 +375,19 @@ const specifierRemovalRange = (code, [start, end]) => {
 	let from = start;
 	let to = end;
 	let before = start - 1;
-	while (before >= 0 && /\s/.test(code[before])) before -= 1;
+	while (before >= 0 && isWhitespaceCode(code.charCodeAt(before))) before -= 1;
 	if (before >= 0 && code[before] === ",") {
 		from = before;
 		return [from, to];
 	}
 	let after = end;
-	while (after < code.length && /\s/.test(code[after])) after += 1;
+	while (after < code.length && isWhitespaceCode(code.charCodeAt(after))) after += 1;
 	if (after < code.length && code[after] === ",") to = consumeTrailingWhitespace(code, after + 1);
 	return [from, to];
 };
 const consumeTrailingWhitespace = (code, start) => {
 	let to = start;
-	while (to < code.length && /\s/.test(code[to])) to += 1;
+	while (to < code.length && isWhitespaceCode(code.charCodeAt(to))) to += 1;
 	return to;
 };
 const transformModule = (code, id, register, sources = DEFAULT_ICON_SOURCES, options = {}) => {
@@ -413,16 +414,16 @@ const transformModule = (code, id, register, sources = DEFAULT_ICON_SOURCES, opt
 		hasImport: false,
 		localName: ICON_COMPONENT_NAME
 	};
-	const usages = scanJsxIconUsages(code, table);
+	const used = /* @__PURE__ */ new Set();
+	const usedFontAwesomeComponents = /* @__PURE__ */ new Set();
+	const jsxScan = scanJsxIconEdits(code, table, spriteIconImport.localName, used, register, code.includes("iconId"));
 	const fontAwesomeUsages = hasPotentialFontAwesomeUsage ? scanFontAwesomeUsages(code, table, scanFontAwesomeComponents(code)) : [];
-	if (!usages.length && !fontAwesomeUsages.length) return {
+	if (jsxScan.count === 0 && !fontAwesomeUsages.length) return {
 		code,
 		map: null,
 		anyReplacements: false
 	};
-	const used = /* @__PURE__ */ new Set();
-	const usedFontAwesomeComponents = /* @__PURE__ */ new Set();
-	const edits = buildEdits(usages, spriteIconImport.localName, used, register);
+	const edits = jsxScan.edits;
 	const registeredFontAwesomeIcons = /* @__PURE__ */ new Set();
 	for (const usage of fontAwesomeUsages) {
 		edits.push({
@@ -434,7 +435,7 @@ const transformModule = (code, id, register, sources = DEFAULT_ICON_SOURCES, opt
 		if (!usage.hasIconId) edits.push({
 			type: "insert",
 			pos: usage.componentRange[1],
-			value: ` iconId="${computeIconId(usage.pack, usage.exportName)}"`
+			value: ` iconId="${usage.iconId}"`
 		});
 		edits.push({
 			type: "remove",
@@ -451,14 +452,15 @@ const transformModule = (code, id, register, sources = DEFAULT_ICON_SOURCES, opt
 	}
 	const cleanupEdits = cleanupScannedImports(code, scannedImports, used);
 	const cleanupFontAwesomeEdits = usedFontAwesomeComponents.size ? cleanupScannedFontAwesomeComponentImports(code, usedFontAwesomeComponents) : [];
-	const allEdits = [
+	const canUsePresortedEdits = cleanupFontAwesomeEdits.length === 0;
+	const allEdits = canUsePresortedEdits ? [...cleanupEdits, ...edits] : [
 		...edits,
 		...cleanupEdits,
 		...cleanupFontAwesomeEdits
 	];
 	const importPrefix = `import { ${ICON_COMPONENT_NAME} } from "${ICON_SOURCE}";\n`;
 	if (!sourceMap) return {
-		code: `${spriteIconImport.hasImport ? "" : importPrefix}${applyEditsToString(code, allEdits)}`,
+		code: `${spriteIconImport.hasImport ? "" : importPrefix}${applyEditsToString(code, allEdits, canUsePresortedEdits)}`,
 		map: null,
 		anyReplacements: true
 	};

package/dist/vite/plugin.mjs

@@ -1,7 +1,7 @@
 import { REACT_ICONS_SPRITE_URL_PLACEHOLDER } from "../index.mjs";
-import { i as createCollector, n as DEFAULT_ICON_SOURCES } from "../compute-icon-id-B590yK7l.mjs";
-import { t as buildSprite } from "../build-sprite-j9zt_17z.mjs";
-import { t as transformModule } from "../transform-module-zJo6_2rz.mjs";
+import { a as createCollector, r as DEFAULT_ICON_SOURCES } from "../compute-icon-id-CVIo3z9m.mjs";
+import { t as buildSprite } from "../build-sprite-DgeWMz2D.mjs";
+import { t as transformModule } from "../transform-module-CIpNj5Na.mjs";
 import { createHash } from "node:crypto";
 //#region src/vite/plugin.ts
 const reactIconsSprite = (options = {}) => {

package/dist/webpack/loader.mjs

@@ -1,5 +1,5 @@
-import { t as transformModule } from "../transform-module-zJo6_2rz.mjs";
-import { t as collector } from "../collector-YV25X1xI.mjs";
+import { t as transformModule } from "../transform-module-CIpNj5Na.mjs";
+import { t as collector } from "../collector-DxE_zcTH.mjs";
 //#region src/webpack/loader.ts
 const reactIconsSpriteLoader = async function(source) {
 	if (this.mode === "development") return source;

package/dist/webpack/plugin.mjs

@@ -1,6 +1,6 @@
 import { REACT_ICONS_SPRITE_URL_PLACEHOLDER } from "../index.mjs";
-import { t as buildSprite } from "../build-sprite-j9zt_17z.mjs";
-import { t as collector } from "../collector-YV25X1xI.mjs";
+import { t as buildSprite } from "../build-sprite-DgeWMz2D.mjs";
+import { t as collector } from "../collector-DxE_zcTH.mjs";
 import { createHash } from "node:crypto";
 //#region src/webpack/plugin.ts
 var ReactIconsSpriteWebpackPlugin = class {

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://www.schemastore.org/package.json",
   "name": "react-icons-sprite",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "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>",