@bamboocss/eslint-plugin 1.30.1 → 1.31.0

package/dist/index.cjs

@@ -8,7 +8,7 @@ require("@typescript-eslint/utils/ts-eslint");
 let _bamboocss_shared = require("@bamboocss/shared");
 //#region package.json
 var name = "@bamboocss/eslint-plugin";
-var version = "1.30.1";
+var version = "1.31.0";
 //#endregion
 //#region src/utils/index.ts
 const createRule = _typescript_eslint_utils.ESLintUtils.RuleCreator((name) => `https://github.com/gajus/bamboocss/blob/main/packages/eslint-plugin/docs/rules/${name}.md`);
@@ -237,16 +237,11 @@ const isColorToken = (value, context) => {
 	return syncAction("isColorToken", getSyncOptions(context), value);
 };
 const extractTokens = (value) => {
-	const regex = /token\(([^"'(),]+)(?:,\s*([^"'(),]+))?\)|\{([^\n\r{}]+)\}/g;
+	const regex = /token\(([^"'(),]+)\)/g;
 	const matches = [];
 	let match;
-	while ((match = regex.exec(value)) !== null) {
-		const tokenFromFirstSyntax = match[1] || match[2] || match[3];
-		const tokensFromSecondSyntax = match[4] && match[4].match(/(\w+\.\w+(\.\w+)?)/g);
-		if (tokenFromFirstSyntax) matches.push(tokenFromFirstSyntax);
-		if (tokensFromSecondSyntax) matches.push(...tokensFromSecondSyntax);
-	}
-	return matches.filter(Boolean);
+	while ((match = regex.exec(value)) !== null) if (match[1]) matches.push(match[1]);
+	return matches;
 };
 const invalidTokensCache = /* @__PURE__ */ new Map();
 const getInvalidTokens = (value, context) => {
@@ -1512,7 +1507,7 @@ const rule$7 = createRule({
 		*
 		* A bare `token(…)` counts even with no import to bind it, because the build counts it: its
 		* accounting keys on the name, so a local helper of that name declines there too. Staying
-		* quiet about it would mean `strict` failing a build the editor called clean.
+		* quiet about it would mean `prune.tokens: 'accounted'` failing a build the editor called clean.
 		*/
 		const isTokenCall = (node) => {
 			const callee = node.type === "CallExpression" ? node.callee : node.tag;
@@ -1561,11 +1556,11 @@ const rule$7 = createRule({
 	},
 	defaultOptions: [],
 	meta: {
-		docs: { description: "Require a token path the build can resolve, so `pruneUnusedTokens` can drop the declarations nothing asks for." },
+		docs: { description: "Require a token path the build can resolve, so `prune.tokens` can drop the declarations nothing asks for." },
 		messages: {
 			/**
 			* The build keeps every token declaration for this, because the path could name any of
-			* them. Under `pruneUnusedTokens: 'strict'` it is an error rather than a size cost.
+			* them. Under `prune: { unresolved: 'error' }` it is an error rather than a size cost.
 			*/
 			opaqueTokenPath: "Token path cannot be resolved at build time, so every token declaration is kept. Spell the path at the call, or give a template a static prefix.",
 			/**
@@ -1664,7 +1659,7 @@ const rule$5 = createRule({
 		const tokenWrap = (value) => value ? `token(${value})` : "";
 		const isCompositeValue = (input) => {
 			if (!input) return false;
-			return !/^(?:token\([^)]*\)|\{[^}]*\})$/.test(input);
+			return !/^token\([^)]*\)$/.test(input);
 		};
 		const sendReport = (node, value) => {
 			const tkImports = extractTokens(value);

package/dist/index.mjs

@@ -8,7 +8,7 @@ import "@typescript-eslint/utils/ts-eslint";
 import { getArbitraryValue, parseFallbackValue } from "@bamboocss/shared";
 //#region package.json
 var name = "@bamboocss/eslint-plugin";
-var version = "1.30.1";
+var version = "1.31.0";
 //#endregion
 //#region src/utils/index.ts
 const createRule = ESLintUtils.RuleCreator((name) => `https://github.com/gajus/bamboocss/blob/main/packages/eslint-plugin/docs/rules/${name}.md`);
@@ -237,16 +237,11 @@ const isColorToken = (value, context) => {
 	return syncAction("isColorToken", getSyncOptions(context), value);
 };
 const extractTokens = (value) => {
-	const regex = /token\(([^"'(),]+)(?:,\s*([^"'(),]+))?\)|\{([^\n\r{}]+)\}/g;
+	const regex = /token\(([^"'(),]+)\)/g;
 	const matches = [];
 	let match;
-	while ((match = regex.exec(value)) !== null) {
-		const tokenFromFirstSyntax = match[1] || match[2] || match[3];
-		const tokensFromSecondSyntax = match[4] && match[4].match(/(\w+\.\w+(\.\w+)?)/g);
-		if (tokenFromFirstSyntax) matches.push(tokenFromFirstSyntax);
-		if (tokensFromSecondSyntax) matches.push(...tokensFromSecondSyntax);
-	}
-	return matches.filter(Boolean);
+	while ((match = regex.exec(value)) !== null) if (match[1]) matches.push(match[1]);
+	return matches;
 };
 const invalidTokensCache = /* @__PURE__ */ new Map();
 const getInvalidTokens = (value, context) => {
@@ -1512,7 +1507,7 @@ const rule$7 = createRule({
 		*
 		* A bare `token(…)` counts even with no import to bind it, because the build counts it: its
 		* accounting keys on the name, so a local helper of that name declines there too. Staying
-		* quiet about it would mean `strict` failing a build the editor called clean.
+		* quiet about it would mean `prune.tokens: 'accounted'` failing a build the editor called clean.
 		*/
 		const isTokenCall = (node) => {
 			const callee = node.type === "CallExpression" ? node.callee : node.tag;
@@ -1561,11 +1556,11 @@ const rule$7 = createRule({
 	},
 	defaultOptions: [],
 	meta: {
-		docs: { description: "Require a token path the build can resolve, so `pruneUnusedTokens` can drop the declarations nothing asks for." },
+		docs: { description: "Require a token path the build can resolve, so `prune.tokens` can drop the declarations nothing asks for." },
 		messages: {
 			/**
 			* The build keeps every token declaration for this, because the path could name any of
-			* them. Under `pruneUnusedTokens: 'strict'` it is an error rather than a size cost.
+			* them. Under `prune: { unresolved: 'error' }` it is an error rather than a size cost.
 			*/
 			opaqueTokenPath: "Token path cannot be resolved at build time, so every token declaration is kept. Spell the path at the call, or give a template a static prefix.",
 			/**
@@ -1664,7 +1659,7 @@ const rule$5 = createRule({
 		const tokenWrap = (value) => value ? `token(${value})` : "";
 		const isCompositeValue = (input) => {
 			if (!input) return false;
-			return !/^(?:token\([^)]*\)|\{[^}]*\})$/.test(input);
+			return !/^token\([^)]*\)$/.test(input);
 		};
 		const sendReport = (node, value) => {
 			const tkImports = extractTokens(value);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bamboocss/eslint-plugin",
-  "version": "1.30.1",
+  "version": "1.31.0",
   "description": "ESLint plugin for Bamboo CSS",
   "homepage": "https://bamboocss.com",
   "license": "MIT",
@@ -36,9 +36,9 @@
     "@typescript-eslint/utils": "^8.21.0",
     "micromatch": "^4.0.8",
     "synckit": "^0.9.0",
-    "@bamboocss/config": "1.30.1",
-    "@bamboocss/generator": "1.30.1",
-    "@bamboocss/shared": "1.30.1"
+    "@bamboocss/config": "1.31.0",
+    "@bamboocss/generator": "1.31.0",
+    "@bamboocss/shared": "1.31.0"
   },
   "devDependencies": {
     "@types/micromatch": "^4.0.10",
@@ -46,10 +46,10 @@
     "eslint": "^9.35.0",
     "multiline-ts": "^4.0.1",
     "typescript": "^5.7.2",
-    "@bamboocss/dev": "1.30.1",
-    "@bamboocss/preset-bamboo": "1.30.1",
-    "@bamboocss/preset-base": "1.30.1",
-    "@bamboocss/types": "1.30.1"
+    "@bamboocss/dev": "1.31.0",
+    "@bamboocss/preset-bamboo": "1.31.0",
+    "@bamboocss/preset-base": "1.31.0",
+    "@bamboocss/types": "1.31.0"
   },
   "peerDependencies": {
     "eslint": "*"