@barocss/kit 0.10.2 → 0.10.3

package/dist/index.d.cts

@@ -69,6 +69,8 @@ export declare type AstNode = {
  export declare function astToCss(ast: AstNode[], baseSelector?: string, opts?: {
      minify?: boolean;
      important?: boolean;
+     scope?: string;
+     nested?: boolean;
  }, _indent?: string): string;
 
  export declare function atRoot(nodes: AstNode[], source?: string): AstNode;
@@ -823,6 +825,14 @@ export declare type AstNode = {
 
   export declare function isSafeVariantValue(value: string, allowTopLevelComma?: boolean): boolean;
 
+  /**
+   * #392: true when every top-level comma part of an emitted selector names `escapedClass` (a class selector
+   * already escaped with escapeClassName, including its leading dot) as a whole class token, or, when
+   * `allowNesting` is set, uses the nesting selector `&`. Escapes, quoted strings and bracket groups are skipped
+   * when splitting. Used as a defence-in-depth serializer check: a rule scoped to no generating class is dropped.
+   */
+  export declare function isScopedSelector(selector: string, escapedClass: string, allowNesting?: boolean): boolean;
+
   export declare function isStructureSafeValue(value: string): boolean;
 
   /**

package/dist/index.d.ts

@@ -69,6 +69,8 @@ export declare type AstNode = {
  export declare function astToCss(ast: AstNode[], baseSelector?: string, opts?: {
      minify?: boolean;
      important?: boolean;
+     scope?: string;
+     nested?: boolean;
  }, _indent?: string): string;
 
  export declare function atRoot(nodes: AstNode[], source?: string): AstNode;
@@ -823,6 +825,14 @@ export declare type AstNode = {
 
   export declare function isSafeVariantValue(value: string, allowTopLevelComma?: boolean): boolean;
 
+  /**
+   * #392: true when every top-level comma part of an emitted selector names `escapedClass` (a class selector
+   * already escaped with escapeClassName, including its leading dot) as a whole class token, or, when
+   * `allowNesting` is set, uses the nesting selector `&`. Escapes, quoted strings and bracket groups are skipped
+   * when splitting. Used as a defence-in-depth serializer check: a rule scoped to no generating class is dropped.
+   */
+  export declare function isScopedSelector(selector: string, escapedClass: string, allowNesting?: boolean): boolean;
+
   export declare function isStructureSafeValue(value: string): boolean;
 
   /**

package/dist/index.js

@@ -330,7 +330,8 @@ function registerModifier(modifier, ctx) {
 function getModifier(ctx) {
 	return ctx && getContextState(ctx)?.modifiers || modifierRegistry;
 }
-var ESCAPE_REGEX = /[^A-Za-z0-9_-]/g;
+var ESCAPE_REGEX = /[^A-Za-z0-9_-]/gu;
+var UNSAFE_RAW = /^[\s\p{C}\p{Z}]$/u;
 function escapeClassName(className) {
 	if (className === "-") return "\\-";
 	const lead = /^-?[0-9]/.exec(className);
@@ -373,6 +374,7 @@ function escapeRest(className) {
 		if (c === "}") return "\\}";
 		if (c === "|") return "\\|";
 		if (c === "\\") return "\\\\";
+		if (UNSAFE_RAW.test(c)) return "\\" + c.codePointAt(0).toString(16) + " ";
 		return "\\" + c;
 	});
 }
@@ -911,6 +913,46 @@ function isBalancedPrelude(text) {
 	return stack.length === 0 && !quote;
 }
 /**
+* #392: true when every top-level comma part of an emitted selector names `escapedClass` (a class selector
+* already escaped with escapeClassName, including its leading dot) as a whole class token, or, when
+* `allowNesting` is set, uses the nesting selector `&`. Escapes, quoted strings and bracket groups are skipped
+* when splitting. Used as a defence-in-depth serializer check: a rule scoped to no generating class is dropped.
+*/
+function isScopedSelector(selector, escapedClass, allowNesting = false) {
+	const parts = [];
+	let depth = 0;
+	let quote = "";
+	let start = 0;
+	for (let i = 0; i < selector.length; i++) {
+		const c = selector[i];
+		if (c === "\\") {
+			i++;
+			continue;
+		}
+		if (quote) {
+			if (c === quote) quote = "";
+			continue;
+		}
+		if (c === "\"" || c === "'") quote = c;
+		else if (c === "(" || c === "[") depth++;
+		else if (c === ")" || c === "]") depth--;
+		else if (c === "," && depth === 0) {
+			parts.push(selector.slice(start, i));
+			start = i + 1;
+		}
+	}
+	parts.push(selector.slice(start));
+	return parts.every((part) => {
+		if (allowNesting && part.includes("&")) return true;
+		for (let at = part.indexOf(escapedClass); at !== -1; at = part.indexOf(escapedClass, at + 1)) {
+			if (at > 0 && part[at - 1] === "\\") continue;
+			const next = part[at + escapedClass.length];
+			if (escapedClass.endsWith(" ") || next === void 0 || !/[\w\-\\\u0080-\uffff]/.test(next)) return true;
+		}
+		return false;
+	});
+}
+/**
 * #323: true when emitted text contains a markup end-tag opener (less-than then slash). Generated CSS can be
 * placed inside an HTML style element, where that sequence could end the element early. CSS escapes in the
 * output never form it, and a lone less-than (range media queries) stays allowed.
@@ -1104,6 +1146,12 @@ function astToCss(ast, baseSelector, opts, _indent = "") {
 	const indent = _indent;
 	const nextIndent = _indent + "  ";
 	const importantString = opts?.important ?? false ? ` ${importantPrefix}` : "";
+	const nestedOpts = opts ? {
+		...opts,
+		nested: true
+	} : opts;
+	const scopeClass = opts?.scope ? "." + escapeClassName(opts.scope) : "";
+	const inScope = (sel) => !scopeClass || isScopedSelector(sel, scopeClass, !!opts?.nested);
 	if (!ast || ast.length === 0) {
 		debugWarn("[astToCss] Empty AST received:", {
 			ast,
@@ -1146,14 +1194,14 @@ function astToCss(ast, baseSelector, opts, _indent = "") {
 						else return escBase + (sel.startsWith(".") ? "" : " ") + sel;
 					}).join(", ");
 				}
-				if (!isSafePrelude(selector)) return "";
-				if (minify) return `${indent}${selector}{${astToCss(node.nodes, baseSelector, opts, nextIndent)}}`;
-				else return `${indent}${selector} {\n${astToCss(node.nodes, baseSelector, opts, nextIndent)}${indent}}`;
+				if (!isSafePrelude(selector) || !inScope(selector)) return "";
+				if (minify) return `${indent}${selector}{${astToCss(node.nodes, baseSelector, nestedOpts, nextIndent)}}`;
+				else return `${indent}${selector} {\n${astToCss(node.nodes, baseSelector, nestedOpts, nextIndent)}${indent}}`;
 			}
 			case "style-rule":
-				if (!isSafePrelude(node.selector)) return "";
-				if (minify) return `${indent}${node.selector} {${astToCss(node.nodes, baseSelector, opts, nextIndent)}}`;
-				else return `${indent}${node.selector} {\n${astToCss(node.nodes, baseSelector, opts, nextIndent)}${indent}}`;
+				if (!isSafePrelude(node.selector) || !inScope(node.selector)) return "";
+				if (minify) return `${indent}${node.selector} {${astToCss(node.nodes, baseSelector, nestedOpts, nextIndent)}}`;
+				else return `${indent}${node.selector} {\n${astToCss(node.nodes, baseSelector, nestedOpts, nextIndent)}${indent}}`;
 			case "at-rule":
 				if (!isSafePrelude(node.name) || !isSafePrelude(node.params)) return "";
 				if (minify) return `${indent}@${node.name} ${node.params}{${astToCss(node.nodes, baseSelector, opts, nextIndent)}}`;
@@ -1863,7 +1911,8 @@ function generateCss(classList, ctx, opts) {
 		const hasStyleRule = cleanAst.some((node) => node.type === "style-rule");
 		const css = astToCss(cleanAst.filter((node) => node.type !== "at-root"), hasStyleRule ? void 0 : cls, {
 			minify: opts?.minify,
-			important: parsedResult?.utility?.important ?? false
+			important: parsedResult?.utility?.important ?? false,
+			scope: cls
 		});
 		const result = css;
 		if (!result || result.trim() === "") debugWarn("[generateCss] Empty CSS generated for class:", {
@@ -1921,7 +1970,10 @@ function generateCssRules(classList, ctx, opts) {
 			cssList.push(css);
 		});
 		else {
-			const css = astToCss([node], cls, options);
+			const css = astToCss([node], cls, {
+				...options,
+				scope: cls
+			});
 			cssList.push(css);
 		}
 		const rootCssList = [];
@@ -4586,7 +4638,7 @@ functionalUtility({
 					decl("box-shadow", SHADOW_COMPOSITE)
 				];
 			}
-			return [parseColor(main) ? decl("--baro-ring-color", main) : decl("box-shadow", main)];
+			return [parseColor(main) || /^var\(--[^)]+\)$/.test(main) ? decl("--baro-ring-color", main) : decl("box-shadow", main)];
 		}
 		if (main === "inherit" || main === "current" || main === "transparent") return [decl("--baro-ring-color", main === "current" ? "currentColor" : main)];
 		return null;
@@ -6712,6 +6764,7 @@ functionalUtility({
 			return [decl("background-color", value)];
 		}
 		if (parseLength(value)) return [decl("background-size", value)];
+		if (/^var\(--[^)]+\)$/.test(value)) return [decl("background-color", value)];
 		return null;
 	},
 	handleCustomProperty: (value) => {
@@ -8544,6 +8597,6 @@ function upperBound(keys, key) {
 	return lo;
 }
 //#endregion
-export { AstCache, IncrementalParser, ParseResultCache, UtilityCache, WeakCache, arbitraryPropertyRegistration, astCache, astToCss, atRoot, atRule, clearAllCaches, clearAstCache, collectDeclPaths, comment, compareKeys, configGetter, createContext, decl, declPathToAst, deepMerge, defaultConfig, escapeClassName, expandThemeFunctions, functionalModifier, functionalUtility, generateCss, generateCssFromJson, generateCssRules, getAstCacheStats, getModifier, getPreflightCSS, getUtility, hasCommentDelimiter, hasCommentToken, hasHtmlEndTagOpener, hasPreset, isBalancedPrelude, isDebug, isSafeVariantToken, isSafeVariantValue, isStructureSafeValue, isWellFormedVariantBrackets, jsonToAst, mergeAstTreeList, modifierRegistry, normalizeMathSpacing, optimizeAst, parseClassName, parseClassToAst, parseResultCache, property, raw, registerModifier, registerUtility, resolveTheme, rootToCss, rule, ruleSortKey, setContextCacheReset, setDebug, staticModifier, staticUtility, styleRule, themeGetter, themeKeyValue, themeKeyVar, themeToCssVars, tokenize, upperBound, utilityCache };
+export { AstCache, IncrementalParser, ParseResultCache, UtilityCache, WeakCache, arbitraryPropertyRegistration, astCache, astToCss, atRoot, atRule, clearAllCaches, clearAstCache, collectDeclPaths, comment, compareKeys, configGetter, createContext, decl, declPathToAst, deepMerge, defaultConfig, escapeClassName, expandThemeFunctions, functionalModifier, functionalUtility, generateCss, generateCssFromJson, generateCssRules, getAstCacheStats, getModifier, getPreflightCSS, getUtility, hasCommentDelimiter, hasCommentToken, hasHtmlEndTagOpener, hasPreset, isBalancedPrelude, isDebug, isSafeVariantToken, isSafeVariantValue, isScopedSelector, isStructureSafeValue, isWellFormedVariantBrackets, jsonToAst, mergeAstTreeList, modifierRegistry, normalizeMathSpacing, optimizeAst, parseClassName, parseClassToAst, parseResultCache, property, raw, registerModifier, registerUtility, resolveTheme, rootToCss, rule, ruleSortKey, setContextCacheReset, setDebug, staticModifier, staticUtility, styleRule, themeGetter, themeKeyValue, themeKeyVar, themeToCssVars, tokenize, upperBound, utilityCache };
 
 //# sourceMappingURL=index.js.map