@bamboocss/extractor 1.16.0 → 1.17.0

package/dist/index.cjs

@@ -310,6 +310,38 @@ const box = {
 const TsEvalError = Symbol("EvalError");
 const cacheMap$2 = /* @__PURE__ */ new WeakMap();
 /**
+* Whether a call reaches a function declared outside this project.
+*
+* Passing a type checker lets the evaluator resolve an identifier to its declaration in
+* another module, which is what makes a call to an imported helper resolvable at all — a
+* style helper in a neighbouring file used to come back unresolvable, and for a recipe that
+* is not a partial loss but a different config, a different hash, and an element with no
+* styles.
+*
+* It also means evaluating whatever it resolves to, so the project boundary is where that
+* stops. A dependency's code is not ours to run at build time, however pure it looks, and
+* declining leaves exactly the behaviour that shipped before the checker was passed.
+*/
+const resolvesWithinProject = (node) => {
+	if (!ts_morph.Node.isCallExpression(node)) return false;
+	const symbol = node.getExpression().getSymbol();
+	if (!symbol) return false;
+	const declarations = (symbol.getAliasedSymbol() ?? symbol).getDeclarations();
+	if (!declarations.length) return false;
+	return !declarations.some((declaration) => declaration.getSourceFile().isInNodeModules());
+};
+/** One per project. `getTypeChecker()` is cheap, but this runs per evaluated call. */
+const typeCheckers = /* @__PURE__ */ new WeakMap();
+const typeCheckerFor = (node) => {
+	const project = node.getProject();
+	let checker = typeCheckers.get(project);
+	if (!checker) {
+		checker = project.getTypeChecker().compilerObject;
+		typeCheckers.set(project, checker);
+	}
+	return checker;
+};
+/**
 * Evaluates a node with strict policies restrictions
 * @see https://github.com/wessberg/ts-evaluator#setting-up-policies
 */
@@ -318,6 +350,7 @@ const evaluateNode = (node, stack, ctx) => {
 	if (ctx.canEval && !ctx.canEval?.(node, stack)) return;
 	if (cacheMap$2.has(node)) return cacheMap$2.get(node);
 	const result = (0, ts_evaluator.evaluate)({
+		...resolvesWithinProject(node) ? { typeChecker: typeCheckerFor(node) } : {},
 		policy: {
 			deterministic: true,
 			network: false,
@@ -1379,6 +1412,34 @@ const runtimeProfiles = [
 		getPropNodes: getArgsAt(1)
 	}
 ];
+/**
+* The declaration `identifier` binds to, found by walking its enclosing scopes outward.
+*
+* Deliberately not `identifier.getDefinitions()`. That is a language-service query, and
+* the first one forces `synchronizeHostData` -> `createProgram`, which resolves, parses
+* and binds the whole transitive `.d.ts` closure of the project — in a 5-file sandbox
+* that is 161 files and 5.1MB, most of it `node_modules`, and it grows with the
+* dependency graph rather than with the user's source. The extractor is built to avoid
+* exactly that: `createTsProject` sets `skipAddingFilesFromTsConfig`,
+* `skipFileDependencyResolution` and `skipLoadingLibFiles`, and `getModuleSpecifierSourceFile`
+* carries the same note. Inside a bundler the program is built alongside the module graph
+* in one heap, so the cost lands as a slow build and then an OOM.
+*
+* A lexical walk is enough because this only ever runs for a callee that is declared in
+* this file: `resolveCallee` matches against the import map first, and `collectImports`
+* covers every import form. Innermost scope wins, which is how the binding resolves
+* anyway, and a scope can hold only one declaration of a given name.
+*/
+const findLocalDeclaration = (identifier) => {
+	const name = identifier.getText();
+	for (let scope = identifier.getParent(); scope; scope = scope.getParent()) {
+		if (!ts_morph.Node.isStatemented(scope)) continue;
+		const variable = scope.getVariableDeclaration(name);
+		if (variable) return variable;
+		const fn = scope.getFunction(name);
+		if (fn) return fn;
+	}
+};
 const createCompiledJsxContext = (sourceFile) => {
 	const imports = collectImports(sourceFile);
 	const normalizeCallee = (node) => {
@@ -1405,30 +1466,26 @@ const createCompiledJsxContext = (sourceFile) => {
 			if (ts_morph.Node.isConditionalExpression(expression)) return resolveLocalAlias(expression.getWhenTrue()) ?? resolveLocalAlias(expression.getWhenFalse());
 			if (ts_morph.Node.isBinaryExpression(expression) && expression.getOperatorToken().getKind() === ts_morph.SyntaxKind.CommaToken) return resolveLocalAlias(expression.getRight());
 		};
-		for (const definition of identifier.getDefinitions()) {
-			const declaration = definition.getDeclarationNode();
-			if (!declaration) continue;
-			if (ts_morph.Node.isFunctionDeclaration(declaration)) {
-				const imported = resolveBundledHelperImport(declaration.getName() ?? name, declaration);
-				if (!imported) continue;
-				const resolved = {
-					mod: imported.mod,
-					importedName: imported.importedName
-				};
-				localDefinitionCache.set(name, resolved);
-				return resolved;
-			}
-			if (ts_morph.Node.isVariableDeclaration(declaration)) {
-				const directImport = resolveBundledHelperImport(declaration.getName(), declaration.getInitializer());
-				const aliasImport = directImport ? {
-					mod: directImport.mod,
-					importedName: directImport.importedName
-				} : resolveLocalAlias(declaration.getInitializer());
-				if (!aliasImport) continue;
-				localDefinitionCache.set(name, aliasImport);
-				return aliasImport;
-			}
+		const declaration = findLocalDeclaration(identifier);
+		if (!declaration) return;
+		if (ts_morph.Node.isFunctionDeclaration(declaration)) {
+			const imported = resolveBundledHelperImport(declaration.getName() ?? name, declaration);
+			if (!imported) return;
+			const resolved = {
+				mod: imported.mod,
+				importedName: imported.importedName
+			};
+			localDefinitionCache.set(name, resolved);
+			return resolved;
 		}
+		const directImport = resolveBundledHelperImport(declaration.getName(), declaration.getInitializer());
+		const aliasImport = directImport ? {
+			mod: directImport.mod,
+			importedName: directImport.importedName
+		} : resolveLocalAlias(declaration.getInitializer());
+		if (!aliasImport) return;
+		localDefinitionCache.set(name, aliasImport);
+		return aliasImport;
 	};
 	const resolveCallee = (node) => {
 		const expression = normalizeCallee(node);
@@ -1878,3 +1935,4 @@ exports.isBoxNode = isBoxNode;
 exports.maybeBoxNode = maybeBoxNode;
 exports.maybeIdentifierValue = maybeIdentifierValue;
 exports.unbox = unbox;
+exports.unwrapExpression = unwrapExpression;

package/dist/index.d.cts

@@ -302,6 +302,9 @@ declare const maybeIdentifierValue: (identifier: Identifier, _stack: Node[], ctx
 type MatchProp = (prop: MatchFnPropArgs | MatchPropArgs) => boolean;
 declare const extractJsxSpreadAttributeValues: (node: JsxSpreadAttribute, ctx: BoxContext, matchProp: MatchProp) => MaybeBoxNodeReturn;
 //#endregion
+//#region src/utils.d.ts
+declare const unwrapExpression: (node: Node) => Node;
+//#endregion
 //#region src/unbox.d.ts
 type BoxNodeType = BoxNode | BoxNode[] | undefined;
 type CacheMap = WeakMap<BoxNode, Unboxed>;
@@ -321,4 +324,4 @@ interface Unboxed {
 }
 declare const unbox: (node: BoxNodeType, ctx?: Pick<UnboxContext, "cache">) => Unboxed;
 //#endregion
-export { type BoxContext, type BoxNode, BoxNodeArray, BoxNodeConditional, BoxNodeEmptyInitializer, BoxNodeLiteral, BoxNodeMap, BoxNodeObject, BoxNodeUnresolvable, type EvaluateOptions, type ExtractOptions, type ExtractResultByName, type ExtractResultItem, type ExtractedComponentInstance, type ExtractedComponentResult, type ExtractedFunctionInstance, type ExtractedFunctionResult, type NodeRange, type PrimitiveType, type Unboxed, box, clearBoxNodeCache, extract, extractCallExpressionArguments, extractJsxAttribute, extractJsxElementProps, extractJsxSpreadAttributeValues, findIdentifierValueDeclaration, isBoxNode, maybeBoxNode, maybeIdentifierValue, unbox };
+export { type BoxContext, type BoxNode, BoxNodeArray, BoxNodeConditional, BoxNodeEmptyInitializer, BoxNodeLiteral, BoxNodeMap, BoxNodeObject, BoxNodeUnresolvable, type EvaluateOptions, type ExtractOptions, type ExtractResultByName, type ExtractResultItem, type ExtractedComponentInstance, type ExtractedComponentResult, type ExtractedFunctionInstance, type ExtractedFunctionResult, type NodeRange, type PrimitiveType, type Unboxed, box, clearBoxNodeCache, extract, extractCallExpressionArguments, extractJsxAttribute, extractJsxElementProps, extractJsxSpreadAttributeValues, findIdentifierValueDeclaration, isBoxNode, maybeBoxNode, maybeIdentifierValue, unbox, unwrapExpression };

package/dist/index.d.mts

@@ -302,6 +302,9 @@ declare const maybeIdentifierValue: (identifier: Identifier, _stack: Node[], ctx
 type MatchProp = (prop: MatchFnPropArgs | MatchPropArgs) => boolean;
 declare const extractJsxSpreadAttributeValues: (node: JsxSpreadAttribute, ctx: BoxContext, matchProp: MatchProp) => MaybeBoxNodeReturn;
 //#endregion
+//#region src/utils.d.ts
+declare const unwrapExpression: (node: Node) => Node;
+//#endregion
 //#region src/unbox.d.ts
 type BoxNodeType = BoxNode | BoxNode[] | undefined;
 type CacheMap = WeakMap<BoxNode, Unboxed>;
@@ -321,4 +324,4 @@ interface Unboxed {
 }
 declare const unbox: (node: BoxNodeType, ctx?: Pick<UnboxContext, "cache">) => Unboxed;
 //#endregion
-export { type BoxContext, type BoxNode, BoxNodeArray, BoxNodeConditional, BoxNodeEmptyInitializer, BoxNodeLiteral, BoxNodeMap, BoxNodeObject, BoxNodeUnresolvable, type EvaluateOptions, type ExtractOptions, type ExtractResultByName, type ExtractResultItem, type ExtractedComponentInstance, type ExtractedComponentResult, type ExtractedFunctionInstance, type ExtractedFunctionResult, type NodeRange, type PrimitiveType, type Unboxed, box, clearBoxNodeCache, extract, extractCallExpressionArguments, extractJsxAttribute, extractJsxElementProps, extractJsxSpreadAttributeValues, findIdentifierValueDeclaration, isBoxNode, maybeBoxNode, maybeIdentifierValue, unbox };
+export { type BoxContext, type BoxNode, BoxNodeArray, BoxNodeConditional, BoxNodeEmptyInitializer, BoxNodeLiteral, BoxNodeMap, BoxNodeObject, BoxNodeUnresolvable, type EvaluateOptions, type ExtractOptions, type ExtractResultByName, type ExtractResultItem, type ExtractedComponentInstance, type ExtractedComponentResult, type ExtractedFunctionInstance, type ExtractedFunctionResult, type NodeRange, type PrimitiveType, type Unboxed, box, clearBoxNodeCache, extract, extractCallExpressionArguments, extractJsxAttribute, extractJsxElementProps, extractJsxSpreadAttributeValues, findIdentifierValueDeclaration, isBoxNode, maybeBoxNode, maybeIdentifierValue, unbox, unwrapExpression };

package/dist/index.mjs

@@ -309,6 +309,38 @@ const box = {
 const TsEvalError = Symbol("EvalError");
 const cacheMap$2 = /* @__PURE__ */ new WeakMap();
 /**
+* Whether a call reaches a function declared outside this project.
+*
+* Passing a type checker lets the evaluator resolve an identifier to its declaration in
+* another module, which is what makes a call to an imported helper resolvable at all — a
+* style helper in a neighbouring file used to come back unresolvable, and for a recipe that
+* is not a partial loss but a different config, a different hash, and an element with no
+* styles.
+*
+* It also means evaluating whatever it resolves to, so the project boundary is where that
+* stops. A dependency's code is not ours to run at build time, however pure it looks, and
+* declining leaves exactly the behaviour that shipped before the checker was passed.
+*/
+const resolvesWithinProject = (node) => {
+	if (!Node.isCallExpression(node)) return false;
+	const symbol = node.getExpression().getSymbol();
+	if (!symbol) return false;
+	const declarations = (symbol.getAliasedSymbol() ?? symbol).getDeclarations();
+	if (!declarations.length) return false;
+	return !declarations.some((declaration) => declaration.getSourceFile().isInNodeModules());
+};
+/** One per project. `getTypeChecker()` is cheap, but this runs per evaluated call. */
+const typeCheckers = /* @__PURE__ */ new WeakMap();
+const typeCheckerFor = (node) => {
+	const project = node.getProject();
+	let checker = typeCheckers.get(project);
+	if (!checker) {
+		checker = project.getTypeChecker().compilerObject;
+		typeCheckers.set(project, checker);
+	}
+	return checker;
+};
+/**
 * Evaluates a node with strict policies restrictions
 * @see https://github.com/wessberg/ts-evaluator#setting-up-policies
 */
@@ -317,6 +349,7 @@ const evaluateNode = (node, stack, ctx) => {
 	if (ctx.canEval && !ctx.canEval?.(node, stack)) return;
 	if (cacheMap$2.has(node)) return cacheMap$2.get(node);
 	const result = evaluate({
+		...resolvesWithinProject(node) ? { typeChecker: typeCheckerFor(node) } : {},
 		policy: {
 			deterministic: true,
 			network: false,
@@ -1378,6 +1411,34 @@ const runtimeProfiles = [
 		getPropNodes: getArgsAt(1)
 	}
 ];
+/**
+* The declaration `identifier` binds to, found by walking its enclosing scopes outward.
+*
+* Deliberately not `identifier.getDefinitions()`. That is a language-service query, and
+* the first one forces `synchronizeHostData` -> `createProgram`, which resolves, parses
+* and binds the whole transitive `.d.ts` closure of the project — in a 5-file sandbox
+* that is 161 files and 5.1MB, most of it `node_modules`, and it grows with the
+* dependency graph rather than with the user's source. The extractor is built to avoid
+* exactly that: `createTsProject` sets `skipAddingFilesFromTsConfig`,
+* `skipFileDependencyResolution` and `skipLoadingLibFiles`, and `getModuleSpecifierSourceFile`
+* carries the same note. Inside a bundler the program is built alongside the module graph
+* in one heap, so the cost lands as a slow build and then an OOM.
+*
+* A lexical walk is enough because this only ever runs for a callee that is declared in
+* this file: `resolveCallee` matches against the import map first, and `collectImports`
+* covers every import form. Innermost scope wins, which is how the binding resolves
+* anyway, and a scope can hold only one declaration of a given name.
+*/
+const findLocalDeclaration = (identifier) => {
+	const name = identifier.getText();
+	for (let scope = identifier.getParent(); scope; scope = scope.getParent()) {
+		if (!Node.isStatemented(scope)) continue;
+		const variable = scope.getVariableDeclaration(name);
+		if (variable) return variable;
+		const fn = scope.getFunction(name);
+		if (fn) return fn;
+	}
+};
 const createCompiledJsxContext = (sourceFile) => {
 	const imports = collectImports(sourceFile);
 	const normalizeCallee = (node) => {
@@ -1404,30 +1465,26 @@ const createCompiledJsxContext = (sourceFile) => {
 			if (Node.isConditionalExpression(expression)) return resolveLocalAlias(expression.getWhenTrue()) ?? resolveLocalAlias(expression.getWhenFalse());
 			if (Node.isBinaryExpression(expression) && expression.getOperatorToken().getKind() === SyntaxKind.CommaToken) return resolveLocalAlias(expression.getRight());
 		};
-		for (const definition of identifier.getDefinitions()) {
-			const declaration = definition.getDeclarationNode();
-			if (!declaration) continue;
-			if (Node.isFunctionDeclaration(declaration)) {
-				const imported = resolveBundledHelperImport(declaration.getName() ?? name, declaration);
-				if (!imported) continue;
-				const resolved = {
-					mod: imported.mod,
-					importedName: imported.importedName
-				};
-				localDefinitionCache.set(name, resolved);
-				return resolved;
-			}
-			if (Node.isVariableDeclaration(declaration)) {
-				const directImport = resolveBundledHelperImport(declaration.getName(), declaration.getInitializer());
-				const aliasImport = directImport ? {
-					mod: directImport.mod,
-					importedName: directImport.importedName
-				} : resolveLocalAlias(declaration.getInitializer());
-				if (!aliasImport) continue;
-				localDefinitionCache.set(name, aliasImport);
-				return aliasImport;
-			}
+		const declaration = findLocalDeclaration(identifier);
+		if (!declaration) return;
+		if (Node.isFunctionDeclaration(declaration)) {
+			const imported = resolveBundledHelperImport(declaration.getName() ?? name, declaration);
+			if (!imported) return;
+			const resolved = {
+				mod: imported.mod,
+				importedName: imported.importedName
+			};
+			localDefinitionCache.set(name, resolved);
+			return resolved;
 		}
+		const directImport = resolveBundledHelperImport(declaration.getName(), declaration.getInitializer());
+		const aliasImport = directImport ? {
+			mod: directImport.mod,
+			importedName: directImport.importedName
+		} : resolveLocalAlias(declaration.getInitializer());
+		if (!aliasImport) return;
+		localDefinitionCache.set(name, aliasImport);
+		return aliasImport;
 	};
 	const resolveCallee = (node) => {
 		const expression = normalizeCallee(node);
@@ -1858,4 +1915,4 @@ const unbox = (node, ctx) => {
 	return result;
 };
 //#endregion
-export { BoxNodeArray, BoxNodeConditional, BoxNodeEmptyInitializer, BoxNodeLiteral, BoxNodeMap, BoxNodeObject, BoxNodeUnresolvable, box, clearBoxNodeCache, extract, extractCallExpressionArguments, extractJsxAttribute, extractJsxElementProps, extractJsxSpreadAttributeValues, findIdentifierValueDeclaration, isBoxNode, maybeBoxNode, maybeIdentifierValue, unbox };
+export { BoxNodeArray, BoxNodeConditional, BoxNodeEmptyInitializer, BoxNodeLiteral, BoxNodeMap, BoxNodeObject, BoxNodeUnresolvable, box, clearBoxNodeCache, extract, extractCallExpressionArguments, extractJsxAttribute, extractJsxElementProps, extractJsxSpreadAttributeValues, findIdentifierValueDeclaration, isBoxNode, maybeBoxNode, maybeIdentifierValue, unbox, unwrapExpression };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bamboocss/extractor",
-  "version": "1.16.0",
+  "version": "1.17.0",
   "description": "The css extractor for css bamboo",
   "homepage": "https://bamboocss.com",
   "license": "MIT",
@@ -35,7 +35,7 @@
   "dependencies": {
     "ts-evaluator": "1.2.0",
     "ts-morph": "28.0.0",
-    "@bamboocss/shared": "1.16.0"
+    "@bamboocss/shared": "1.17.0"
   },
   "scripts": {
     "build": "tsdown src/index.ts --format=cjs,esm --shims --dts",