@unocss/language-server 66.6.7 → 66.6.8

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import * as _unocss_core0 from "@unocss/core";
+import * as _$_unocss_core0 from "@unocss/core";
 import { UnoGenerator, UnocssPluginContext, UserConfig } from "@unocss/core";
 import { Connection } from "vscode-languageserver";
 
@@ -20,7 +20,7 @@ declare class ContextManager {
   private discoveredConfigs;
   private readonly defaultUnocssConfig;
   private readonly workspaceRoots;
-  events: _unocss_core0.Emitter<{
+  events: _$_unocss_core0.Emitter<{
     reload: () => void;
     unload: (context: UnocssPluginContext<UserConfig<any>>) => void;
     contextLoaded: (context: UnocssPluginContext<UserConfig<any>>) => void;

package/dist/index.mjs

@@ -9,8 +9,8 @@ import process$1 from "node:process";
 import { createRecoveryConfigLoader } from "@unocss/config";
 import presetWind3 from "@unocss/preset-wind3";
 import { sourceObjectFields, sourcePluginFactory } from "unconfig/presets";
-import parserCSS from "prettier/parser-postcss";
-import prettier from "prettier/standalone";
+import parserCSS from "prettier/parser-postcss.js";
+import prettier from "prettier/standalone.js";
 const SKIP_START_COMMENT = "@unocss-skip-start";
 const SKIP_END_COMMENT = "@unocss-skip-end";
 const SKIP_COMMENT_RE = new RegExp(`(\/\/\\s*?${SKIP_START_COMMENT}\\s*?|\\/\\*\\s*?${SKIP_START_COMMENT}\\s*?\\*\\/|<!--\\s*?${SKIP_START_COMMENT}\\s*?-->)[\\s\\S]*?(\/\/\\s*?${SKIP_END_COMMENT}\\s*?|\\/\\*\\s*?${SKIP_END_COMMENT}\\s*?\\*\\/|<!--\\s*?${SKIP_END_COMMENT}\\s*?-->)`, "g");
@@ -3083,7 +3083,7 @@ function variantAttributify(options = {}) {
 				const [, bodyVariant, bracketValue] = content.match(variantsValueRE) || [];
 				if (bracketValue) return `${bodyVariant}${variants}${name}-${bracketValue}`;
 			}
-			if (variants && body.match(/^[\d.]+$/)) {
+			if (variants && /^[\d.]+$/.test(body)) {
 				const variantParts = variants.split(/([^:]*:)/g).filter(Boolean);
 				const _body = variantParts.pop() + body;
 				const _variants = variantParts.join("");
@@ -3278,7 +3278,7 @@ function encodeSvgForCss(svg) {
 	return encodeSVGforURL(useSvg);
 }
 //#endregion
-//#region ../../packages-presets/preset-icons/dist/core-CVWr9MHW.mjs
+//#region ../../packages-presets/preset-icons/dist/core-DIrlUwzK.mjs
 function getEnvFlags() {
 	const isNode = typeof process !== "undefined" && process.stdout;
 	return {
@@ -3374,6 +3374,7 @@ var collections_default = [
 	"gala",
 	"game-icons",
 	"garden",
+	"gcp",
 	"geo",
 	"gg",
 	"gis",
@@ -3659,7 +3660,7 @@ async function parseIconWithLoader(body, loader, options = {}, safeCollectionsNa
 	};
 }
 //#endregion
-//#region ../../packages-presets/preset-icons/dist/cdn-fz6F-x8c.mjs
+//#region ../../packages-presets/preset-icons/dist/cdn-DYTPkoFm.mjs
 async function createCDNLoader(cdnBase) {
 	const { $fetch } = await import("./node-D23LglTq.mjs");
 	return createCDNFetchLoader($fetch, cdnBase);
@@ -6017,7 +6018,7 @@ var __exportAll = (all, no_symbols) => {
 	return target;
 };
 //#endregion
-//#region ../../packages-presets/preset-wind4/dist/utils-BamiTVVE.mjs
+//#region ../../packages-presets/preset-wind4/dist/utils-B60b98El.mjs
 const PRESET_NAME = "@unocss/preset-wind4";
 const CONTROL_NO_NEGATIVE = "$$mini-no-negative";
 const SpecialColorKey = {
@@ -6151,6 +6152,7 @@ const unitOnlyMap = {
 };
 const bracketTypeRe = /^\[(color|image|length|size|position|quoted|string|number|family):/i;
 const splitComma = /,(?![^()]*\))/g;
+const cssVarsRE = /(?<!var\()--([\w.-]+)(\([^)]+\)|,[#.\s\w]+)?/g;
 var handlers_exports = /* @__PURE__ */ __exportAll({
 	auto: () => auto,
 	bracket: () => bracket,
@@ -6285,13 +6287,23 @@ function fraction(str) {
 		return `${round(num * 100)}%`;
 	}
 }
-function processThemeVariable(name, key, paths, theme) {
-	const valOrObj = getThemeByKey(theme, key, paths);
+/**
+* Process a theme variable reference and retrieve its value and corresponding CSS variable key.
+*
+* @example theme => Theme object
+* @example themeKey => 'colors
+* @example themeKeyPaths => ['blue', '500']
+* @example varPaths => 'colors.blue.500'
+*
+* @returns An object containing the resolved value from the theme and the corresponding CSS variable key.
+*/
+function processThemeVariable(theme, themeKey, themeKeyPaths, varPaths) {
+	const valOrObj = getThemeByKey(theme, themeKey, themeKeyPaths);
 	const hasDefault = typeof valOrObj === "object" && "DEFAULT" in valOrObj;
-	if (hasDefault) paths.push("DEFAULT");
+	if (hasDefault) themeKeyPaths.push("DEFAULT");
 	const val = hasDefault ? valOrObj.DEFAULT : valOrObj;
-	const varKey = hasDefault && key !== "spacing" ? `${name}.DEFAULT` : name;
-	if (val != null) themeTracking(key, paths.length ? paths : void 0);
+	const varKey = hasDefault && themeKey !== "spacing" ? `${varPaths}.DEFAULT` : varPaths;
+	if (val != null) themeTracking(themeKey, themeKeyPaths.length ? themeKeyPaths : void 0);
 	return {
 		val,
 		varKey
@@ -6310,23 +6322,24 @@ function bracketWithType(str, requiredType, theme) {
 		}
 		if (!base) return;
 		if (base === "=\"\"") return;
-		if (base.startsWith("--")) {
-			const calcMatch = base.match(/^--([\w.-]+)\(([^)]+)\)$/);
-			if (calcMatch != null && theme) {
-				const [, name, factor] = calcMatch;
-				const [key, ...paths] = name.split(".");
-				const { val, varKey } = processThemeVariable(name, key, paths, theme);
-				if (val != null) base = `calc(var(--${escapeSelector(varKey.replaceAll(".", "-"))}) * ${factor})`;
-			} else {
-				const [name, defaultValue] = base.slice(2).split(",");
-				const suffix = defaultValue ? `, ${defaultValue}` : "";
-				const escapedName = escapeSelector(name);
-				if (theme) {
-					const [key, ...paths] = name.split(".");
-					const { val, varKey } = processThemeVariable(name, key, paths, theme);
-					base = val != null ? `var(--${escapeSelector(varKey.replaceAll(".", "-"))}${suffix})` : `var(--${escapedName}${suffix})`;
-				} else base = `var(--${escapedName}${suffix})`;
+		if (theme) base = transformThemeFn(base, theme);
+		const matches = Array.from(base.matchAll(cssVarsRE));
+		for (const match of matches) {
+			const [full, varPaths, _value] = match;
+			if (theme) {
+				const [key, ...paths] = varPaths.split(".");
+				const { val, varKey } = processThemeVariable(theme, key, paths, varPaths);
+				if (val != null) {
+					const cssVar = `--${varKey.replaceAll(".", "-")}`;
+					if (_value && !_value.startsWith(",")) base = base.replace(full, `calc(var(${cssVar}) * ${_value.slice(1, -1)})`);
+					else {
+						const fallback = _value?.slice(1);
+						base = base.replace(full, `var(${cssVar}${fallback ? `, ${fallback}` : ""})`);
+					}
+					continue;
+				}
 			}
+			base = base.replace(full, `var(${full})`);
 		}
 		let curly = 0;
 		for (const i of base) if (i === "[") curly += 1;
@@ -6708,7 +6721,7 @@ function propertyTracking(property, value) {
 	if (!trackedProperties.has(property)) trackedProperties.set(property, value);
 }
 //#endregion
-//#region ../../packages-presets/preset-wind4/dist/container-_7pdPWQl.mjs
+//#region ../../packages-presets/preset-wind4/dist/container-m1WfKD7R.mjs
 const containerParent = [[/^@container(?:\/(\w+))?(?:-(normal))?$/, ([, l, v]) => {
 	return {
 		"container-type": v ?? "inline-size",
@@ -8532,7 +8545,7 @@ function getSizeValue(theme, hw, prop) {
 		themeTracking(`spacing`);
 		v = `calc(var(--spacing) * ${h.number(prop)})`;
 	}
-	return v ?? h.bracket.cssvar.global.auto.none.fraction.rem(prop);
+	return v ?? h.bracket.cssvar.global.auto.none.fraction.rem(prop, theme);
 }
 const sizes = [
 	[/^size-(min-|max-)?(.+)$/, ([, m, s], { theme }) => ({
@@ -10738,7 +10751,7 @@ const theme = {
 	supports
 };
 //#endregion
-//#region ../../packages-presets/preset-wind4/dist/variants-BQhcPCjX.mjs
+//#region ../../packages-presets/preset-wind4/dist/variants-B5PDncV-.mjs
 const variantAria = {
 	name: "aria",
 	match(matcher, ctx) {
@@ -11226,7 +11239,7 @@ const variantNegative = {
 		return {
 			matcher: matcher.slice(1),
 			body: (body) => {
-				if (body.find((v) => v[0] === "$$mini-no-negative")) return;
+				if (body.some((v) => v[0] === "$$mini-no-negative")) return;
 				let changed = false;
 				for (const v of body) {
 					const [prop, rawValue, meta] = v;