boss-css 0.0.19 → 0.0.20

package/dist/eslint-plugin/rules/format-classnames.cjs

@@ -1,11 +1,10 @@
-const require_rolldown_runtime = require('../../_virtual/rolldown_runtime.cjs');
+const require_merge_index = require('../../merge/index.cjs');
 const require_ast = require('../utils/ast.cjs');
 const require_defaults = require('../utils/defaults.cjs');
 const require_format = require('../utils/format.cjs');
 const require_boss_classes = require('../utils/boss-classes.cjs');
 const require_order = require('../utils/order.cjs');
 const require_context = require('../utils/context.cjs');
-let boss_css_merge = require("boss-css/merge");
 
 //#region src/eslint-plugin/rules/format-classnames.js
 const RULE_NAME = "format-classnames";
@@ -37,7 +36,7 @@ const create = (context) => {
 		...context.options[0] || {}
 	};
 	const patterns = createPatterns(options);
-	const merge = (0, boss_css_merge.createBossMerge)(options.merge || {});
+	const merge = require_merge_index.createBossMerge(options.merge || {});
 	if (!sourceCode) return {};
 	const reportLiteral = (literal) => {
 		if (!literal || !literal.canFix) return;

package/dist/eslint-plugin/rules/format-classnames.mjs

@@ -1,10 +1,10 @@
+import { createBossMerge } from "../../merge/index.mjs";
 import { collectClassLiteralsFromExpression, compilePatterns, getCalleeName, getJSXAttributeName, getLiteralInfo, matchesPattern } from "../utils/ast.mjs";
 import { DEFAULT_ATTRIBUTE_PATTERNS, DEFAULT_CALLEE_PATTERNS, DEFAULT_TAG_PATTERNS, DEFAULT_VARIABLE_PATTERNS } from "../utils/defaults.mjs";
 import { buildLiteralReplacement } from "../utils/format.mjs";
 import { splitClassList } from "../utils/boss-classes.mjs";
 import { sortTokens } from "../utils/order.mjs";
 import { getSourceCode } from "../utils/context.mjs";
-import { createBossMerge } from "boss-css/merge";
 
 //#region src/eslint-plugin/rules/format-classnames.js
 const RULE_NAME = "format-classnames";

package/dist/eslint-plugin/rules/redundant-cx.cjs

@@ -5,8 +5,10 @@ const require_defaults = require('../utils/defaults.cjs');
 const RULE_NAME = "redundant-cx";
 const defaultOptions = {
 	components: require_defaults.DEFAULT_COMPONENTS,
-	callees: ["^cx$", "^\\$\\$\\.cx$"]
+	callees: null
 };
+const escapeRegExp = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+const getDefaultCalleePatterns = (components) => components.map((component) => `^${escapeRegExp(component)}\\.cx$`);
 const getCallExpression = (node) => {
 	if (!node) return null;
 	if (node.type === "ChainExpression") return getCallExpression(node.expression);
@@ -20,7 +22,7 @@ const create = (context) => {
 		...context.options[0] || {}
 	};
 	const componentSet = new Set(options.components);
-	const calleePatterns = require_ast.compilePatterns(options.callees);
+	const calleePatterns = require_ast.compilePatterns(Array.isArray(options.callees) ? options.callees : getDefaultCalleePatterns(options.components));
 	return { JSXOpeningElement(node) {
 		const rootName = require_ast.getJSXRootName(node.name);
 		if (!rootName || !componentSet.has(rootName)) return;

package/dist/eslint-plugin/rules/redundant-cx.mjs

@@ -5,8 +5,10 @@ import { DEFAULT_COMPONENTS } from "../utils/defaults.mjs";
 const RULE_NAME = "redundant-cx";
 const defaultOptions = {
 	components: DEFAULT_COMPONENTS,
-	callees: ["^cx$", "^\\$\\$\\.cx$"]
+	callees: null
 };
+const escapeRegExp = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+const getDefaultCalleePatterns = (components) => components.map((component) => `^${escapeRegExp(component)}\\.cx$`);
 const getCallExpression = (node) => {
 	if (!node) return null;
 	if (node.type === "ChainExpression") return getCallExpression(node.expression);
@@ -20,7 +22,7 @@ const create = (context) => {
 		...context.options[0] || {}
 	};
 	const componentSet = new Set(options.components);
-	const calleePatterns = compilePatterns(options.callees);
+	const calleePatterns = compilePatterns(Array.isArray(options.callees) ? options.callees : getDefaultCalleePatterns(options.components));
 	return { JSXOpeningElement(node) {
 		const rootName = getJSXRootName(node.name);
 		if (!rootName || !componentSet.has(rootName)) return;

package/dist/merge/index.cjs

@@ -1,7 +1,7 @@
 const require_rolldown_runtime = require('../_virtual/rolldown_runtime.cjs');
+let ts_deepmerge = require("ts-deepmerge");
 let _boss_css_is_css_prop = require("@boss-css/is-css-prop");
 _boss_css_is_css_prop = require_rolldown_runtime.__toESM(_boss_css_is_css_prop);
-let ts_deepmerge = require("ts-deepmerge");
 
 //#region src/merge/index.ts
 const cssPropCache = /* @__PURE__ */ new Map();

package/dist/merge/index.mjs

@@ -1,5 +1,5 @@
-import isCSSProp from "@boss-css/is-css-prop";
 import { merge as merge$1 } from "ts-deepmerge";
+import isCSSProp from "@boss-css/is-css-prop";
 
 //#region src/merge/index.ts
 const cssPropCache = /* @__PURE__ */ new Map();

package/dist/parser/classname/server.cjs

@@ -25,28 +25,62 @@ const onParse = async (api, input) => {
 		});
 	}
 };
-const templateRegexp = /`([\S\s]+?)`/g;
-const quoteRegexps = [
-	/"(.+?)"/g,
-	/'(.+?)'/g,
-	templateRegexp
-];
 const extractCode = (content) => {
 	const results = [];
-	for (const regexp of quoteRegexps) {
-		const matches = content.matchAll(regexp);
-		const isTemplate = regexp === templateRegexp;
-		for (const match of matches) {
-			const [, code] = match;
-			if (isTemplate && code.includes("${")) {
+	[
+		"\"",
+		"'",
+		"`"
+	].forEach((quote) => {
+		scanQuotedSegments(content, quote, ({ value, hasTemplateExpression }) => {
+			if (quote === "`" && hasTemplateExpression) {
 				console.warn("[boss-css] classname parser skipped template literals with expressions. Classnames must be static.");
-				console.warn(code);
+				console.warn(value);
+				return;
+			}
+			results.push(value);
+		});
+	});
+	return { codes: results };
+};
+const scanQuotedSegments = (input, quote, onSegment) => {
+	let index = 0;
+	const length = input.length;
+	while (index < length) {
+		if (input[index] !== quote) {
+			index += 1;
+			continue;
+		}
+		index += 1;
+		let value = "";
+		let escaped = false;
+		let hasTemplateExpression = false;
+		while (index < length) {
+			const current = input[index];
+			if (escaped) {
+				value += current;
+				escaped = false;
+				index += 1;
+				continue;
+			}
+			if (current === "\\") {
+				value += current;
+				escaped = true;
+				index += 1;
 				continue;
 			}
-			results.push(code);
+			if (quote === "`" && current === "$" && input[index + 1] === "{") hasTemplateExpression = true;
+			if (current === quote) break;
+			value += current;
+			index += 1;
 		}
+		if (index >= length) break;
+		onSegment({
+			value,
+			hasTemplateExpression
+		});
+		index += 1;
 	}
-	return { codes: results };
 };
 const extractPropTree = async (string, api) => {
 	const tree = {};

package/dist/parser/classname/server.mjs

@@ -25,28 +25,62 @@ const onParse = async (api, input) => {
 		});
 	}
 };
-const templateRegexp = /`([\S\s]+?)`/g;
-const quoteRegexps = [
-	/"(.+?)"/g,
-	/'(.+?)'/g,
-	templateRegexp
-];
 const extractCode = (content) => {
 	const results = [];
-	for (const regexp of quoteRegexps) {
-		const matches = content.matchAll(regexp);
-		const isTemplate = regexp === templateRegexp;
-		for (const match of matches) {
-			const [, code] = match;
-			if (isTemplate && code.includes("${")) {
+	[
+		"\"",
+		"'",
+		"`"
+	].forEach((quote) => {
+		scanQuotedSegments(content, quote, ({ value, hasTemplateExpression }) => {
+			if (quote === "`" && hasTemplateExpression) {
 				console.warn("[boss-css] classname parser skipped template literals with expressions. Classnames must be static.");
-				console.warn(code);
+				console.warn(value);
+				return;
+			}
+			results.push(value);
+		});
+	});
+	return { codes: results };
+};
+const scanQuotedSegments = (input, quote, onSegment) => {
+	let index = 0;
+	const length = input.length;
+	while (index < length) {
+		if (input[index] !== quote) {
+			index += 1;
+			continue;
+		}
+		index += 1;
+		let value = "";
+		let escaped = false;
+		let hasTemplateExpression = false;
+		while (index < length) {
+			const current = input[index];
+			if (escaped) {
+				value += current;
+				escaped = false;
+				index += 1;
+				continue;
+			}
+			if (current === "\\") {
+				value += current;
+				escaped = true;
+				index += 1;
 				continue;
 			}
-			results.push(code);
+			if (quote === "`" && current === "$" && input[index + 1] === "{") hasTemplateExpression = true;
+			if (current === quote) break;
+			value += current;
+			index += 1;
 		}
+		if (index >= length) break;
+		onSegment({
+			value,
+			hasTemplateExpression
+		});
+		index += 1;
 	}
-	return { codes: results };
 };
 const extractPropTree = async (string, api) => {
 	const tree = {};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "boss-css",
-    "version": "0.0.19",
+    "version": "0.0.20",
     "description": "Polymorphic, usage-driven CSS-in-JS.",
     "bin": {
         "boss": "./dist/cli/index.cjs",