@bamboocss/extractor 1.14.0 → 1.16.0

package/dist/index.cjs

@@ -116,6 +116,29 @@ const recipeProps = [
 var BoxNodeMap = class extends BoxNodeType {
 	value;
 	spreadConditions;
+	/**
+	* Spreads the extractor walked structurally, paired with what it walked them into.
+	*
+	* The map records what a spread *contributed*, so a spread that flattened and one that
+	* was silently skipped look identical once folded in — both simply add keys, or fail to.
+	* That ambiguity is why a consumer rewriting source would otherwise have to decline every
+	* spread rather than only the ones it cannot account for.
+	*
+	* The *walked* ones are listed rather than the skipped ones deliberately: a consumer asks
+	* "may I trust this spread", and a list of failures answers that only while it is
+	* exhaustive. A list of successes is safe to be incomplete — the worst an omission costs
+	* is a fold that does not happen.
+	*
+	* `box` is the map the spread flattened, and being here is **not** a promise that every
+	* one of its keys survived — the extractor omits what it cannot evaluate, at any depth. It
+	* is the handle a consumer needs to go and check for itself, which it cannot do from the
+	* flattened result. `node` is the spread's own expression, so the pair can be matched
+	* against the source being inspected.
+	*
+	* Deliberately kept off `value`, and therefore invisible to `unbox` — this describes the
+	* extraction, not the styles, and nothing that generates CSS should see it.
+	*/
+	resolvedSpreads;
 	constructor(definition) {
 		super(definition);
 		this.value = definition.value;
@@ -440,6 +463,8 @@ const getObjectLiteralExpressionPropPairs = (expression, expressionStack, ctx, m
 	if (properties.length === 0) return box.emptyObject(expression, expressionStack);
 	const extractedPropValues = [];
 	const spreadConditions = [];
+	/** Spreads the extractor walked structurally — see `BoxNodeMap.resolvedSpreads`. */
+	const resolvedSpreads = [];
 	properties.forEach((property) => {
 		const stack = [...expressionStack];
 		stack.push(property);
@@ -492,6 +517,10 @@ const getObjectLiteralExpressionPropPairs = (expression, expressionStack, ctx, m
 				maybeObject.value.forEach((nested, propName) => {
 					extractedPropValues.push([propName, nested]);
 				});
+				resolvedSpreads.push({
+					node: initializer,
+					box: maybeObject
+				});
 				return;
 			}
 			if (box.isConditional(maybeObject)) spreadConditions.push(maybeObject);
@@ -503,6 +532,7 @@ const getObjectLiteralExpressionPropPairs = (expression, expressionStack, ctx, m
 		orderedMapValue.set(propName, value);
 	});
 	const map = box.map(orderedMapValue, expression, expressionStack);
+	if (resolvedSpreads.length > 0) map.resolvedSpreads = resolvedSpreads;
 	if (spreadConditions.length > 0) map.spreadConditions = spreadConditions;
 	return map;
 };
@@ -631,6 +661,7 @@ function maybeBoxNode(node, stack, ctx, matchProp) {
 		if (isPlusSyntax(operatorKind)) {
 			const value = tryComputingPlusTokenBinaryExpressionToString(node, stack, ctx) ?? safeEvaluateNode(node, stack, ctx);
 			if (!value) return;
+			if (typeof value === "string" && value.includes("undefined")) return;
 			return cache(box.from(value, node, stack));
 		}
 		if (isLogicalSyntax(operatorKind)) return cache(maybeResolveConditionalExpression({
@@ -1492,7 +1523,7 @@ const objectLikeToMap = (maybeObject, node) => {
 const isImportOrExport = (node) => ts_morph.Node.isImportDeclaration(node) || ts_morph.Node.isExportDeclaration(node);
 const isJsxElement = (node) => ts_morph.Node.isJsxOpeningElement(node) || ts_morph.Node.isJsxSelfClosingElement(node);
 const extract = ({ ast, ...ctx }) => {
-	const { components, functions, taggedTemplates } = ctx;
+	const { components, functions } = ctx;
 	const compiledJsx = createCompiledJsxContext(ast);
 	/** contains all the extracted nodes from this ast parsing */
 	const byName = /* @__PURE__ */ new Map();
@@ -1662,6 +1693,7 @@ const extract = ({ ast, ...ctx }) => {
 					});
 					const boxMap = box.map(mapValue, node, boxNode.getStack());
 					if (box.isMap(boxNode) && boxNode.spreadConditions?.length) boxMap.spreadConditions = boxNode.spreadConditions;
+					if (box.isMap(boxNode) && boxNode.resolvedSpreads?.length) boxMap.resolvedSpreads = boxNode.resolvedSpreads;
 					return boxMap;
 				}
 				return boxNode;
@@ -1673,26 +1705,6 @@ const extract = ({ ast, ...ctx }) => {
 			};
 			fnResultMap.queryList.push(query);
 		}
-		if (taggedTemplates && ts_morph.Node.isTaggedTemplateExpression(node)) {
-			const tag = node.getTag();
-			const fnName = ts_morph.Node.isCallExpression(tag) ? tag.getExpression().getText() : tag.getText();
-			if (!taggedTemplates.matchTaggedTemplate({
-				taggedTemplateNode: node,
-				fnName
-			})) return;
-			if (!byName.has(fnName)) byName.set(fnName, {
-				kind: "function",
-				nodesByProp: /* @__PURE__ */ new Map(),
-				queryList: []
-			});
-			const fnResultMap = byName.get(fnName);
-			const query = {
-				kind: "tagged-template",
-				name: fnName,
-				box: maybeBoxNode(node, [], ctx)
-			};
-			fnResultMap.queryList.push(query);
-		}
 	});
 	componentByNode.forEach((parentRef, componentNode) => {
 		const component = componentByNode.get(componentNode);

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { BindingElement, CallExpression, EnumDeclaration, Expression, FunctionDeclaration, GetAccessorDeclaration, Identifier, JsxAttribute, JsxOpeningElement, JsxSelfClosingElement, JsxSpreadAttribute, Node, ParameterDeclaration, PropertyAssignment, ShorthandPropertyAssignment, SourceFile, TaggedTemplateExpression, VariableDeclaration } from "ts-morph";
+import { BindingElement, CallExpression, EnumDeclaration, Expression, FunctionDeclaration, GetAccessorDeclaration, Identifier, JsxAttribute, JsxOpeningElement, JsxSelfClosingElement, JsxSpreadAttribute, Node, ParameterDeclaration, PropertyAssignment, ShorthandPropertyAssignment, SourceFile, VariableDeclaration } from "ts-morph";
 import { EvaluateOptions as EvaluateOptions$1 } from "ts-evaluator";
 
 //#region src/box-factory.d.ts
@@ -79,6 +79,32 @@ declare class BoxNodeLiteral extends BoxNodeType$1<LiteralType> {
 declare class BoxNodeMap extends BoxNodeType$1<MapType> {
   value: MapType['value'];
   spreadConditions?: BoxNodeConditional[];
+  /**
+   * Spreads the extractor walked structurally, paired with what it walked them into.
+   *
+   * The map records what a spread *contributed*, so a spread that flattened and one that
+   * was silently skipped look identical once folded in — both simply add keys, or fail to.
+   * That ambiguity is why a consumer rewriting source would otherwise have to decline every
+   * spread rather than only the ones it cannot account for.
+   *
+   * The *walked* ones are listed rather than the skipped ones deliberately: a consumer asks
+   * "may I trust this spread", and a list of failures answers that only while it is
+   * exhaustive. A list of successes is safe to be incomplete — the worst an omission costs
+   * is a fold that does not happen.
+   *
+   * `box` is the map the spread flattened, and being here is **not** a promise that every
+   * one of its keys survived — the extractor omits what it cannot evaluate, at any depth. It
+   * is the handle a consumer needs to go and check for itself, which it cannot do from the
+   * flattened result. `node` is the spread's own expression, so the pair can be matched
+   * against the source being inspected.
+   *
+   * Deliberately kept off `value`, and therefore invisible to `unbox` — this describes the
+   * extraction, not the styles, and nothing that generates CSS should see it.
+   */
+  resolvedSpreads?: Array<{
+    node: Node;
+    box: BoxNodeMap;
+  }>;
   constructor(definition: MapType);
   isRecipe: () => boolean;
 }
@@ -111,16 +137,10 @@ interface ExtractedFunctionInstance {
   fromNode: () => CallExpression;
   box: BoxNodeArray;
 }
-interface ExtractedTaggedTemplateInstance {
-  name: string;
-  kind: 'tagged-template';
-  fromNode: () => TaggedTemplateExpression;
-  box: BoxNodeLiteral;
-}
 interface ExtractedFunctionResult {
   kind: 'function';
   nodesByProp: Map<string, BoxNode[]>;
-  queryList: Array<ExtractedFunctionInstance | ExtractedTaggedTemplateInstance>;
+  queryList: ExtractedFunctionInstance[];
 }
 interface ExtractedComponentInstance {
   name: string;
@@ -164,11 +184,6 @@ interface ComponentMatchers {
   matchTag: (element: MatchTagArgs) => boolean;
   matchProp: (prop: Pick<MatchTagArgs, 'tagName' | 'tagNode'> & MatchPropArgs) => boolean;
 }
-interface MatchTaggedTemplateArgs {
-  fnName: string;
-  taggedTemplateNode: TaggedTemplateExpression;
-}
-type MatchTaggedTemplate = (tag: MatchTaggedTemplateArgs) => boolean;
 interface BoxContext {
   getEvaluateOptions?: (node: Expression, stack: Node[]) => Omit<EvaluateOptions, 'node' | 'policy'> | void;
   canEval?: (node: Expression, stack: Node[]) => boolean;
@@ -190,9 +205,6 @@ type ExtractOptions = BoxContext & {
   ast: SourceFile;
   components?: ComponentMatchers;
   functions?: FunctionMatchers;
-  taggedTemplates?: {
-    matchTaggedTemplate: MatchTaggedTemplate;
-  };
 };
 //#endregion
 //#region src/to-box-node.d.ts

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { BindingElement, CallExpression, EnumDeclaration, Expression, FunctionDeclaration, GetAccessorDeclaration, Identifier, JsxAttribute, JsxOpeningElement, JsxSelfClosingElement, JsxSpreadAttribute, Node, ParameterDeclaration, PropertyAssignment, ShorthandPropertyAssignment, SourceFile, TaggedTemplateExpression, VariableDeclaration } from "ts-morph";
+import { BindingElement, CallExpression, EnumDeclaration, Expression, FunctionDeclaration, GetAccessorDeclaration, Identifier, JsxAttribute, JsxOpeningElement, JsxSelfClosingElement, JsxSpreadAttribute, Node, ParameterDeclaration, PropertyAssignment, ShorthandPropertyAssignment, SourceFile, VariableDeclaration } from "ts-morph";
 import { EvaluateOptions as EvaluateOptions$1 } from "ts-evaluator";
 
 //#region src/box-factory.d.ts
@@ -79,6 +79,32 @@ declare class BoxNodeLiteral extends BoxNodeType$1<LiteralType> {
 declare class BoxNodeMap extends BoxNodeType$1<MapType> {
   value: MapType['value'];
   spreadConditions?: BoxNodeConditional[];
+  /**
+   * Spreads the extractor walked structurally, paired with what it walked them into.
+   *
+   * The map records what a spread *contributed*, so a spread that flattened and one that
+   * was silently skipped look identical once folded in — both simply add keys, or fail to.
+   * That ambiguity is why a consumer rewriting source would otherwise have to decline every
+   * spread rather than only the ones it cannot account for.
+   *
+   * The *walked* ones are listed rather than the skipped ones deliberately: a consumer asks
+   * "may I trust this spread", and a list of failures answers that only while it is
+   * exhaustive. A list of successes is safe to be incomplete — the worst an omission costs
+   * is a fold that does not happen.
+   *
+   * `box` is the map the spread flattened, and being here is **not** a promise that every
+   * one of its keys survived — the extractor omits what it cannot evaluate, at any depth. It
+   * is the handle a consumer needs to go and check for itself, which it cannot do from the
+   * flattened result. `node` is the spread's own expression, so the pair can be matched
+   * against the source being inspected.
+   *
+   * Deliberately kept off `value`, and therefore invisible to `unbox` — this describes the
+   * extraction, not the styles, and nothing that generates CSS should see it.
+   */
+  resolvedSpreads?: Array<{
+    node: Node;
+    box: BoxNodeMap;
+  }>;
   constructor(definition: MapType);
   isRecipe: () => boolean;
 }
@@ -111,16 +137,10 @@ interface ExtractedFunctionInstance {
   fromNode: () => CallExpression;
   box: BoxNodeArray;
 }
-interface ExtractedTaggedTemplateInstance {
-  name: string;
-  kind: 'tagged-template';
-  fromNode: () => TaggedTemplateExpression;
-  box: BoxNodeLiteral;
-}
 interface ExtractedFunctionResult {
   kind: 'function';
   nodesByProp: Map<string, BoxNode[]>;
-  queryList: Array<ExtractedFunctionInstance | ExtractedTaggedTemplateInstance>;
+  queryList: ExtractedFunctionInstance[];
 }
 interface ExtractedComponentInstance {
   name: string;
@@ -164,11 +184,6 @@ interface ComponentMatchers {
   matchTag: (element: MatchTagArgs) => boolean;
   matchProp: (prop: Pick<MatchTagArgs, 'tagName' | 'tagNode'> & MatchPropArgs) => boolean;
 }
-interface MatchTaggedTemplateArgs {
-  fnName: string;
-  taggedTemplateNode: TaggedTemplateExpression;
-}
-type MatchTaggedTemplate = (tag: MatchTaggedTemplateArgs) => boolean;
 interface BoxContext {
   getEvaluateOptions?: (node: Expression, stack: Node[]) => Omit<EvaluateOptions, 'node' | 'policy'> | void;
   canEval?: (node: Expression, stack: Node[]) => boolean;
@@ -190,9 +205,6 @@ type ExtractOptions = BoxContext & {
   ast: SourceFile;
   components?: ComponentMatchers;
   functions?: FunctionMatchers;
-  taggedTemplates?: {
-    matchTaggedTemplate: MatchTaggedTemplate;
-  };
 };
 //#endregion
 //#region src/to-box-node.d.ts

package/dist/index.mjs

@@ -115,6 +115,29 @@ const recipeProps = [
 var BoxNodeMap = class extends BoxNodeType {
 	value;
 	spreadConditions;
+	/**
+	* Spreads the extractor walked structurally, paired with what it walked them into.
+	*
+	* The map records what a spread *contributed*, so a spread that flattened and one that
+	* was silently skipped look identical once folded in — both simply add keys, or fail to.
+	* That ambiguity is why a consumer rewriting source would otherwise have to decline every
+	* spread rather than only the ones it cannot account for.
+	*
+	* The *walked* ones are listed rather than the skipped ones deliberately: a consumer asks
+	* "may I trust this spread", and a list of failures answers that only while it is
+	* exhaustive. A list of successes is safe to be incomplete — the worst an omission costs
+	* is a fold that does not happen.
+	*
+	* `box` is the map the spread flattened, and being here is **not** a promise that every
+	* one of its keys survived — the extractor omits what it cannot evaluate, at any depth. It
+	* is the handle a consumer needs to go and check for itself, which it cannot do from the
+	* flattened result. `node` is the spread's own expression, so the pair can be matched
+	* against the source being inspected.
+	*
+	* Deliberately kept off `value`, and therefore invisible to `unbox` — this describes the
+	* extraction, not the styles, and nothing that generates CSS should see it.
+	*/
+	resolvedSpreads;
 	constructor(definition) {
 		super(definition);
 		this.value = definition.value;
@@ -439,6 +462,8 @@ const getObjectLiteralExpressionPropPairs = (expression, expressionStack, ctx, m
 	if (properties.length === 0) return box.emptyObject(expression, expressionStack);
 	const extractedPropValues = [];
 	const spreadConditions = [];
+	/** Spreads the extractor walked structurally — see `BoxNodeMap.resolvedSpreads`. */
+	const resolvedSpreads = [];
 	properties.forEach((property) => {
 		const stack = [...expressionStack];
 		stack.push(property);
@@ -491,6 +516,10 @@ const getObjectLiteralExpressionPropPairs = (expression, expressionStack, ctx, m
 				maybeObject.value.forEach((nested, propName) => {
 					extractedPropValues.push([propName, nested]);
 				});
+				resolvedSpreads.push({
+					node: initializer,
+					box: maybeObject
+				});
 				return;
 			}
 			if (box.isConditional(maybeObject)) spreadConditions.push(maybeObject);
@@ -502,6 +531,7 @@ const getObjectLiteralExpressionPropPairs = (expression, expressionStack, ctx, m
 		orderedMapValue.set(propName, value);
 	});
 	const map = box.map(orderedMapValue, expression, expressionStack);
+	if (resolvedSpreads.length > 0) map.resolvedSpreads = resolvedSpreads;
 	if (spreadConditions.length > 0) map.spreadConditions = spreadConditions;
 	return map;
 };
@@ -630,6 +660,7 @@ function maybeBoxNode(node, stack, ctx, matchProp) {
 		if (isPlusSyntax(operatorKind)) {
 			const value = tryComputingPlusTokenBinaryExpressionToString(node, stack, ctx) ?? safeEvaluateNode(node, stack, ctx);
 			if (!value) return;
+			if (typeof value === "string" && value.includes("undefined")) return;
 			return cache(box.from(value, node, stack));
 		}
 		if (isLogicalSyntax(operatorKind)) return cache(maybeResolveConditionalExpression({
@@ -1491,7 +1522,7 @@ const objectLikeToMap = (maybeObject, node) => {
 const isImportOrExport = (node) => Node.isImportDeclaration(node) || Node.isExportDeclaration(node);
 const isJsxElement = (node) => Node.isJsxOpeningElement(node) || Node.isJsxSelfClosingElement(node);
 const extract = ({ ast, ...ctx }) => {
-	const { components, functions, taggedTemplates } = ctx;
+	const { components, functions } = ctx;
 	const compiledJsx = createCompiledJsxContext(ast);
 	/** contains all the extracted nodes from this ast parsing */
 	const byName = /* @__PURE__ */ new Map();
@@ -1661,6 +1692,7 @@ const extract = ({ ast, ...ctx }) => {
 					});
 					const boxMap = box.map(mapValue, node, boxNode.getStack());
 					if (box.isMap(boxNode) && boxNode.spreadConditions?.length) boxMap.spreadConditions = boxNode.spreadConditions;
+					if (box.isMap(boxNode) && boxNode.resolvedSpreads?.length) boxMap.resolvedSpreads = boxNode.resolvedSpreads;
 					return boxMap;
 				}
 				return boxNode;
@@ -1672,26 +1704,6 @@ const extract = ({ ast, ...ctx }) => {
 			};
 			fnResultMap.queryList.push(query);
 		}
-		if (taggedTemplates && Node.isTaggedTemplateExpression(node)) {
-			const tag = node.getTag();
-			const fnName = Node.isCallExpression(tag) ? tag.getExpression().getText() : tag.getText();
-			if (!taggedTemplates.matchTaggedTemplate({
-				taggedTemplateNode: node,
-				fnName
-			})) return;
-			if (!byName.has(fnName)) byName.set(fnName, {
-				kind: "function",
-				nodesByProp: /* @__PURE__ */ new Map(),
-				queryList: []
-			});
-			const fnResultMap = byName.get(fnName);
-			const query = {
-				kind: "tagged-template",
-				name: fnName,
-				box: maybeBoxNode(node, [], ctx)
-			};
-			fnResultMap.queryList.push(query);
-		}
 	});
 	componentByNode.forEach((parentRef, componentNode) => {
 		const component = componentByNode.get(componentNode);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bamboocss/extractor",
-  "version": "1.14.0",
+  "version": "1.16.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.14.0"
+    "@bamboocss/shared": "1.16.0"
   },
   "scripts": {
     "build": "tsdown src/index.ts --format=cjs,esm --shims --dts",