@master/css-language-service 2.0.0-rc.85 → 2.0.0-rc.87

package/dist/core.d.ts

@@ -9,7 +9,6 @@ import editSyntaxColors from "./features/edit-syntax-colors.js";
 import formatDirectives from "./features/format-directives.js";
 import renderSemanticTokens$1, { renderSemanticTokensAtPosition as renderSemanticTokensAtPosition$1 } from "./features/render-semantic-tokens.js";
 import suggestSyntax from "./features/suggest-syntax.js";
-
 //#region src/core.d.ts
 interface CSSLanguageServiceOptions {
   runtime?: CSSLanguageRuntime;

package/dist/features/edit-syntax-colors.d.ts

@@ -1,7 +1,6 @@
 import { ColorPresentation, ColorPresentationParams } from "vscode-languageserver-protocol";
 import { TextDocument } from "vscode-languageserver-textdocument";
 import CSSLanguageService from "../core.js";
-
 //#region src/features/edit-syntax-colors.d.ts
 declare function editSyntaxColors(this: CSSLanguageService, document: TextDocument, color: ColorPresentationParams['color'], range: ColorPresentationParams['range']): ColorPresentation[];
 //#endregion

package/dist/features/format-directives.d.ts

@@ -1,6 +1,5 @@
 import { Range, TextEdit } from "vscode-languageserver-protocol";
 import { TextDocument } from "vscode-languageserver-textdocument";
-
 //#region src/features/format-directives.d.ts
 declare function formatDirectives(document: TextDocument, range?: Range): TextEdit[] | undefined;
 //#endregion

package/dist/features/inspect-syntax.d.ts

@@ -1,7 +1,6 @@
 import { Hover, HoverParams } from "vscode-languageserver-protocol";
 import { TextDocument } from "vscode-languageserver-textdocument";
 import CSSLanguageService from "../core.js";
-
 //#region src/features/inspect-syntax.d.ts
 declare function inspectSyntax(this: CSSLanguageService, document: TextDocument, position: HoverParams['position']): Hover | undefined;
 //#endregion

package/dist/features/render-semantic-tokens.d.ts

@@ -1,7 +1,6 @@
 import { SemanticTokens } from "vscode-languageserver-protocol";
 import { TextDocument } from "vscode-languageserver-textdocument";
 import CSSLanguageService from "../core.js";
-
 //#region src/features/render-semantic-tokens.d.ts
 declare function renderSemanticTokensAtPosition(this: CSSLanguageService, document: TextDocument, position: Parameters<CSSLanguageService['getClassPosition']>[1]): SemanticTokens | undefined;
 declare function renderSemanticTokens(this: CSSLanguageService, document: TextDocument): SemanticTokens | undefined;

package/dist/features/render-syntax-colors.d.ts

@@ -1,7 +1,6 @@
 import { ColorInformation } from "vscode-languageserver-protocol";
 import { TextDocument } from "vscode-languageserver-textdocument";
 import CSSLanguageService from "../core.js";
-
 //#region src/features/render-syntax-colors.d.ts
 declare function renderSyntaxColors(this: CSSLanguageService, document: TextDocument): Promise<ColorInformation[] | undefined>;
 //#endregion

package/dist/features/suggest-syntax.d.ts

@@ -2,7 +2,6 @@ import { CompletionItem, CompletionParams } from "vscode-languageserver-protocol
 import { TextDocument } from "vscode-languageserver-textdocument";
 import CSSLanguageService from "../core.js";
 import { CompletionIndex } from "../utils/completion-index.js";
-
 //#region src/features/suggest-syntax.d.ts
 declare function suggestSyntax(this: CSSLanguageService, document: TextDocument, position: CompletionParams['position'], context: CompletionParams['context'], completionIndex?: CompletionIndex): CompletionItem[] | undefined;
 //#endregion

package/dist/settings.d.ts

@@ -1,6 +1,5 @@
 import { LanguageSettings } from "@master/css-language";
 import { MasterCSSManifest } from "@master/css";
-
 //#region src/settings.d.ts
 /**
  * @example styles https://regex101.com/r/HLPdsw/1

package/dist/utils/completion-index.d.ts

@@ -1,6 +1,5 @@
-import { AtRule, CSSLanguageRuntime, MasterCSS, Variable } from "@master/css-language";
+import { CSSLanguageRuntime, Condition, MasterCSS, Variable } from "@master/css-language";
 import { CompletionItem } from "vscode-languageserver-protocol";
-
 //#region src/utils/completion-index.d.ts
 interface ClassCompletionEntry extends CompletionItem {
   documentationClassName?: string;
@@ -35,7 +34,7 @@ interface CompletionIndex {
   pseudoClassSelectors: SelectorVariantCandidate[];
   pseudoElementNames: string[];
   pseudoElementSelectors: SelectorVariantCandidate[];
-  atRules: [string, AtRule][];
+  conditions: [string, Condition][];
 }
 declare function createCompletionIndex(css?: MasterCSS, runtime?: CSSLanguageRuntime): CompletionIndex;
 declare function matchesIndexedName(field: string, name: string): boolean;

package/dist/utils/completion-index.js

@@ -2,6 +2,7 @@ import sortCompletionItems from "./sort-completion-items.js";
 import getUtilityInfo from "./get-utility-info.js";
 import { createDefaultCSS, defaultCSSLanguageRuntime, getMdnPseudoClassNames, getMdnPseudoElementNames } from "@master/css-language";
 import { CompletionItemKind } from "vscode-languageserver-protocol";
+import { generateSelector } from "@master/css-engine/compiler";
 //#region src/utils/completion-index.ts
 const ANIMATION_REFERENCE_PROPERTIES = /* @__PURE__ */ new Set(["animation", "animation-name"]);
 function utilityMayReferenceAnimations(utility) {
@@ -92,10 +93,7 @@ function collectClassEntries(css, runtime) {
 }
 function createPseudoClassSelectors(css) {
 	const selectors = /* @__PURE__ */ new Map([[":of", ":of"]]);
-	for (const [token, branches] of css.variants) {
-		const selector = branches.find((branch) => branch.selector)?.selector;
-		if (selector && token.startsWith(":") && !token.startsWith("::")) selectors.set(token, selector);
-	}
+	for (const [token, nodes] of css.selectors) if (token.startsWith(":") && !token.startsWith("::")) selectors.set(token, generateSelector(nodes, "&"));
 	return Array.from(selectors, ([token, selector]) => ({
 		token,
 		selector
@@ -103,13 +101,10 @@ function createPseudoClassSelectors(css) {
 }
 function createPseudoElementSelectors(css) {
 	const selectors = [];
-	for (const [token, branches] of css.variants) {
-		const selector = branches.find((branch) => branch.selector)?.selector;
-		if (selector && token.startsWith("::")) selectors.push({
-			token,
-			selector
-		});
-	}
+	for (const [token, nodes] of css.selectors) if (token.startsWith("::")) selectors.push({
+		token,
+		selector: generateSelector(nodes, "&")
+	});
 	return selectors;
 }
 function createNativeVariableNamespacesByProperty(runtime) {
@@ -182,7 +177,7 @@ function createCompletionIndex(css = createDefaultCSS(), runtime = defaultCSSLan
 		pseudoClassSelectors: createPseudoClassSelectors(css),
 		pseudoElementNames: getMdnPseudoElementNames(),
 		pseudoElementSelectors: createPseudoElementSelectors(css),
-		atRules: Array.from(css.atRules.entries())
+		conditions: Array.from(css.conditions.entries())
 	};
 }
 function matchesIndexedName(field, name) {

package/dist/utils/convert-color-token.d.ts

@@ -1,6 +1,5 @@
 import { MasterCSS } from "@master/css-language";
 import { ColorPresentationParams } from "vscode-languageserver-protocol";
-
 //#region src/utils/convert-color-token.d.ts
 declare function convertColorByToken(color: ColorPresentationParams['color'], colorToken: string, css: MasterCSS): string | undefined;
 declare function normalizeCSSColorFunctionName(fn: string): string;

package/dist/utils/create-doc.d.ts

@@ -1,5 +1,4 @@
 import { TextDocument } from "vscode-languageserver-textdocument";
-
 //#region src/utils/create-doc.d.ts
 declare const languageIdOfExt: {
   ts: string;

package/dist/utils/get-class-completion-items.d.ts

@@ -1,7 +1,6 @@
 import { MasterCSS } from "@master/css-language";
 import { CompletionItem } from "vscode-languageserver-protocol";
 import { CompletionIndex } from "./completion-index.js";
-
 //#region src/utils/get-class-completion-items.d.ts
 declare function getClassCompletionItems(css?: MasterCSS, completionIndex?: CompletionIndex): CompletionItem[];
 //#endregion

package/dist/utils/get-color-completion-items.d.ts

@@ -1,6 +1,5 @@
 import { MasterCSS } from "@master/css-language";
 import { CompletionItem } from "vscode-languageserver-protocol";
-
 //#region src/utils/get-color-completion-items.d.ts
 declare function getColorCompletionItems(css?: MasterCSS): CompletionItem[];
 //#endregion

package/dist/utils/get-pseudo-class-completion-items.d.ts

@@ -1,7 +1,6 @@
 import { MasterCSS } from "@master/css-language";
 import { CompletionItem } from "vscode-languageserver-protocol";
 import { CompletionIndex } from "./completion-index.js";
-
 //#region src/utils/get-pseudo-class-completion-items.d.ts
 declare function getPseudoClassCompletionItems(css: MasterCSS | undefined, syntax: string, completionIndex?: CompletionIndex): CompletionItem[];
 //#endregion

package/dist/utils/get-pseudo-class-completion-items.js

@@ -16,10 +16,8 @@ const functionalPseudoClassNames = /* @__PURE__ */ new Set([
 	":lang",
 	":local-link",
 	":not",
-	":nth",
 	":nth-child",
 	":nth-col",
-	":nth-last",
 	":nth-last-child",
 	":nth-last-col",
 	":nth-last-of-type",

package/dist/utils/get-pseudo-element-completion-items.d.ts

@@ -1,7 +1,6 @@
 import { MasterCSS } from "@master/css-language";
 import { CompletionItem } from "vscode-languageserver-protocol";
 import { CompletionIndex } from "./completion-index.js";
-
 //#region src/utils/get-pseudo-element-completion-items.d.ts
 declare function getPseudoElementCompletionItems(css: MasterCSS | undefined, syntax: string, completionIndex?: CompletionIndex): CompletionItem[];
 //#endregion

package/dist/utils/get-query-completion-items.d.ts

@@ -1,7 +1,6 @@
 import { MasterCSS } from "@master/css-language";
 import { CompletionItem } from "vscode-languageserver-protocol";
 import { CompletionIndex } from "./completion-index.js";
-
 //#region src/utils/get-query-completion-items.d.ts
 declare function getQueryCompletionItems(css: MasterCSS | undefined, triggerCharacter: string | undefined, syntax: string, completionIndex?: CompletionIndex): CompletionItem[];
 //#endregion

package/dist/utils/get-query-completion-items.js

@@ -1,7 +1,7 @@
 import createCSSMarkdownDocumentation from "./create-css-markdown-documentation.js";
 import sortCompletionItems from "./sort-completion-items.js";
 import { createCompletionIndex } from "./completion-index.js";
-import { AT_SIGN, QUERY_COMPARISON_OPERATORS, QUERY_LOGICAL_OPERATORS, createDefaultCSS, generateAt, generateCSS, getSingleAtNumberRuleNode, parseAt } from "@master/css-language";
+import { AT_SIGN, QUERY_COMPARISON_OPERATORS, QUERY_LOGICAL_OPERATORS, createDefaultCSS, generateCSS, generateCondition, getSingleConditionNumberNode, parseCondition } from "@master/css-language";
 import { CompletionItemKind } from "vscode-languageserver-protocol";
 //#region src/utils/get-query-completion-items.ts
 function getQueryCompletionItems(css = createDefaultCSS(), triggerCharacter = AT_SIGN, syntax, completionIndex = createCompletionIndex(css)) {
@@ -19,12 +19,12 @@ function getQueryCompletionItems(css = createDefaultCSS(), triggerCharacter = AT
 			documentation: createCSSMarkdownDocumentation(generateCSS([syntax + name + "()"], css, completionIndex.runtime))
 		});
 	});
-	const handleNumberNodes = (atRule, token) => {
-		const numberNode = getSingleAtNumberRuleNode(atRule.nodes);
+	const handleNumberNodes = (condition, token) => {
+		const numberNode = getSingleConditionNumberNode(condition.nodes);
 		if (numberNode) {
 			const prevComparisonCharacter = syntax.charAt(syntax.length - 2);
 			const comparisonCharacter = prevComparisonCharacter === ">" || prevComparisonCharacter === "<" ? prevComparisonCharacter + triggerCharacter : triggerCharacter;
-			const text = generateAt(parseAt(comparisonCharacter + token, css));
+			const text = generateCondition(parseCondition(comparisonCharacter + token, css));
 			completionItems.push({
 				label: comparisonCharacter + token,
 				sortText: CompletionItemKind.Keyword + comparisonCharacter + String(Math.round(numberNode.value)).padStart(12, "0"),
@@ -37,15 +37,15 @@ function getQueryCompletionItems(css = createDefaultCSS(), triggerCharacter = AT
 			return true;
 		}
 	};
-	for (const [token, atRule] of completionIndex.atRules) {
+	for (const [token, condition] of completionIndex.conditions) {
 		const completionItem = {
 			filterText: token,
 			insertText: token,
 			documentation: createCSSMarkdownDocumentation(generateCSS([syntax + token], css, completionIndex.runtime))
 		};
 		if ([AT_SIGN, ...QUERY_LOGICAL_OPERATORS].includes(triggerCharacter)) {
-			if (handleNumberNodes(atRule, token)) continue;
-			const text = generateAt(parseAt(triggerCharacter + token, css));
+			if (handleNumberNodes(condition, token)) continue;
+			const text = generateCondition(parseCondition(triggerCharacter + token, css));
 			completionItems.push({
 				...completionItem,
 				label: triggerCharacter + token,
@@ -54,7 +54,7 @@ function getQueryCompletionItems(css = createDefaultCSS(), triggerCharacter = AT
 				kind: CompletionItemKind.Keyword,
 				documentation: createCSSMarkdownDocumentation(generateCSS([syntax + token], css, completionIndex.runtime))
 			});
-		} else if (QUERY_COMPARISON_OPERATORS.includes(triggerCharacter)) handleNumberNodes(atRule, token);
+		} else if (QUERY_COMPARISON_OPERATORS.includes(triggerCharacter)) handleNumberNodes(condition, token);
 	}
 	return sortCompletionItems(completionItems);
 }

package/dist/utils/get-range.d.ts

@@ -1,5 +1,4 @@
 import { Range, TextDocument } from "vscode-languageserver-textdocument";
-
 //#region src/utils/get-range.d.ts
 declare function getRange(searchString: string, doc: TextDocument): Range;
 //#endregion

package/dist/utils/get-utility-info.d.ts

@@ -1,5 +1,4 @@
 import { CompiledUtility } from "@master/css-language";
-
 //#region src/utils/get-utility-info.d.ts
 declare function getUtilityInfo(utility: CompiledUtility): {
   detail: string | undefined;

package/dist/utils/get-value-completion-items.d.ts

@@ -1,7 +1,6 @@
 import { MasterCSS } from "@master/css-language";
 import { CompletionItem } from "vscode-languageserver-protocol";
 import { CompletionIndex } from "./completion-index.js";
-
 //#region src/utils/get-value-completion-items.d.ts
 declare function getValueCompletionItems(css: MasterCSS | undefined, ruleKey: string, valuePrefix?: string, completionIndex?: CompletionIndex): CompletionItem[];
 //#endregion

package/dist/utils/query-syntax-completions.d.ts

@@ -1,7 +1,6 @@
 import { MasterCSS } from "@master/css-language";
 import { CompletionItem } from "vscode-languageserver-protocol";
 import { CompletionIndex } from "./completion-index.js";
-
 //#region src/utils/query-syntax-completions.d.ts
 declare function querySyntaxCompletions(q?: string, css?: MasterCSS, completionIndex?: CompletionIndex): CompletionItem[] | undefined;
 //#endregion

package/dist/utils/sort-completion-items.d.ts

@@ -1,5 +1,4 @@
 import { CompletionItem } from "vscode-languageserver-protocol";
-
 //#region src/utils/sort-completion-items.d.ts
 declare function sortCompletionItems(items: CompletionItem[]): CompletionItem[];
 //#endregion

package/package.json

@@ -16,14 +16,14 @@
     "minimatch": "^10.2.5",
     "vscode-languageserver-protocol": "^3.18.0",
     "vscode-languageserver-textdocument": "^1.0.12",
-    "@master/css": "^2.0.0-rc.85",
-    "@master/css-engine": "^2.0.0-rc.85",
-    "@master/css-language": "^2.0.0-rc.85"
+    "@master/css": "^2.0.0-rc.87",
+    "@master/css-engine": "^2.0.0-rc.87",
+    "@master/css-language": "^2.0.0-rc.87"
   },
   "devDependencies": {
     "@types/vscode": "^1.125.0",
     "vscode-languageserver": "^10.0.0",
-    "@master/css-schema": "^2.0.0-rc.85"
+    "@master/css-schema": "^2.0.0-rc.87"
   },
   "sideEffects": false,
   "main": "./dist/index.js",
@@ -50,7 +50,7 @@
     "access": "public",
     "provenance": true
   },
-  "version": "2.0.0-rc.85",
+  "version": "2.0.0-rc.87",
   "scripts": {
     "build": "tsdown --config ../../shared/tsdown-package.config.ts",
     "dev": "tsdown --config ../../shared/tsdown-package.config.ts --watch",