@bamboocss/vite 1.44.0 → 1.44.1

package/dist/index.cjs

@@ -1025,34 +1025,33 @@ const collectModuleScopeNames = (sourceFile) => {
 	return names;
 };
 /**
-* Every identifier in this module that reads the binding `name` declared at `declaration`.
-*
-* Replaces `nameNode.findReferencesAsNodes()`, which is a TypeScript *language-service*
-* query. The first such query forces `synchronizeHostData` -> `createProgram`, binding the
-* whole transitive `.d.ts` closure of the project — the exact cost `createTsProject`'s
-* `skipAddingFilesFromTsConfig`, `skipFileDependencyResolution` and `skipLoadingLibFiles`
-* exist to avoid, and which none of them govern. On a 2,278-file app it loaded 24,081 source
-* files and 4.4 GB of AST and symbols, 80% of the heap, and OOMed the build. The retained
-* strings were `googleapis` and `typescript`; none of it can reference a recipe binding.
-*
-* A recipe binding is module-scoped or imported, so every read of it is in this file. A
-* syntactic walk answers the same question over one AST the parser has already built.
-*
-* ## Where this deliberately over-reports
-*
-* Shadowing is not resolved. If any nested scope declares the same name, every matching
-* identifier is returned rather than only the ones that bind to `declaration`. That direction
-* is chosen on purpose: over-reporting fails the build with a diagnostic naming a real line,
-* 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.
-*/
-/**
 * Every identifier in the module, grouped by the name it spells.
 *
 * 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.
 *
+* ## Why this is a raw walk rather than `getDescendantsOfKind`
+*
+* `SyntaxKind.Identifier` sorts *below* `SyntaxKind.FirstNode`, which is what ts-morph tests to
+* decide whether it may search the parse tree. For a kind below that line it falls back to
+* materialising the whole **token** tree — every brace, comma and keyword becomes a ts-morph node
+* on the way to collecting the identifiers. On 55 KB of real tsx that measured 22ms against
+* 0.22ms for the same collection over compiler nodes, and the node cache does not help: a second
+* call cost the same 22ms.
+*
+* Wrapping is what costs, so only the buckets a caller actually reads are wrapped, on the first
+* read and cached after. Nothing enumerates this index — both callers ask for one name — so the
+* rest is never built. `_getNodeFromCompilerNode` is ts-morph's own memoized wrapper factory, so
+* a node handed back here is the very object `getDescendantsOfKind` would have returned, which
+* `localReferencesTo` depends on: it compares against the declaration by identity.
+*
+* JSDoc is walked explicitly. `ts.forEachChild` does not descend into it, while the token path
+* this replaces does, so a name mentioned only in a `@type` annotation was previously found and
+* would otherwise stop being — a silent narrowing of what counts as a surviving reference.
+* Keyed on `escapedText` because that is what ts-morph's `Identifier.getText()` returns: the name
+* as the compiler resolves it, so `\u0062adge` and `badge` share a bucket exactly as before.
+*
 * 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
@@ -1061,18 +1060,32 @@ const collectModuleScopeNames = (sourceFile) => {
 * `Attempted to get information from a node that was removed or forgotten` on the next read.
 */
 const identifierIndex = (sourceFile) => {
-	const index = /* @__PURE__ */ new Map();
-	for (const identifier of sourceFile.getDescendantsOfKind(ts_morph.SyntaxKind.Identifier)) {
-		const text = identifier.getText();
-		const known = index.get(text);
-		if (known) known.push(identifier);
-		else index.set(text, [identifier]);
-	}
-	return index;
+	const compilerNodes = /* @__PURE__ */ new Map();
+	const collect = (node) => {
+		if (node.kind === ts_morph.ts.SyntaxKind.Identifier) {
+			const name = String(node.escapedText);
+			const known = compilerNodes.get(name);
+			if (known) known.push(node);
+			else compilerNodes.set(name, [node]);
+		}
+		const jsDoc = node.jsDoc;
+		if (jsDoc) for (const doc of jsDoc) collect(doc);
+		ts_morph.ts.forEachChild(node, collect);
+	};
+	ts_morph.ts.forEachChild(sourceFile.compilerNode, collect);
+	const wrapped = /* @__PURE__ */ new Map();
+	const wrap = sourceFile;
+	return { get: (name) => {
+		const known = wrapped.get(name);
+		if (known) return known;
+		const nodes = (compilerNodes.get(name) ?? []).map((node) => wrap._getNodeFromCompilerNode(node));
+		wrapped.set(name, nodes);
+		return nodes;
+	} };
 };
 const localReferencesTo = (index, name, declaration) => {
 	const references = [];
-	for (const identifier of index.get(name) ?? []) {
+	for (const identifier of index.get(name)) {
 		if (identifier === declaration) continue;
 		const parent = identifier.getParent();
 		if (!parent) continue;
@@ -1705,6 +1718,16 @@ const PERMITTED_BINDINGS = new Set([
 	SPLIT_PROPS_HELPER
 ]);
 /**
+* Whether a module's text could hold a `splitVariantProps` property access.
+*
+* A necessary condition, deliberately not a sufficient one: the name inside a string or a
+* comment opens the walk, which costs what the walk always cost. What it must never do is
+* close on a module that has one, and an identifier may be spelled with unicode escapes —
+* `badge.splitVariantProps(p)` reads as the name to the compiler and contains none of it
+* as text. Both escape forms start `\u`, so one test covers every spelling.
+*/
+const mayNameSplitVariantProps = (text) => text.includes("splitVariantProps") || text.includes("\\u");
+/**
 * The pieces `trim` reduces a module specifier by, hoisted because a regex literal
 * constructs a new object every time it is evaluated and `trim` runs per specifier per
 * import declaration per module.
@@ -2512,7 +2535,7 @@ const foldSource = (options) => {
 				}
 			}
 			const byRange = new Map(candidates.map((candidate) => [`${candidate.start}:${candidate.end}`, candidate]));
-			for (const call of sourceFile.getDescendantsOfKind(ts_morph.SyntaxKind.CallExpression)) {
+			for (const call of cxBindings.size ? sourceFile.getDescendantsOfKind(ts_morph.SyntaxKind.CallExpression) : []) {
 				const callee = call.getExpression();
 				if (!ts_morph.Node.isIdentifier(callee) || !cxBindings.has(callee.getText()) || isShadowed(call, callee.getText())) continue;
 				const matched = [];
@@ -2789,7 +2812,7 @@ const foldSource = (options) => {
 		collectSourceFiles(item.box, dependencyScan);
 	}
 	const recipeSourceFile = candidates[0]?.node.getSourceFile();
-	if (recipeSourceFile) for (const access of recipeSourceFile.getDescendantsOfKind(ts_morph.SyntaxKind.PropertyAccessExpression)) {
+	if (recipeSourceFile && mayNameSplitVariantProps(recipeSourceFile.getFullText())) for (const access of recipeSourceFile.getDescendantsOfKind(ts_morph.SyntaxKind.PropertyAccessExpression)) {
 		if (access.getName() !== "splitVariantProps") continue;
 		const target = access.getExpression();
 		if (!ts_morph.Node.isIdentifier(target)) continue;
@@ -2896,7 +2919,13 @@ const foldSource = (options) => {
 			...ctx.imports.matchers.pattern?.mods ?? [],
 			...ctx.imports.matchers.tokens?.mods ?? []
 		];
-		for (const call of sourceFile.getDescendantsOfKind(ts_morph.SyntaxKind.CallExpression)) {
+		const runtimeCalls = [];
+		const importEquals = [];
+		sourceFile.forEachDescendant((node) => {
+			if (ts_morph.Node.isCallExpression(node)) runtimeCalls.push(node);
+			else if (ts_morph.Node.isImportEqualsDeclaration(node)) importEquals.push(node);
+		});
+		for (const call of runtimeCalls) {
 			const callee = call.getExpression();
 			const argument = call.getArguments()[0];
 			if (!argument || !ts_morph.Node.isStringLiteral(argument) && !ts_morph.Node.isNoSubstitutionTemplateLiteral(argument)) continue;
@@ -2911,7 +2940,7 @@ const foldSource = (options) => {
 				end: call.getEnd()
 			});
 		}
-		for (const declaration of sourceFile.getDescendantsOfKind(ts_morph.SyntaxKind.ImportEqualsDeclaration)) {
+		for (const declaration of importEquals) {
 			if (declaration.isTypeOnly()) continue;
 			const reference = declaration.getModuleReference();
 			if (!ts_morph.Node.isExternalModuleReference(reference)) continue;
@@ -2981,7 +3010,7 @@ 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 survivors = [];
-		for (const [local, imported] of watched) for (const identifier of identifiersByName().get(local) ?? []) {
+		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;

package/dist/index.mjs

@@ -9,7 +9,7 @@ import selectorParser from "postcss-selector-parser";
 import { dirname, relative, resolve } from "node:path";
 import { resolveTsPathPattern } from "@bamboocss/config/ts-path";
 import { box, maybeBoxNode } from "@bamboocss/extractor";
-import { Node, SyntaxKind, VariableDeclarationKind } from "ts-morph";
+import { Node, SyntaxKind, VariableDeclarationKind, ts } from "ts-morph";
 //#region src/prune-static-css.ts
 /** The generated declaration that identifies a Bamboo stylesheet after minification. */
 const SENTINEL = "--made-with-bamboo";
@@ -995,34 +995,33 @@ const collectModuleScopeNames = (sourceFile) => {
 	return names;
 };
 /**
-* Every identifier in this module that reads the binding `name` declared at `declaration`.
-*
-* Replaces `nameNode.findReferencesAsNodes()`, which is a TypeScript *language-service*
-* query. The first such query forces `synchronizeHostData` -> `createProgram`, binding the
-* whole transitive `.d.ts` closure of the project — the exact cost `createTsProject`'s
-* `skipAddingFilesFromTsConfig`, `skipFileDependencyResolution` and `skipLoadingLibFiles`
-* exist to avoid, and which none of them govern. On a 2,278-file app it loaded 24,081 source
-* files and 4.4 GB of AST and symbols, 80% of the heap, and OOMed the build. The retained
-* strings were `googleapis` and `typescript`; none of it can reference a recipe binding.
-*
-* A recipe binding is module-scoped or imported, so every read of it is in this file. A
-* syntactic walk answers the same question over one AST the parser has already built.
-*
-* ## Where this deliberately over-reports
-*
-* Shadowing is not resolved. If any nested scope declares the same name, every matching
-* identifier is returned rather than only the ones that bind to `declaration`. That direction
-* is chosen on purpose: over-reporting fails the build with a diagnostic naming a real line,
-* 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.
-*/
-/**
 * Every identifier in the module, grouped by the name it spells.
 *
 * 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.
 *
+* ## Why this is a raw walk rather than `getDescendantsOfKind`
+*
+* `SyntaxKind.Identifier` sorts *below* `SyntaxKind.FirstNode`, which is what ts-morph tests to
+* decide whether it may search the parse tree. For a kind below that line it falls back to
+* materialising the whole **token** tree — every brace, comma and keyword becomes a ts-morph node
+* on the way to collecting the identifiers. On 55 KB of real tsx that measured 22ms against
+* 0.22ms for the same collection over compiler nodes, and the node cache does not help: a second
+* call cost the same 22ms.
+*
+* Wrapping is what costs, so only the buckets a caller actually reads are wrapped, on the first
+* read and cached after. Nothing enumerates this index — both callers ask for one name — so the
+* rest is never built. `_getNodeFromCompilerNode` is ts-morph's own memoized wrapper factory, so
+* a node handed back here is the very object `getDescendantsOfKind` would have returned, which
+* `localReferencesTo` depends on: it compares against the declaration by identity.
+*
+* JSDoc is walked explicitly. `ts.forEachChild` does not descend into it, while the token path
+* this replaces does, so a name mentioned only in a `@type` annotation was previously found and
+* would otherwise stop being — a silent narrowing of what counts as a surviving reference.
+* Keyed on `escapedText` because that is what ts-morph's `Identifier.getText()` returns: the name
+* as the compiler resolves it, so `\u0062adge` and `badge` share a bucket exactly as before.
+*
 * 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
@@ -1031,18 +1030,32 @@ const collectModuleScopeNames = (sourceFile) => {
 * `Attempted to get information from a node that was removed or forgotten` on the next read.
 */
 const identifierIndex = (sourceFile) => {
-	const index = /* @__PURE__ */ new Map();
-	for (const identifier of sourceFile.getDescendantsOfKind(SyntaxKind.Identifier)) {
-		const text = identifier.getText();
-		const known = index.get(text);
-		if (known) known.push(identifier);
-		else index.set(text, [identifier]);
-	}
-	return index;
+	const compilerNodes = /* @__PURE__ */ new Map();
+	const collect = (node) => {
+		if (node.kind === ts.SyntaxKind.Identifier) {
+			const name = String(node.escapedText);
+			const known = compilerNodes.get(name);
+			if (known) known.push(node);
+			else compilerNodes.set(name, [node]);
+		}
+		const jsDoc = node.jsDoc;
+		if (jsDoc) for (const doc of jsDoc) collect(doc);
+		ts.forEachChild(node, collect);
+	};
+	ts.forEachChild(sourceFile.compilerNode, collect);
+	const wrapped = /* @__PURE__ */ new Map();
+	const wrap = sourceFile;
+	return { get: (name) => {
+		const known = wrapped.get(name);
+		if (known) return known;
+		const nodes = (compilerNodes.get(name) ?? []).map((node) => wrap._getNodeFromCompilerNode(node));
+		wrapped.set(name, nodes);
+		return nodes;
+	} };
 };
 const localReferencesTo = (index, name, declaration) => {
 	const references = [];
-	for (const identifier of index.get(name) ?? []) {
+	for (const identifier of index.get(name)) {
 		if (identifier === declaration) continue;
 		const parent = identifier.getParent();
 		if (!parent) continue;
@@ -1675,6 +1688,16 @@ const PERMITTED_BINDINGS = new Set([
 	SPLIT_PROPS_HELPER
 ]);
 /**
+* Whether a module's text could hold a `splitVariantProps` property access.
+*
+* A necessary condition, deliberately not a sufficient one: the name inside a string or a
+* comment opens the walk, which costs what the walk always cost. What it must never do is
+* close on a module that has one, and an identifier may be spelled with unicode escapes —
+* `badge.splitVariantProps(p)` reads as the name to the compiler and contains none of it
+* as text. Both escape forms start `\u`, so one test covers every spelling.
+*/
+const mayNameSplitVariantProps = (text) => text.includes("splitVariantProps") || text.includes("\\u");
+/**
 * The pieces `trim` reduces a module specifier by, hoisted because a regex literal
 * constructs a new object every time it is evaluated and `trim` runs per specifier per
 * import declaration per module.
@@ -2482,7 +2505,7 @@ const foldSource = (options) => {
 				}
 			}
 			const byRange = new Map(candidates.map((candidate) => [`${candidate.start}:${candidate.end}`, candidate]));
-			for (const call of sourceFile.getDescendantsOfKind(SyntaxKind.CallExpression)) {
+			for (const call of cxBindings.size ? sourceFile.getDescendantsOfKind(SyntaxKind.CallExpression) : []) {
 				const callee = call.getExpression();
 				if (!Node.isIdentifier(callee) || !cxBindings.has(callee.getText()) || isShadowed(call, callee.getText())) continue;
 				const matched = [];
@@ -2759,7 +2782,7 @@ const foldSource = (options) => {
 		collectSourceFiles(item.box, dependencyScan);
 	}
 	const recipeSourceFile = candidates[0]?.node.getSourceFile();
-	if (recipeSourceFile) for (const access of recipeSourceFile.getDescendantsOfKind(SyntaxKind.PropertyAccessExpression)) {
+	if (recipeSourceFile && mayNameSplitVariantProps(recipeSourceFile.getFullText())) for (const access of recipeSourceFile.getDescendantsOfKind(SyntaxKind.PropertyAccessExpression)) {
 		if (access.getName() !== "splitVariantProps") continue;
 		const target = access.getExpression();
 		if (!Node.isIdentifier(target)) continue;
@@ -2866,7 +2889,13 @@ const foldSource = (options) => {
 			...ctx.imports.matchers.pattern?.mods ?? [],
 			...ctx.imports.matchers.tokens?.mods ?? []
 		];
-		for (const call of sourceFile.getDescendantsOfKind(SyntaxKind.CallExpression)) {
+		const runtimeCalls = [];
+		const importEquals = [];
+		sourceFile.forEachDescendant((node) => {
+			if (Node.isCallExpression(node)) runtimeCalls.push(node);
+			else if (Node.isImportEqualsDeclaration(node)) importEquals.push(node);
+		});
+		for (const call of runtimeCalls) {
 			const callee = call.getExpression();
 			const argument = call.getArguments()[0];
 			if (!argument || !Node.isStringLiteral(argument) && !Node.isNoSubstitutionTemplateLiteral(argument)) continue;
@@ -2881,7 +2910,7 @@ const foldSource = (options) => {
 				end: call.getEnd()
 			});
 		}
-		for (const declaration of sourceFile.getDescendantsOfKind(SyntaxKind.ImportEqualsDeclaration)) {
+		for (const declaration of importEquals) {
 			if (declaration.isTypeOnly()) continue;
 			const reference = declaration.getModuleReference();
 			if (!Node.isExternalModuleReference(reference)) continue;
@@ -2951,7 +2980,7 @@ 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 survivors = [];
-		for (const [local, imported] of watched) for (const identifier of identifiersByName().get(local) ?? []) {
+		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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bamboocss/vite",
-  "version": "1.44.0",
+  "version": "1.44.1",
   "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.44.0",
-    "@bamboocss/core": "1.44.0",
-    "@bamboocss/extractor": "1.44.0",
-    "@bamboocss/logger": "1.44.0",
-    "@bamboocss/node": "1.44.0",
-    "@bamboocss/shared": "1.44.0",
-    "@bamboocss/types": "1.44.0"
+    "@bamboocss/core": "1.44.1",
+    "@bamboocss/config": "1.44.1",
+    "@bamboocss/extractor": "1.44.1",
+    "@bamboocss/logger": "1.44.1",
+    "@bamboocss/node": "1.44.1",
+    "@bamboocss/shared": "1.44.1",
+    "@bamboocss/types": "1.44.1"
   },
   "devDependencies": {
     "@jridgewell/trace-mapping": "^0.3.31",
     "vite": "7.2.6",
-    "@bamboocss/fixture": "1.44.0"
+    "@bamboocss/fixture": "1.44.1"
   },
   "peerDependencies": {
     "vite": ">=5"