react-icons-sprite 0.9.0 → 0.9.1

package/dist/{collector-CZ15UM_G.mjs → collector-BvJbH8Da.mjs}

@@ -1,4 +1,4 @@
-import { r as createCollector } from "./core-vRZuyfCR.mjs";
+import { r as createCollector } from "./core-B0kAb7AT.mjs";
 //#region src/collector.ts
 const collector = createCollector();
 //#endregion

package/dist/{core-vRZuyfCR.mjs → core-B0kAb7AT.mjs}

@@ -35,8 +35,46 @@ const getRange = (node) => {
 	if (typeof node.start === "number" && typeof node.end === "number") return [node.start, node.end];
 	return null;
 };
+const getParseLangCandidates = (filename) => {
+	const lower = (filename.split("?", 1)[0] ?? filename).toLowerCase();
+	if (lower.endsWith(".tsx")) return [
+		"tsx",
+		"ts",
+		"jsx",
+		"js"
+	];
+	if (lower.endsWith(".ts")) return [
+		"ts",
+		"tsx",
+		"js",
+		"jsx"
+	];
+	if (lower.endsWith(".jsx")) return [
+		"jsx",
+		"js",
+		"tsx",
+		"ts"
+	];
+	return [
+		"js",
+		"jsx",
+		"ts",
+		"tsx"
+	];
+};
 const parseAst = (code, filename) => {
-	return parseSync(filename, code, {
+	const languages = getParseLangCandidates(filename);
+	let firstResult;
+	for (const lang of languages) {
+		const result = parseSync(filename, code, {
+			lang,
+			sourceType: "module",
+			range: true
+		});
+		firstResult ??= result;
+		if (result.errors.length === 0) return result;
+	}
+	return firstResult ?? parseSync(filename, code, {
 		lang: "tsx",
 		sourceType: "module",
 		range: true
@@ -213,20 +251,36 @@ const transformModule = (code, id, register, sources = DEFAULT_ICON_SOURCES, opt
 		map: null,
 		anyReplacements: false
 	};
-	const declSpecifierCount = /* @__PURE__ */ new Map();
+	const declToAllSpecs = /* @__PURE__ */ new Map();
+	const declToUsedSpecs = /* @__PURE__ */ new Map();
 	for (const { decl, spec } of localNameToImport.values()) {
-		const localName = spec.local;
-		if (!localName?.name || !usedLocalNames.has(localName.name)) continue;
 		const declNode = decl;
-		let count = declSpecifierCount.get(declNode);
-		if (typeof count !== "number") {
-			count = 0;
+		const specNode = spec;
+		const all = declToAllSpecs.get(declNode) ?? [];
+		if (all.length === 0) {
 			const specifiers = declNode.specifiers ?? [];
-			for (const oneSpec of specifiers) if (oneSpec.type === "ImportSpecifier" || oneSpec.type === "ImportDefaultSpecifier") count += 1;
-			declSpecifierCount.set(declNode, count);
+			for (const oneSpec of specifiers) if (oneSpec.type === "ImportSpecifier" || oneSpec.type === "ImportDefaultSpecifier") all.push(oneSpec);
+			declToAllSpecs.set(declNode, all);
+		}
+		const localName = specNode.local;
+		if (!localName?.name || !usedLocalNames.has(localName.name)) continue;
+		const used = declToUsedSpecs.get(declNode) ?? [];
+		used.push(specNode);
+		declToUsedSpecs.set(declNode, used);
+	}
+	for (const [declNode, usedSpecs] of declToUsedSpecs.entries()) {
+		const allSpecs = declToAllSpecs.get(declNode) ?? [];
+		if (allSpecs.length > 0 && usedSpecs.length >= allSpecs.length) {
+			removeEntireImport(ms, code, declNode);
+			continue;
 		}
-		if (count <= 1) removeEntireImport(ms, code, declNode);
-		else removeImportSpecifier(ms, code, spec);
+		const byStartDesc = [...usedSpecs].sort((a, b) => {
+			const aRange = getRange(a);
+			const bRange = getRange(b);
+			if (!aRange || !bRange) return 0;
+			return bRange[0] - aRange[0];
+		});
+		for (const usedSpec of byStartDesc) removeImportSpecifier(ms, code, usedSpec);
 	}
 	if (!hasIconImport) ms.prepend(`import { ${iconLocalName} } from "${ICON_SOURCE}";\n`);
 	const transformedCode = ms.toString();

package/dist/vite/plugin.mjs

@@ -1,5 +1,5 @@
 import { REACT_ICONS_SPRITE_URL_PLACEHOLDER } from "../index.mjs";
-import { i as transformModule, n as buildSprite, r as createCollector, t as DEFAULT_ICON_SOURCES } from "../core-vRZuyfCR.mjs";
+import { i as transformModule, n as buildSprite, r as createCollector, t as DEFAULT_ICON_SOURCES } from "../core-B0kAb7AT.mjs";
 import { createHash } from "node:crypto";
 //#region src/vite/plugin.ts
 const reactIconsSprite = (options = {}) => {

package/dist/webpack/loader.mjs

@@ -1,5 +1,5 @@
-import { i as transformModule } from "../core-vRZuyfCR.mjs";
-import { t as collector } from "../collector-CZ15UM_G.mjs";
+import { i as transformModule } from "../core-B0kAb7AT.mjs";
+import { t as collector } from "../collector-BvJbH8Da.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 { n as buildSprite } from "../core-vRZuyfCR.mjs";
-import { t as collector } from "../collector-CZ15UM_G.mjs";
+import { n as buildSprite } from "../core-B0kAb7AT.mjs";
+import { t as collector } from "../collector-BvJbH8Da.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": "0.9.0",
+  "version": "0.9.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>",
@@ -50,7 +50,6 @@
   ],
   "scripts": {
     "build": "tsdown",
-    "bench:transform": "vitest bench tests/transform.bench.ts",
     "dev": "tsdown --watch",
     "format": "biome format --write --no-errors-on-unmatched",
     "format:check": "biome format --no-errors-on-unmatched",