boss-css 0.0.18 → 0.0.20

package/dist/eslint-plugin/index.cjs

@@ -23,7 +23,7 @@ const plugin = {
 		[require_prefer_unitless_values.default.name]: require_prefer_unitless_values.default
 	}
 };
-const plugins = [plugin.meta.name];
+const plugins = { [plugin.meta.name]: plugin };
 const globalOptions = { languageOptions: { globals: { $$: "readonly" } } };
 const createConfig = (name, getRules) => ({
 	[`${name}-error`]: {

package/dist/eslint-plugin/index.mjs

@@ -23,7 +23,7 @@ const plugin = {
 		[prefer_unitless_values_default.name]: prefer_unitless_values_default
 	}
 };
-const plugins = [plugin.meta.name];
+const plugins = { [plugin.meta.name]: plugin };
 const globalOptions = { languageOptions: { globals: { $$: "readonly" } } };
 const createConfig = (name, getRules) => ({
 	[`${name}-error`]: {

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

@@ -1,10 +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');
-let boss_css_merge = require("boss-css/merge");
+const require_context = require('../utils/context.cjs');
 
 //#region src/eslint-plugin/rules/format-classnames.js
 const RULE_NAME = "format-classnames";
@@ -30,13 +30,14 @@ const formatClassList = (merge, literal, options) => {
 	return next;
 };
 const create = (context) => {
-	const sourceCode = context.getSourceCode();
+	const sourceCode = require_context.getSourceCode(context);
 	const options = {
 		...defaultOptions,
 		...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;
 		const next = formatClassList(merge, literal, options);

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

@@ -1,9 +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 { createBossMerge } from "boss-css/merge";
+import { getSourceCode } from "../utils/context.mjs";
 
 //#region src/eslint-plugin/rules/format-classnames.js
 const RULE_NAME = "format-classnames";
@@ -29,13 +30,14 @@ const formatClassList = (merge, literal, options) => {
 	return next;
 };
 const create = (context) => {
-	const sourceCode = context.getSourceCode();
+	const sourceCode = getSourceCode(context);
 	const options = {
 		...defaultOptions,
 		...context.options[0] || {}
 	};
 	const patterns = createPatterns(options);
 	const merge = createBossMerge(options.merge || {});
+	if (!sourceCode) return {};
 	const reportLiteral = (literal) => {
 		if (!literal || !literal.canFix) return;
 		const next = formatClassList(merge, literal, options);

package/dist/eslint-plugin/rules/no-unknown-classes.cjs

@@ -1,6 +1,7 @@
 const require_ast = require('../utils/ast.cjs');
 const require_defaults = require('../utils/defaults.cjs');
 const require_boss_classes = require('../utils/boss-classes.cjs');
+const require_context = require('../utils/context.cjs');
 
 //#region src/eslint-plugin/rules/no-unknown-classes.js
 const RULE_NAME = "no-unknown-classes";
@@ -21,12 +22,13 @@ const createPatterns = (options) => ({
 	tags: require_ast.compilePatterns(options.tags)
 });
 const create = (context) => {
-	const sourceCode = context.getSourceCode();
+	const sourceCode = require_context.getSourceCode(context);
 	const options = {
 		...defaultOptions,
 		...context.options[0] || {}
 	};
 	const patterns = createPatterns(options);
+	if (!sourceCode) return {};
 	const reportInvalid = (literal) => {
 		if (!literal || !literal.value) return;
 		const invalid = require_boss_classes.findInvalidTokens(literal.value, options);

package/dist/eslint-plugin/rules/no-unknown-classes.mjs

@@ -1,6 +1,7 @@
 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 { findInvalidTokens } from "../utils/boss-classes.mjs";
+import { getSourceCode } from "../utils/context.mjs";
 
 //#region src/eslint-plugin/rules/no-unknown-classes.js
 const RULE_NAME = "no-unknown-classes";
@@ -21,12 +22,13 @@ const createPatterns = (options) => ({
 	tags: compilePatterns(options.tags)
 });
 const create = (context) => {
-	const sourceCode = context.getSourceCode();
+	const sourceCode = getSourceCode(context);
 	const options = {
 		...defaultOptions,
 		...context.options[0] || {}
 	};
 	const patterns = createPatterns(options);
+	if (!sourceCode) return {};
 	const reportInvalid = (literal) => {
 		if (!literal || !literal.value) return;
 		const invalid = findInvalidTokens(literal.value, options);

package/dist/eslint-plugin/rules/prefer-token-values.cjs

@@ -2,6 +2,7 @@ const require_ast = require('../utils/ast.cjs');
 const require_defaults = require('../utils/defaults.cjs');
 const require_api = require('../utils/api.cjs');
 const require_boss_classes = require('../utils/boss-classes.cjs');
+const require_context = require('../utils/context.cjs');
 
 //#region src/eslint-plugin/rules/prefer-token-values.js
 const RULE_NAME = "prefer-token-values";
@@ -94,7 +95,7 @@ const resolveTokenValue = (groupValues, tokenPath) => {
 	return current;
 };
 const create = (context) => {
-	const sourceCode = context.getSourceCode();
+	const sourceCode = require_context.getSourceCode(context);
 	const options = {
 		...defaultOptions,
 		...context.options[0] || {}
@@ -105,6 +106,7 @@ const create = (context) => {
 	const { api } = require_api.getApi();
 	const tokenGroups = api?.tokens && typeof api.tokens === "object" ? api.tokens : null;
 	if (!api || !tokenGroups) return {};
+	if (!sourceCode) return {};
 	const reportTokenUsage = (node, propName, tokenKey) => {
 		context.report({
 			node,

package/dist/eslint-plugin/rules/prefer-token-values.mjs

@@ -2,6 +2,7 @@ import { getJSXAttributeName, getJSXRootName, getLiteralInfo } from "../utils/as
 import { DEFAULT_COMPONENTS } from "../utils/defaults.mjs";
 import { getApi } from "../utils/api.mjs";
 import { getContextSet, isCssPropName } from "../utils/boss-classes.mjs";
+import { getSourceCode } from "../utils/context.mjs";
 
 //#region src/eslint-plugin/rules/prefer-token-values.js
 const RULE_NAME = "prefer-token-values";
@@ -94,7 +95,7 @@ const resolveTokenValue = (groupValues, tokenPath) => {
 	return current;
 };
 const create = (context) => {
-	const sourceCode = context.getSourceCode();
+	const sourceCode = getSourceCode(context);
 	const options = {
 		...defaultOptions,
 		...context.options[0] || {}
@@ -105,6 +106,7 @@ const create = (context) => {
 	const { api } = getApi();
 	const tokenGroups = api?.tokens && typeof api.tokens === "object" ? api.tokens : null;
 	if (!api || !tokenGroups) return {};
+	if (!sourceCode) return {};
 	const reportTokenUsage = (node, propName, tokenKey) => {
 		context.report({
 			node,

package/dist/eslint-plugin/rules/prefer-unitless-values.cjs

@@ -3,6 +3,7 @@ const require_defaults = require('../utils/defaults.cjs');
 const require_format = require('../utils/format.cjs');
 const require_api = require('../utils/api.cjs');
 const require_boss_classes = require('../utils/boss-classes.cjs');
+const require_context = require('../utils/context.cjs');
 
 //#region src/eslint-plugin/rules/prefer-unitless-values.js
 const RULE_NAME = "prefer-unitless-values";
@@ -118,7 +119,7 @@ const analyzeClassList = (classList, unit, extraProps) => {
 	};
 };
 const create = (context) => {
-	const sourceCode = context.getSourceCode();
+	const sourceCode = require_context.getSourceCode(context);
 	const options = {
 		...defaultOptions,
 		...context.options[0] || {}
@@ -128,6 +129,7 @@ const create = (context) => {
 	const { api } = require_api.getApi();
 	const unit = normalizeUnit(options.unit) || normalizeUnit(api?.unit) || "px";
 	if (!unit) return {};
+	if (!sourceCode) return {};
 	const reportLiteral = (literal) => {
 		if (!literal || !literal.value) return;
 		const { issues, nextClassList } = analyzeClassList(literal.value, unit, extraProps);

package/dist/eslint-plugin/rules/prefer-unitless-values.mjs

@@ -3,6 +3,7 @@ import { DEFAULT_ATTRIBUTE_PATTERNS, DEFAULT_CALLEE_PATTERNS, DEFAULT_TAG_PATTER
 import { buildLiteralReplacement } from "../utils/format.mjs";
 import { getApi } from "../utils/api.mjs";
 import { isCssPropName, parseGroupedSelector, splitClassList, splitFragments } from "../utils/boss-classes.mjs";
+import { getSourceCode } from "../utils/context.mjs";
 
 //#region src/eslint-plugin/rules/prefer-unitless-values.js
 const RULE_NAME = "prefer-unitless-values";
@@ -118,7 +119,7 @@ const analyzeClassList = (classList, unit, extraProps) => {
 	};
 };
 const create = (context) => {
-	const sourceCode = context.getSourceCode();
+	const sourceCode = getSourceCode(context);
 	const options = {
 		...defaultOptions,
 		...context.options[0] || {}
@@ -128,6 +129,7 @@ const create = (context) => {
 	const { api } = getApi();
 	const unit = normalizeUnit(options.unit) || normalizeUnit(api?.unit) || "px";
 	if (!unit) return {};
+	if (!sourceCode) return {};
 	const reportLiteral = (literal) => {
 		if (!literal || !literal.value) return;
 		const { issues, nextClassList } = analyzeClassList(literal.value, unit, extraProps);

package/dist/eslint-plugin/rules/props-only.cjs

@@ -1,6 +1,7 @@
 const require_ast = require('../utils/ast.cjs');
 const require_defaults = require('../utils/defaults.cjs');
 const require_boss_classes = require('../utils/boss-classes.cjs');
+const require_context = require('../utils/context.cjs');
 
 //#region src/eslint-plugin/rules/props-only.js
 const RULE_NAME = "props-only";
@@ -21,12 +22,13 @@ const createPatterns = (options) => ({
 	tags: require_ast.compilePatterns(options.tags)
 });
 const create = (context) => {
-	const sourceCode = context.getSourceCode();
+	const sourceCode = require_context.getSourceCode(context);
 	const options = {
 		...defaultOptions,
 		...context.options[0] || {}
 	};
 	const patterns = createPatterns(options);
+	if (!sourceCode) return {};
 	const reportLiteral = (literal) => {
 		if (!literal || !literal.value) return;
 		if (!require_boss_classes.containsBossToken(literal.value, options)) return;

package/dist/eslint-plugin/rules/props-only.mjs

@@ -1,6 +1,7 @@
 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 { containsBossToken } from "../utils/boss-classes.mjs";
+import { getSourceCode } from "../utils/context.mjs";
 
 //#region src/eslint-plugin/rules/props-only.js
 const RULE_NAME = "props-only";
@@ -21,12 +22,13 @@ const createPatterns = (options) => ({
 	tags: compilePatterns(options.tags)
 });
 const create = (context) => {
-	const sourceCode = context.getSourceCode();
+	const sourceCode = getSourceCode(context);
 	const options = {
 		...defaultOptions,
 		...context.options[0] || {}
 	};
 	const patterns = createPatterns(options);
+	if (!sourceCode) return {};
 	const reportLiteral = (literal) => {
 		if (!literal || !literal.value) return;
 		if (!containsBossToken(literal.value, options)) return;

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/eslint-plugin/utils/context.cjs

@@ -0,0 +1,9 @@
+
+//#region src/eslint-plugin/utils/context.js
+const getSourceCode = (context) => {
+	if (typeof context?.getSourceCode === "function") return context.getSourceCode();
+	return context?.sourceCode ?? null;
+};
+
+//#endregion
+exports.getSourceCode = getSourceCode;

package/dist/eslint-plugin/utils/context.mjs

@@ -0,0 +1,8 @@
+//#region src/eslint-plugin/utils/context.js
+const getSourceCode = (context) => {
+	if (typeof context?.getSourceCode === "function") return context.getSourceCode();
+	return context?.sourceCode ?? null;
+};
+
+//#endregion
+export { getSourceCode };

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/dist/parser/jsx/server.cjs

@@ -141,7 +141,15 @@ type BossComponentProps<C> = C extends keyof BossIntrinsicElements
 type AsProp<C extends BossElementType> = {
     as?: C
 }
-type PolymorphicComponentProp<C extends BossElementType, Props = {}> = Props & BossComponentProps<C> & AsProp<C>
+type BossMergedProps<Props, ComponentProps> = Omit<Props, keyof ComponentProps> &
+    Omit<ComponentProps, keyof Props> & {
+        [K in Extract<keyof ComponentProps, keyof Props>]?: ComponentProps[K] | Props[K]
+    }
+type PolymorphicComponentProp<C extends BossElementType, Props = {}> = BossMergedProps<
+    Props,
+    BossComponentProps<C>
+> &
+    AsProp<C>
 type PolymorphicComponentPropWithRef<C extends BossElementType, Props = {}> = PolymorphicComponentProp<C, Props> & {
     ref?: unknown
 }

package/dist/parser/jsx/server.mjs

@@ -140,7 +140,15 @@ type BossComponentProps<C> = C extends keyof BossIntrinsicElements
 type AsProp<C extends BossElementType> = {
     as?: C
 }
-type PolymorphicComponentProp<C extends BossElementType, Props = {}> = Props & BossComponentProps<C> & AsProp<C>
+type BossMergedProps<Props, ComponentProps> = Omit<Props, keyof ComponentProps> &
+    Omit<ComponentProps, keyof Props> & {
+        [K in Extract<keyof ComponentProps, keyof Props>]?: ComponentProps[K] | Props[K]
+    }
+type PolymorphicComponentProp<C extends BossElementType, Props = {}> = BossMergedProps<
+    Props,
+    BossComponentProps<C>
+> &
+    AsProp<C>
 type PolymorphicComponentPropWithRef<C extends BossElementType, Props = {}> = PolymorphicComponentProp<C, Props> & {
     ref?: unknown
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "boss-css",
-    "version": "0.0.18",
+    "version": "0.0.20",
     "description": "Polymorphic, usage-driven CSS-in-JS.",
     "bin": {
         "boss": "./dist/cli/index.cjs",
@@ -275,6 +275,7 @@
         "@types/jsdom": "^27.0.0",
         "@types/node": "^25.0.9",
         "@types/react": "^19.2.8",
+        "eslint": "^10.0.2",
         "postcss": "^8.5.6",
         "preact": "^10.28.2",
         "prettier": "^3.8.0",