@bamboocss/vite 1.37.10 → 1.37.12

package/dist/index.cjs

@@ -751,16 +751,21 @@ const collectModuleScopeNames = (sourceFile) => {
 * while under-reporting ships an element whose class has no rule behind it and says nothing.
 * Shadowing a recipe binding is rare; silently shipping unstyled markup is not recoverable.
 */
-const identifiersByName = /* @__PURE__ */ new WeakMap();
 /**
 * Every identifier in the module, grouped by the name it spells.
 *
-* Walking the whole tree per binding made this O(bindings x identifiers): a module declaring
-* ten recipes walked its identifiers ten times. One walk answers for all of them, and the
-* result is cached against the source text like the module-scope names beside it, so a
-* re-transform of unchanged text reuses it.
+* Built once per pass and handed to each lookup, because walking the whole tree per binding
+* made that O(bindings x identifiers): a module declaring ten recipes walked its identifiers
+* ten times.
+*
+* Deliberately *not* memoized across passes, unlike the module-scope names beside it. That
+* cache holds strings, which outlive anything; this one holds nodes, and a node does not
+* survive its source file being replaced — `addSourceFile` overwrites, which forgets every
+* node previously taken from it. Keying on the source text does not help, because identical
+* text re-parsed is a fresh tree: the cache hits and returns nodes that throw
+* `Attempted to get information from a node that was removed or forgotten` on the next read.
 */
-const identifierIndex = (sourceFile) => byText(identifiersByName, sourceFile, () => {
+const identifierIndex = (sourceFile) => {
 	const index = /* @__PURE__ */ new Map();
 	for (const identifier of sourceFile.getDescendantsOfKind(ts_morph.SyntaxKind.Identifier)) {
 		const text = identifier.getText();
@@ -769,10 +774,10 @@ const identifierIndex = (sourceFile) => byText(identifiersByName, sourceFile, ()
 		else index.set(text, [identifier]);
 	}
 	return index;
-});
-const localReferencesTo = (sourceFile, name, declaration) => {
+};
+const localReferencesTo = (index, name, declaration) => {
 	const references = [];
-	for (const identifier of identifierIndex(sourceFile).get(name) ?? []) {
+	for (const identifier of index.get(name) ?? []) {
 		if (identifier === declaration) continue;
 		const parent = identifier.getParent();
 		if (!parent) continue;
@@ -2557,6 +2562,21 @@ const foldSource = (options) => {
 		const sourceFile = ownSourceFile ?? candidates[0]?.node.getSourceFile() ?? recipeDefinitions[0]?.call.getSourceFile();
 		if (!sourceFile) return;
 		const importedRecipeBindings = new Set(parserResult.importedRecipes?.keys() ?? []);
+		/**
+		* Every identifier in the module, grouped by the name it spells — built at most once per
+		* pass, and only when something below has a name to look up.
+		*
+		* One index answers for every binding, rather than a walk per binding. Built here rather
+		* than cached across passes: it holds nodes, and a node does not outlive its source file
+		* being replaced.
+		*
+		* Deferred because most modules in an app neither declare nor import a recipe, and the
+		* walk is not cheap — `getDescendantsOfKind` wraps every identifier in the file in a
+		* ts-morph node to answer a question those modules never ask. It was 11% of a 6,307-file
+		* build, most of it spent producing an index nothing read.
+		*/
+		let identifiers;
+		const identifiersByName = () => identifiers ??= identifierIndex(sourceFile);
 		for (const binding of new Set([...recipeConfigs.keys(), ...importedRecipeBindings])) {
 			const entry = recipeConfigs.get(binding);
 			if (entry === AMBIGUOUS) continue;
@@ -2564,7 +2584,7 @@ const foldSource = (options) => {
 			const definition = entry?.box?.getNode?.();
 			const nameNode = definition?.getSourceFile() === sourceFile ? definition?.getFirstAncestorByKind(ts_morph.SyntaxKind.VariableDeclaration)?.getNameNode() : importSpecifierFor(sourceFile, binding);
 			if (!nameNode || !ts_morph.Node.isIdentifier(nameNode)) continue;
-			const references = localReferencesTo(sourceFile, binding, nameNode);
+			const references = localReferencesTo(identifiersByName(), binding, nameNode);
 			if (skipped.filter((item) => SURVIVES_TO_RUNTIME.has(item.reason) && item.end > item.start).some((item) => references.some((ref) => ref.getStart() >= item.start && ref.getStart() < item.end))) continue;
 			const survivor = references.find((ref) => !applied.some(([from, to]) => ref.getStart() >= from && ref.getStart() < to));
 			if (!survivor) continue;
@@ -2665,25 +2685,24 @@ const foldSource = (options) => {
 		}
 		if (watched.size === 0) return;
 		const declined = skipped.filter((entry) => SURVIVES_TO_RUNTIME.has(entry.reason) && entry.end > entry.start).map((entry) => [entry.start, entry.end]);
-		const reported = /* @__PURE__ */ new Set();
-		for (const identifier of sourceFile.getDescendantsOfKind(ts_morph.SyntaxKind.Identifier)) {
-			const local = identifier.getText();
-			const imported = watched.get(local);
-			if (imported === void 0 || reported.has(local)) continue;
+		const survivors = [];
+		for (const [local, imported] of watched) for (const identifier of identifiersByName().get(local) ?? []) {
 			const start = identifier.getStart();
 			if (identifier.getFirstAncestorByKind(ts_morph.SyntaxKind.ImportDeclaration)) continue;
 			if (applied.some(([from, to]) => start >= from && start < to)) continue;
 			if (declined.some(([from, to]) => start >= from && start < to)) continue;
 			if (!isValueReference(identifier)) continue;
 			if (isShadowed(identifier, local)) continue;
-			reported.add(local);
-			skipped.push({
+			survivors.push({
 				name: imported,
 				reason: "runtime-binding",
 				start,
 				end: identifier.getEnd()
 			});
+			break;
 		}
+		survivors.sort((a, b) => a.start - b.start);
+		skipped.push(...survivors);
 	}
 	if (reportSurvivors) reportRuntimeBindings();
 	if (folded.length === 0) return {

package/dist/index.mjs

@@ -721,16 +721,21 @@ const collectModuleScopeNames = (sourceFile) => {
 * while under-reporting ships an element whose class has no rule behind it and says nothing.
 * Shadowing a recipe binding is rare; silently shipping unstyled markup is not recoverable.
 */
-const identifiersByName = /* @__PURE__ */ new WeakMap();
 /**
 * Every identifier in the module, grouped by the name it spells.
 *
-* Walking the whole tree per binding made this O(bindings x identifiers): a module declaring
-* ten recipes walked its identifiers ten times. One walk answers for all of them, and the
-* result is cached against the source text like the module-scope names beside it, so a
-* re-transform of unchanged text reuses it.
+* Built once per pass and handed to each lookup, because walking the whole tree per binding
+* made that O(bindings x identifiers): a module declaring ten recipes walked its identifiers
+* ten times.
+*
+* Deliberately *not* memoized across passes, unlike the module-scope names beside it. That
+* cache holds strings, which outlive anything; this one holds nodes, and a node does not
+* survive its source file being replaced — `addSourceFile` overwrites, which forgets every
+* node previously taken from it. Keying on the source text does not help, because identical
+* text re-parsed is a fresh tree: the cache hits and returns nodes that throw
+* `Attempted to get information from a node that was removed or forgotten` on the next read.
 */
-const identifierIndex = (sourceFile) => byText(identifiersByName, sourceFile, () => {
+const identifierIndex = (sourceFile) => {
 	const index = /* @__PURE__ */ new Map();
 	for (const identifier of sourceFile.getDescendantsOfKind(SyntaxKind.Identifier)) {
 		const text = identifier.getText();
@@ -739,10 +744,10 @@ const identifierIndex = (sourceFile) => byText(identifiersByName, sourceFile, ()
 		else index.set(text, [identifier]);
 	}
 	return index;
-});
-const localReferencesTo = (sourceFile, name, declaration) => {
+};
+const localReferencesTo = (index, name, declaration) => {
 	const references = [];
-	for (const identifier of identifierIndex(sourceFile).get(name) ?? []) {
+	for (const identifier of index.get(name) ?? []) {
 		if (identifier === declaration) continue;
 		const parent = identifier.getParent();
 		if (!parent) continue;
@@ -2527,6 +2532,21 @@ const foldSource = (options) => {
 		const sourceFile = ownSourceFile ?? candidates[0]?.node.getSourceFile() ?? recipeDefinitions[0]?.call.getSourceFile();
 		if (!sourceFile) return;
 		const importedRecipeBindings = new Set(parserResult.importedRecipes?.keys() ?? []);
+		/**
+		* Every identifier in the module, grouped by the name it spells — built at most once per
+		* pass, and only when something below has a name to look up.
+		*
+		* One index answers for every binding, rather than a walk per binding. Built here rather
+		* than cached across passes: it holds nodes, and a node does not outlive its source file
+		* being replaced.
+		*
+		* Deferred because most modules in an app neither declare nor import a recipe, and the
+		* walk is not cheap — `getDescendantsOfKind` wraps every identifier in the file in a
+		* ts-morph node to answer a question those modules never ask. It was 11% of a 6,307-file
+		* build, most of it spent producing an index nothing read.
+		*/
+		let identifiers;
+		const identifiersByName = () => identifiers ??= identifierIndex(sourceFile);
 		for (const binding of new Set([...recipeConfigs.keys(), ...importedRecipeBindings])) {
 			const entry = recipeConfigs.get(binding);
 			if (entry === AMBIGUOUS) continue;
@@ -2534,7 +2554,7 @@ const foldSource = (options) => {
 			const definition = entry?.box?.getNode?.();
 			const nameNode = definition?.getSourceFile() === sourceFile ? definition?.getFirstAncestorByKind(SyntaxKind.VariableDeclaration)?.getNameNode() : importSpecifierFor(sourceFile, binding);
 			if (!nameNode || !Node.isIdentifier(nameNode)) continue;
-			const references = localReferencesTo(sourceFile, binding, nameNode);
+			const references = localReferencesTo(identifiersByName(), binding, nameNode);
 			if (skipped.filter((item) => SURVIVES_TO_RUNTIME.has(item.reason) && item.end > item.start).some((item) => references.some((ref) => ref.getStart() >= item.start && ref.getStart() < item.end))) continue;
 			const survivor = references.find((ref) => !applied.some(([from, to]) => ref.getStart() >= from && ref.getStart() < to));
 			if (!survivor) continue;
@@ -2635,25 +2655,24 @@ const foldSource = (options) => {
 		}
 		if (watched.size === 0) return;
 		const declined = skipped.filter((entry) => SURVIVES_TO_RUNTIME.has(entry.reason) && entry.end > entry.start).map((entry) => [entry.start, entry.end]);
-		const reported = /* @__PURE__ */ new Set();
-		for (const identifier of sourceFile.getDescendantsOfKind(SyntaxKind.Identifier)) {
-			const local = identifier.getText();
-			const imported = watched.get(local);
-			if (imported === void 0 || reported.has(local)) continue;
+		const survivors = [];
+		for (const [local, imported] of watched) for (const identifier of identifiersByName().get(local) ?? []) {
 			const start = identifier.getStart();
 			if (identifier.getFirstAncestorByKind(SyntaxKind.ImportDeclaration)) continue;
 			if (applied.some(([from, to]) => start >= from && start < to)) continue;
 			if (declined.some(([from, to]) => start >= from && start < to)) continue;
 			if (!isValueReference(identifier)) continue;
 			if (isShadowed(identifier, local)) continue;
-			reported.add(local);
-			skipped.push({
+			survivors.push({
 				name: imported,
 				reason: "runtime-binding",
 				start,
 				end: identifier.getEnd()
 			});
+			break;
 		}
+		survivors.sort((a, b) => a.start - b.start);
+		skipped.push(...survivors);
 	}
 	if (reportSurvivors) reportRuntimeBindings();
 	if (folded.length === 0) return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bamboocss/vite",
-  "version": "1.37.10",
+  "version": "1.37.12",
   "description": "Vite integration for Bamboo CSS",
   "homepage": "https://bamboocss.com",
   "license": "MIT",
@@ -40,18 +40,18 @@
     "postcss": "8.5.26",
     "postcss-selector-parser": "7.1.5",
     "ts-morph": "28.0.0",
-    "@bamboocss/config": "1.37.10",
-    "@bamboocss/core": "1.37.10",
-    "@bamboocss/extractor": "1.37.10",
-    "@bamboocss/node": "1.37.10",
-    "@bamboocss/logger": "1.37.10",
-    "@bamboocss/types": "1.37.10",
-    "@bamboocss/shared": "1.37.10"
+    "@bamboocss/config": "1.37.12",
+    "@bamboocss/core": "1.37.12",
+    "@bamboocss/extractor": "1.37.12",
+    "@bamboocss/logger": "1.37.12",
+    "@bamboocss/node": "1.37.12",
+    "@bamboocss/shared": "1.37.12",
+    "@bamboocss/types": "1.37.12"
   },
   "devDependencies": {
     "@jridgewell/trace-mapping": "^0.3.31",
     "vite": "7.2.6",
-    "@bamboocss/fixture": "1.37.10"
+    "@bamboocss/fixture": "1.37.12"
   },
   "peerDependencies": {
     "vite": ">=5"