@bamboocss/parser 1.22.0 → 1.24.0

package/dist/index.cjs

@@ -65,6 +65,7 @@ function classifyProject(ctx, resultMap) {
 		const { item, kind, filepath, localMaps } = opts;
 		if (!item.box || _bamboocss_extractor.box.isUnresolvable(item.box)) return;
 		if (!item.data) return;
+		if (item.type === "cva-call") return;
 		const componentReportItem = {
 			componentIndex: String(componentIndex++),
 			componentName: item.name,
@@ -674,6 +675,7 @@ var ParserResult = class {
 	all = [];
 	css = /* @__PURE__ */ new Set();
 	cva = /* @__PURE__ */ new Set();
+	cvaCall = /* @__PURE__ */ new Set();
 	sva = /* @__PURE__ */ new Set();
 	token = /* @__PURE__ */ new Set();
 	viewTransition = /* @__PURE__ */ new Set();
@@ -727,6 +729,20 @@ var ParserResult = class {
 		const encoder = this.encoder;
 		result.data.forEach((data) => encoder.processAtomicRecipe(data));
 	}
+	/**
+	* A call of a locally-bound inline recipe -- `const badge = cva(...)`, then `badge({...})`.
+	*
+	* Recorded, not encoded. The rules already exist: `setCva` emitted them from the config,
+	* and a recipe's classes are named semantically from that config rather than from this
+	* call. What this adds is *visibility* -- the call site becomes something the fold can see
+	* and report on, where before it was indistinguishable from code nobody had parsed.
+	*/
+	setCvaCall(name, result) {
+		this.cvaCall.add(this.append(Object.assign({
+			type: "cva-call",
+			name
+		}, result)));
+	}
 	setSva(result) {
 		this.sva.add(this.append(Object.assign({ type: "sva" }, result)));
 		this.reportUnresolvedRecipe(result);
@@ -794,6 +810,7 @@ var ParserResult = class {
 		result.css.forEach((item) => this.css.add(this.append(item)));
 		result.cva.forEach((item) => this.cva.add(this.append(item)));
 		result.sva.forEach((item) => this.sva.add(this.append(item)));
+		result.cvaCall.forEach((item) => this.cvaCall.add(this.append(item)));
 		result.token.forEach((item) => this.token.add(this.append(item)));
 		result.viewTransition.forEach((item) => this.viewTransition.add(this.append(item)));
 		result.recipe.forEach((items, name) => {
@@ -815,6 +832,7 @@ var ParserResult = class {
 			css: Array.from(this.css),
 			cva: Array.from(this.cva),
 			sva: Array.from(this.sva),
+			cvaCall: Array.from(this.cvaCall),
 			token: Array.from(this.token),
 			viewTransition: Array.from(this.viewTransition),
 			recipe: Object.fromEntries(Array.from(this.recipe.entries()).map(([key, value]) => [key, Array.from(value)])),
@@ -850,6 +868,20 @@ function createParser(context) {
 		_bamboocss_logger.logger.debug("ast:import", !file.isEmpty() ? `Found import { ${file.toString()} } in ${filePath}` : `No import found in ${filePath}`);
 		const parserResult = new ParserResult(context, encoder);
 		if (file.isEmpty() && !jsx.isEnabled) return parserResult;
+		if (file.importsRecipeFactory()) for (const statement of sourceFile.compilerNode.statements) {
+			if (!ts_morph.ts.isVariableStatement(statement)) continue;
+			if (!(statement.declarationList.flags & ts_morph.ts.NodeFlags.Const)) continue;
+			for (const declaration of statement.declarationList.declarations) {
+				const initializer = declaration.initializer;
+				if (!initializer || !ts_morph.ts.isCallExpression(initializer)) continue;
+				const callee = initializer.expression;
+				if (!ts_morph.ts.isIdentifier(callee) || !ts_morph.ts.isIdentifier(declaration.name)) continue;
+				const imported = file.getName(callee.text);
+				if (imported !== "cva" && imported !== "sva") continue;
+				if (!file.matchFn(callee.text)) continue;
+				file.addLocalRecipe(declaration.name.text);
+			}
+		}
 		(0, _bamboocss_extractor.extract)({
 			ast: sourceFile,
 			tokens: context.tokens ? {
@@ -899,53 +931,64 @@ function createParser(context) {
 				kind: result.kind,
 				alias
 			} : { kind: result.kind });
-			if (result.kind === "function") (0, ts_pattern.match)(name).when(imports.matchers.css.match, (name) => {
-				result.queryList.forEach((query) => {
-					if (query.kind === "call-expression") if (query.box.value.length > 1) parserResult.set(name, {
-						name,
-						box: query.box,
-						data: query.box.value.reduce((acc, value) => [...acc, ...combineResult((0, _bamboocss_extractor.unbox)(value))], [])
+			if (result.kind === "function") {
+				if (file.isLocalRecipe(alias) && !file.match(alias)) {
+					result.queryList.forEach((query) => {
+						if (query.kind === "call-expression") parserResult.setCvaCall(alias, {
+							name: alias,
+							box: query.box.value[0] ?? _bamboocss_extractor.box.fallback(query.box),
+							data: combineResult((0, _bamboocss_extractor.unbox)(query.box.value[0]))
+						});
 					});
-					else parserResult.set(name, {
-						name,
-						box: query.box.value[0] ?? _bamboocss_extractor.box.fallback(query.box),
-						data: combineResult((0, _bamboocss_extractor.unbox)(query.box.value[0]))
+					return;
+				}
+				(0, ts_pattern.match)(name).when(imports.matchers.css.match, (name) => {
+					result.queryList.forEach((query) => {
+						if (query.kind === "call-expression") if (query.box.value.length > 1) parserResult.set(name, {
+							name,
+							box: query.box,
+							data: query.box.value.reduce((acc, value) => [...acc, ...combineResult((0, _bamboocss_extractor.unbox)(value))], [])
+						});
+						else parserResult.set(name, {
+							name,
+							box: query.box.value[0] ?? _bamboocss_extractor.box.fallback(query.box),
+							data: combineResult((0, _bamboocss_extractor.unbox)(query.box.value[0]))
+						});
 					});
-				});
-			}).when(imports.matchers.tokens.match, (name) => {
-				result.queryList.forEach((query) => {
-					if (query.kind === "call-expression") parserResult.setToken({
-						name,
-						box: query.box.value[0] ?? _bamboocss_extractor.box.fallback(query.box),
-						data: combineResult((0, _bamboocss_extractor.unbox)(query.box.value[0]))
+				}).when(imports.matchers.tokens.match, (name) => {
+					result.queryList.forEach((query) => {
+						if (query.kind === "call-expression") parserResult.setToken({
+							name,
+							box: query.box.value[0] ?? _bamboocss_extractor.box.fallback(query.box),
+							data: combineResult((0, _bamboocss_extractor.unbox)(query.box.value[0]))
+						});
 					});
-				});
-			}).when(file.isValidPattern, (name) => {
-				result.queryList.forEach((query) => {
-					if (query.kind === "call-expression") parserResult.setPattern(name, {
-						name,
-						box: query.box.value[0] ?? _bamboocss_extractor.box.fallback(query.box),
-						data: combineResult((0, _bamboocss_extractor.unbox)(query.box.value[0]))
+				}).when(file.isValidPattern, (name) => {
+					result.queryList.forEach((query) => {
+						if (query.kind === "call-expression") parserResult.setPattern(name, {
+							name,
+							box: query.box.value[0] ?? _bamboocss_extractor.box.fallback(query.box),
+							data: combineResult((0, _bamboocss_extractor.unbox)(query.box.value[0]))
+						});
 					});
-				});
-			}).when(file.isValidRecipe, (name) => {
-				result.queryList.forEach((query) => {
-					if (query.kind === "call-expression") parserResult.setRecipe(name, {
-						name,
-						box: query.box.value[0] ?? _bamboocss_extractor.box.fallback(query.box),
-						data: combineResult((0, _bamboocss_extractor.unbox)(query.box.value[0]))
+				}).when(file.isValidRecipe, (name) => {
+					result.queryList.forEach((query) => {
+						if (query.kind === "call-expression") parserResult.setRecipe(name, {
+							name,
+							box: query.box.value[0] ?? _bamboocss_extractor.box.fallback(query.box),
+							data: combineResult((0, _bamboocss_extractor.unbox)(query.box.value[0]))
+						});
 					});
-				});
-			}).when(file.isViewTransitionFn, (name) => {
-				result.queryList.forEach((query) => {
-					if (query.kind === "call-expression") parserResult.setViewTransition({
-						name,
-						box: query.box.value[0] ?? _bamboocss_extractor.box.fallback(query.box),
-						data: combineResult((0, _bamboocss_extractor.unbox)(query.box.value[0]))
+				}).when(file.isViewTransitionFn, (name) => {
+					result.queryList.forEach((query) => {
+						if (query.kind === "call-expression") parserResult.setViewTransition({
+							name,
+							box: query.box.value[0] ?? _bamboocss_extractor.box.fallback(query.box),
+							data: combineResult((0, _bamboocss_extractor.unbox)(query.box.value[0]))
+						});
 					});
-				});
-			}).otherwise(() => {});
-			else if (jsx.isEnabled && result.kind === "component") result.queryList.forEach((query) => {
+				}).otherwise(() => {});
+			} else if (jsx.isEnabled && result.kind === "component") result.queryList.forEach((query) => {
 				const data = combineResult((0, _bamboocss_extractor.unbox)(query.box));
 				for (const tag of [name, alias]) {
 					if (!jsx.isJsxTagRecipe(tag)) continue;

package/dist/index.d.cts

@@ -173,6 +173,7 @@ declare class ParserResult implements ParserResultInterface {
   all: ResultItem[];
   css: Set<ResultItem>;
   cva: Set<ResultItem>;
+  cvaCall: Set<ResultItem>;
   sva: Set<ResultItem>;
   token: Set<ResultItem>;
   viewTransition: Set<ResultItem>;
@@ -192,6 +193,15 @@ declare class ParserResult implements ParserResultInterface {
   set(name: 'cva' | 'css' | 'sva' | 'token', result: ResultItem): void;
   setCss(result: ResultItem): void;
   setCva(result: ResultItem): void;
+  /**
+   * A call of a locally-bound inline recipe -- `const badge = cva(...)`, then `badge({...})`.
+   *
+   * Recorded, not encoded. The rules already exist: `setCva` emitted them from the config,
+   * and a recipe's classes are named semantically from that config rather than from this
+   * call. What this adds is *visibility* -- the call site becomes something the fold can see
+   * and report on, where before it was indistinguishable from code nobody had parsed.
+   */
+  setCvaCall(name: string, result: ResultItem): void;
   setSva(result: ResultItem): void;
   /**
    * Record a recipe config the build could not fully read.
@@ -218,6 +228,7 @@ declare class ParserResult implements ParserResultInterface {
     css: ResultItem[];
     cva: ResultItem[];
     sva: ResultItem[];
+    cvaCall: ResultItem[];
     token: ResultItem[];
     viewTransition: ResultItem[];
     recipe: {

package/dist/index.d.mts

@@ -173,6 +173,7 @@ declare class ParserResult implements ParserResultInterface {
   all: ResultItem[];
   css: Set<ResultItem>;
   cva: Set<ResultItem>;
+  cvaCall: Set<ResultItem>;
   sva: Set<ResultItem>;
   token: Set<ResultItem>;
   viewTransition: Set<ResultItem>;
@@ -192,6 +193,15 @@ declare class ParserResult implements ParserResultInterface {
   set(name: 'cva' | 'css' | 'sva' | 'token', result: ResultItem): void;
   setCss(result: ResultItem): void;
   setCva(result: ResultItem): void;
+  /**
+   * A call of a locally-bound inline recipe -- `const badge = cva(...)`, then `badge({...})`.
+   *
+   * Recorded, not encoded. The rules already exist: `setCva` emitted them from the config,
+   * and a recipe's classes are named semantically from that config rather than from this
+   * call. What this adds is *visibility* -- the call site becomes something the fold can see
+   * and report on, where before it was indistinguishable from code nobody had parsed.
+   */
+  setCvaCall(name: string, result: ResultItem): void;
   setSva(result: ResultItem): void;
   /**
    * Record a recipe config the build could not fully read.
@@ -218,6 +228,7 @@ declare class ParserResult implements ParserResultInterface {
     css: ResultItem[];
     cva: ResultItem[];
     sva: ResultItem[];
+    cvaCall: ResultItem[];
     token: ResultItem[];
     viewTransition: ResultItem[];
     recipe: {

package/dist/index.mjs

@@ -64,6 +64,7 @@ function classifyProject(ctx, resultMap) {
 		const { item, kind, filepath, localMaps } = opts;
 		if (!item.box || box.isUnresolvable(item.box)) return;
 		if (!item.data) return;
+		if (item.type === "cva-call") return;
 		const componentReportItem = {
 			componentIndex: String(componentIndex++),
 			componentName: item.name,
@@ -673,6 +674,7 @@ var ParserResult = class {
 	all = [];
 	css = /* @__PURE__ */ new Set();
 	cva = /* @__PURE__ */ new Set();
+	cvaCall = /* @__PURE__ */ new Set();
 	sva = /* @__PURE__ */ new Set();
 	token = /* @__PURE__ */ new Set();
 	viewTransition = /* @__PURE__ */ new Set();
@@ -726,6 +728,20 @@ var ParserResult = class {
 		const encoder = this.encoder;
 		result.data.forEach((data) => encoder.processAtomicRecipe(data));
 	}
+	/**
+	* A call of a locally-bound inline recipe -- `const badge = cva(...)`, then `badge({...})`.
+	*
+	* Recorded, not encoded. The rules already exist: `setCva` emitted them from the config,
+	* and a recipe's classes are named semantically from that config rather than from this
+	* call. What this adds is *visibility* -- the call site becomes something the fold can see
+	* and report on, where before it was indistinguishable from code nobody had parsed.
+	*/
+	setCvaCall(name, result) {
+		this.cvaCall.add(this.append(Object.assign({
+			type: "cva-call",
+			name
+		}, result)));
+	}
 	setSva(result) {
 		this.sva.add(this.append(Object.assign({ type: "sva" }, result)));
 		this.reportUnresolvedRecipe(result);
@@ -793,6 +809,7 @@ var ParserResult = class {
 		result.css.forEach((item) => this.css.add(this.append(item)));
 		result.cva.forEach((item) => this.cva.add(this.append(item)));
 		result.sva.forEach((item) => this.sva.add(this.append(item)));
+		result.cvaCall.forEach((item) => this.cvaCall.add(this.append(item)));
 		result.token.forEach((item) => this.token.add(this.append(item)));
 		result.viewTransition.forEach((item) => this.viewTransition.add(this.append(item)));
 		result.recipe.forEach((items, name) => {
@@ -814,6 +831,7 @@ var ParserResult = class {
 			css: Array.from(this.css),
 			cva: Array.from(this.cva),
 			sva: Array.from(this.sva),
+			cvaCall: Array.from(this.cvaCall),
 			token: Array.from(this.token),
 			viewTransition: Array.from(this.viewTransition),
 			recipe: Object.fromEntries(Array.from(this.recipe.entries()).map(([key, value]) => [key, Array.from(value)])),
@@ -849,6 +867,20 @@ function createParser(context) {
 		logger.debug("ast:import", !file.isEmpty() ? `Found import { ${file.toString()} } in ${filePath}` : `No import found in ${filePath}`);
 		const parserResult = new ParserResult(context, encoder);
 		if (file.isEmpty() && !jsx.isEnabled) return parserResult;
+		if (file.importsRecipeFactory()) for (const statement of sourceFile.compilerNode.statements) {
+			if (!ts.isVariableStatement(statement)) continue;
+			if (!(statement.declarationList.flags & ts.NodeFlags.Const)) continue;
+			for (const declaration of statement.declarationList.declarations) {
+				const initializer = declaration.initializer;
+				if (!initializer || !ts.isCallExpression(initializer)) continue;
+				const callee = initializer.expression;
+				if (!ts.isIdentifier(callee) || !ts.isIdentifier(declaration.name)) continue;
+				const imported = file.getName(callee.text);
+				if (imported !== "cva" && imported !== "sva") continue;
+				if (!file.matchFn(callee.text)) continue;
+				file.addLocalRecipe(declaration.name.text);
+			}
+		}
 		extract({
 			ast: sourceFile,
 			tokens: context.tokens ? {
@@ -898,53 +930,64 @@ function createParser(context) {
 				kind: result.kind,
 				alias
 			} : { kind: result.kind });
-			if (result.kind === "function") match(name).when(imports.matchers.css.match, (name) => {
-				result.queryList.forEach((query) => {
-					if (query.kind === "call-expression") if (query.box.value.length > 1) parserResult.set(name, {
-						name,
-						box: query.box,
-						data: query.box.value.reduce((acc, value) => [...acc, ...combineResult(unbox(value))], [])
+			if (result.kind === "function") {
+				if (file.isLocalRecipe(alias) && !file.match(alias)) {
+					result.queryList.forEach((query) => {
+						if (query.kind === "call-expression") parserResult.setCvaCall(alias, {
+							name: alias,
+							box: query.box.value[0] ?? box.fallback(query.box),
+							data: combineResult(unbox(query.box.value[0]))
+						});
 					});
-					else parserResult.set(name, {
-						name,
-						box: query.box.value[0] ?? box.fallback(query.box),
-						data: combineResult(unbox(query.box.value[0]))
+					return;
+				}
+				match(name).when(imports.matchers.css.match, (name) => {
+					result.queryList.forEach((query) => {
+						if (query.kind === "call-expression") if (query.box.value.length > 1) parserResult.set(name, {
+							name,
+							box: query.box,
+							data: query.box.value.reduce((acc, value) => [...acc, ...combineResult(unbox(value))], [])
+						});
+						else parserResult.set(name, {
+							name,
+							box: query.box.value[0] ?? box.fallback(query.box),
+							data: combineResult(unbox(query.box.value[0]))
+						});
 					});
-				});
-			}).when(imports.matchers.tokens.match, (name) => {
-				result.queryList.forEach((query) => {
-					if (query.kind === "call-expression") parserResult.setToken({
-						name,
-						box: query.box.value[0] ?? box.fallback(query.box),
-						data: combineResult(unbox(query.box.value[0]))
+				}).when(imports.matchers.tokens.match, (name) => {
+					result.queryList.forEach((query) => {
+						if (query.kind === "call-expression") parserResult.setToken({
+							name,
+							box: query.box.value[0] ?? box.fallback(query.box),
+							data: combineResult(unbox(query.box.value[0]))
+						});
 					});
-				});
-			}).when(file.isValidPattern, (name) => {
-				result.queryList.forEach((query) => {
-					if (query.kind === "call-expression") parserResult.setPattern(name, {
-						name,
-						box: query.box.value[0] ?? box.fallback(query.box),
-						data: combineResult(unbox(query.box.value[0]))
+				}).when(file.isValidPattern, (name) => {
+					result.queryList.forEach((query) => {
+						if (query.kind === "call-expression") parserResult.setPattern(name, {
+							name,
+							box: query.box.value[0] ?? box.fallback(query.box),
+							data: combineResult(unbox(query.box.value[0]))
+						});
 					});
-				});
-			}).when(file.isValidRecipe, (name) => {
-				result.queryList.forEach((query) => {
-					if (query.kind === "call-expression") parserResult.setRecipe(name, {
-						name,
-						box: query.box.value[0] ?? box.fallback(query.box),
-						data: combineResult(unbox(query.box.value[0]))
+				}).when(file.isValidRecipe, (name) => {
+					result.queryList.forEach((query) => {
+						if (query.kind === "call-expression") parserResult.setRecipe(name, {
+							name,
+							box: query.box.value[0] ?? box.fallback(query.box),
+							data: combineResult(unbox(query.box.value[0]))
+						});
 					});
-				});
-			}).when(file.isViewTransitionFn, (name) => {
-				result.queryList.forEach((query) => {
-					if (query.kind === "call-expression") parserResult.setViewTransition({
-						name,
-						box: query.box.value[0] ?? box.fallback(query.box),
-						data: combineResult(unbox(query.box.value[0]))
+				}).when(file.isViewTransitionFn, (name) => {
+					result.queryList.forEach((query) => {
+						if (query.kind === "call-expression") parserResult.setViewTransition({
+							name,
+							box: query.box.value[0] ?? box.fallback(query.box),
+							data: combineResult(unbox(query.box.value[0]))
+						});
 					});
-				});
-			}).otherwise(() => {});
-			else if (jsx.isEnabled && result.kind === "component") result.queryList.forEach((query) => {
+				}).otherwise(() => {});
+			} else if (jsx.isEnabled && result.kind === "component") result.queryList.forEach((query) => {
 				const data = combineResult(unbox(query.box));
 				for (const tag of [name, alias]) {
 					if (!jsx.isJsxTagRecipe(tag)) continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bamboocss/parser",
-  "version": "1.22.0",
+  "version": "1.24.0",
   "description": "The static parser for bamboo css",
   "homepage": "https://bamboocss.com",
   "license": "MIT",
@@ -34,17 +34,17 @@
   "dependencies": {
     "ts-morph": "28.0.0",
     "ts-pattern": "5.9.0",
-    "@bamboocss/config": "^1.22.0",
-    "@bamboocss/core": "^1.22.0",
-    "@bamboocss/extractor": "1.22.0",
-    "@bamboocss/logger": "1.22.0",
-    "@bamboocss/shared": "1.22.0",
-    "@bamboocss/types": "1.22.0"
+    "@bamboocss/config": "^1.24.0",
+    "@bamboocss/core": "^1.24.0",
+    "@bamboocss/extractor": "1.24.0",
+    "@bamboocss/logger": "1.24.0",
+    "@bamboocss/shared": "1.24.0",
+    "@bamboocss/types": "1.24.0"
   },
   "devDependencies": {
-    "@bamboocss/generator": "1.22.0",
-    "@bamboocss/plugin-svelte": "1.22.0",
-    "@bamboocss/plugin-vue": "1.22.0"
+    "@bamboocss/generator": "1.24.0",
+    "@bamboocss/plugin-svelte": "1.24.0",
+    "@bamboocss/plugin-vue": "1.24.0"
   },
   "scripts": {
     "build": "tsdown src/index.ts --format=esm,cjs --dts",