@master/css-language-server 2.0.0-rc.69 → 2.0.0-rc.70

package/README.md

@@ -48,16 +48,55 @@
             <img alt="Follow @mastercorg" src="https://img.shields.io/static/v1?label=%20&message=twitter&color=f6f7f8&logo=twitter&style=for-the-badge">
         </picture>
     </a>
-    <a aria-label="Github Actions" href="https://github.com/master-co/css/actions/workflows/release.yml">
+    <a aria-label="Github Actions" href="https://github.com/master-co/css/actions/workflows/ci-release.yml">
         <picture>
-            <source media="(prefers-color-scheme: dark)" srcset="https://img.shields.io/github/actions/workflow/status/master-co/css/release.yml?branch=rc&label=%20&message=twitter&color=212022&logo=githubactions&style=for-the-badge">
-            <source media="(prefers-color-scheme: light)" srcset="https://img.shields.io/github/actions/workflow/status/master-co/css/release.yml?branch=rc&label=%20&message=twitter&color=f6f7f8&logo=githubactions&style=for-the-badge&logoColor=%23000">
-            <img alt="Github release actions" src="https://img.shields.io/github/actions/workflow/status/master-co/css/release.yml?branch=rc&label=%20&message=twitter&color=f6f7f8&logo=githubactions&style=for-the-badge&logoColor=%23000">
+            <source media="(prefers-color-scheme: dark)" srcset="https://img.shields.io/github/actions/workflow/status/master-co/css/ci-release.yml?branch=rc&label=%20&message=twitter&color=212022&logo=githubactions&style=for-the-badge">
+            <source media="(prefers-color-scheme: light)" srcset="https://img.shields.io/github/actions/workflow/status/master-co/css/ci-release.yml?branch=rc&label=%20&message=twitter&color=f6f7f8&logo=githubactions&style=for-the-badge&logoColor=%23000">
+            <img alt="Github release actions" src="https://img.shields.io/github/actions/workflow/status/master-co/css/ci-release.yml?branch=rc&label=%20&message=twitter&color=f6f7f8&logo=githubactions&style=for-the-badge&logoColor=%23000">
         </picture>
     </a>
 </p>
 
 </div>
 
-## Documentation
-Check out the official [documentation](https://rc.css.master.co/reference/language-server).
+## Installation
+
+```bash
+npm install @master/css-language-server
+```
+
+## Usage
+
+```js
+import CSSLanguageServer from '@master/css-language-server'
+
+const languageServer = new CSSLanguageServer(connection, customSettings)
+```
+
+`CSSLanguageServer` wraps `@master/css-language-service` with LSP workspace lifecycle, completion, hover, document color, color presentation, and semantic token handlers.
+
+## Semantic tokens
+
+The language server supports full-document and active-position semantic tokens.
+
+| `embeddedSyntaxHighlighting` | Behavior |
+| --- | --- |
+| `always` | Advertises the standard LSP `semanticTokensProvider` and handles `textDocument/semanticTokens/full`. |
+| `active` | Uses the VS Code extension request for active class-context highlighting. |
+| `off` | Disables embedded utility highlighting. |
+
+CSS directive syntax is highlighted by the shared TextMate grammar. Server semantic tokens cover Master CSS class-list spans and directive class-list spans such as `@compose` and `@safelist`.
+
+## Settings
+
+```js
+import { settings } from '@master/css-language-server'
+```
+
+| Setting | Type | Default | Description |
+| --- | --- | --- | --- |
+| `workspaces` | `FastGlobPattern[] \| 'auto'` | `'auto'` | Workspace roots where independent language services are created. The root workspace is always included. |
+| `verbose` | `boolean` | `false` | Print server logs. |
+| `embeddedSyntaxHighlighting` | `'active' \| 'always' \| 'off'` | `'active'` | Inherited language-service semantic token mode. |
+
+With `workspaces: 'auto'`, the server creates workspaces from CSS files containing `@master;` or `@import '@master/css'`, and from `package.json` files that declare Master CSS package dependencies.

package/dist/core.d.ts

@@ -1,4 +1,4 @@
-import { TextDocuments, InitializeParams, WorkspaceFolder, Connection, ClientCapabilities, TextDocumentChangeEvent, DidChangeConfigurationParams, HoverParams, CompletionParams, DocumentColorParams, ColorPresentationParams, RemoteConsole } from 'vscode-languageserver/node';
+import { TextDocuments, InitializeParams, InitializeResult, WorkspaceFolder, Connection, ClientCapabilities, TextDocumentChangeEvent, DidChangeConfigurationParams, HoverParams, CompletionParams, DocumentColorParams, ColorPresentationParams, RemoteConsole, SemanticTokensParams, TextDocumentPositionParams } from 'vscode-languageserver/node';
 import { TextDocument } from 'vscode-languageserver-textdocument';
 import CSSLanguageService, { Settings as CSSLanguageServiceSettings } from '@master/css-language-service';
 import { Settings } from './settings';
@@ -7,7 +7,10 @@ export declare interface Workspace {
     openedTextDocuments: TextDocument[];
     languageService?: CSSLanguageService;
     languageServiceSettings: CSSLanguageServiceSettings;
+    planEntries?: string[];
 }
+export declare const ACTIVE_SEMANTIC_TOKENS_REQUEST = "masterCSS/renderActiveSemanticTokens";
+export declare const DOCUMENT_SEMANTIC_TOKENS_REQUEST = "masterCSS/renderDocumentSemanticTokens";
 export default class CSSLanguageServer {
     connection: Connection;
     customSettings?: Settings | undefined;
@@ -23,20 +26,28 @@ export default class CSSLanguageServer {
     constructor(connection?: Connection, customSettings?: Settings | undefined);
     start(): void;
     init(): Promise<void>;
-    onInitialize(params: InitializeParams): {
-        capabilities: import("vscode-languageserver").ServerCapabilities<any>;
-    };
-    onHover(params: HoverParams): Promise<import("vscode-languageserver").Hover | undefined>;
-    onCompletion(params: CompletionParams): Promise<import("vscode-languageserver").CompletionItem[] | undefined>;
-    onDocumentColor(params: DocumentColorParams): Promise<import("vscode-languageserver").ColorInformation[] | undefined>;
-    onColorPresentation(params: ColorPresentationParams): Promise<import("vscode-languageserver").ColorPresentation[] | undefined>;
+    onInitialize(params: InitializeParams): InitializeResult;
+    onHover(params: HoverParams): Promise<import("vscode-languageserver-protocol").Hover | undefined>;
+    onCompletion(params: CompletionParams): Promise<import("vscode-languageserver-protocol").CompletionItem[] | undefined>;
+    onDocumentColor(params: DocumentColorParams): Promise<import("vscode-languageserver-protocol").ColorInformation[]>;
+    onColorPresentation(params: ColorPresentationParams): Promise<import("vscode-languageserver-protocol").ColorPresentation[]>;
+    onSemanticTokens(params: SemanticTokensParams): Promise<import("vscode-languageserver-protocol").SemanticTokens>;
+    onDocumentSemanticTokens(params: SemanticTokensParams): Promise<import("vscode-languageserver-protocol").SemanticTokens>;
+    onActiveSemanticTokens(params: TextDocumentPositionParams): Promise<import("vscode-languageserver-protocol").SemanticTokens>;
     onDidOpen(params: TextDocumentChangeEvent<TextDocument>): Promise<void>;
+    onDidChangeContent(params: TextDocumentChangeEvent<TextDocument>): Promise<void>;
     onDidClose(params: TextDocumentChangeEvent<TextDocument>): Promise<void>;
     onDidSave(params: TextDocumentChangeEvent<TextDocument>): Promise<void>;
-    onDidChangeConfiguration({ settings }: DidChangeConfigurationParams): Promise<void>;
+    onDidChangeConfiguration({ settings: changedSettings }: DidChangeConfigurationParams): Promise<void>;
     private initWorkspaceFolder;
-    initWorkspaceLanguageService(workspace: Workspace): void;
+    initWorkspaceLanguageService(workspace: Workspace): Promise<void>;
+    private loadWorkspacePlan;
     destroyLanguageService(workspace: Workspace): void;
     findClosestWorkspace(textDocumentURI: string): Workspace;
+    private publishCSSDirectiveDiagnostics;
+    private createCSSDirectiveDiagnostic;
+    private createCSSDirectiveRelatedInformation;
+    private createCSSDirectiveRange;
+    private refreshSemanticTokens;
     stop(): void;
 }

package/dist/core.mjs

@@ -1,13 +1,120 @@
-import { createConnection, TextDocuments } from 'vscode-languageserver/node';
+import { TextDocumentSyncKind, TextDocuments, createConnection, DiagnosticSeverity } from 'vscode-languageserver/node';
 import { TextDocument } from 'vscode-languageserver-textdocument';
 import path from 'node:path';
-import CSSLanguageService, { SERVER_CAPABILITIES } from '@master/css-language-service';
-import exploreConfig from '@master/css-explore-config';
+import CSSLanguageService from '@master/css-language-service';
+import { compileCSSManifest } from '@master/css-compiler';
+import { findMasterCSSWorkspaceDirectories, findCSSManifestEntryFiles } from '@master/css-project/entries';
+import { loadProjectManifest } from '@master/css-project/manifest';
 import extend from '@techor/extend';
 import settings from './settings.mjs';
+import { INVOKED_TRIGGER_CHARACTERS, VALUE_TRIGGER_CHARACTERS, SELECTOR_TRIGGER_CHARACTERS, QUERY_TRIGGER_CHARACTERS, DECLARATION_SEPARATOR_TRIGGER_CHARACTER, AT_TRIGGER_CHARACTER, GROUP_TRIGGER_CHARACTER } from '@master/css-language-service/common';
+import { SEMANTIC_TOKENS_LEGEND } from '@master/css-language';
 import glob from 'fast-glob';
 import { URI } from 'vscode-uri';
+import { CSSDirectiveError } from '@master/css-schema/css-directives';
 
+const ACTIVE_SEMANTIC_TOKENS_REQUEST = 'masterCSS/renderActiveSemanticTokens';
+const DOCUMENT_SEMANTIC_TOKENS_REQUEST = 'masterCSS/renderDocumentSemanticTokens';
+const SERVER_CAPABILITIES = {
+    textDocumentSync: TextDocumentSyncKind.Incremental,
+    completionProvider: {
+        resolveProvider: false,
+        workDoneProgress: false,
+        triggerCharacters: [
+            ...new Set([
+                ...INVOKED_TRIGGER_CHARACTERS,
+                ...VALUE_TRIGGER_CHARACTERS,
+                ...SELECTOR_TRIGGER_CHARACTERS,
+                ...QUERY_TRIGGER_CHARACTERS,
+                DECLARATION_SEPARATOR_TRIGGER_CHARACTER,
+                AT_TRIGGER_CHARACTER,
+                GROUP_TRIGGER_CHARACTER
+            ])
+        ]
+    },
+    colorProvider: true,
+    hoverProvider: true,
+    semanticTokensProvider: {
+        legend: SEMANTIC_TOKENS_LEGEND,
+        full: true
+    },
+    workspace: {
+        workspaceFolders: {
+            supported: true
+        }
+    }
+};
+const CSS_DIAGNOSTIC_LANGUAGE_IDS = new Set([
+    'css',
+    'scss',
+    'less'
+]);
+const SFC_DIAGNOSTIC_LANGUAGE_IDS = new Set([
+    'vue',
+    'svelte',
+    'astro'
+]);
+const STYLE_BLOCK_RE = /<style\b([^>]*)>([\s\S]*?)<\/style>/gi;
+function isCSSDiagnosticDocument(textDocument) {
+    return CSS_DIAGNOSTIC_LANGUAGE_IDS.has(textDocument.languageId) || SFC_DIAGNOSTIC_LANGUAGE_IDS.has(textDocument.languageId);
+}
+function getSFCStyleLanguage(attributes) {
+    const match = /\blang\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s>]+))/i.exec(attributes);
+    return (match?.[1] || match?.[2] || match?.[3] || 'css').toLowerCase();
+}
+function getCSSDiagnosticSources(textDocument) {
+    const text = textDocument.getText();
+    if (CSS_DIAGNOSTIC_LANGUAGE_IDS.has(textDocument.languageId)) {
+        return [
+            {
+                source: text,
+                offset: 0
+            }
+        ];
+    }
+    if (!SFC_DIAGNOSTIC_LANGUAGE_IDS.has(textDocument.languageId)) return [];
+    const sources = [];
+    STYLE_BLOCK_RE.lastIndex = 0;
+    for (const match of text.matchAll(STYLE_BLOCK_RE)){
+        const styleLanguage = getSFCStyleLanguage(match[1]);
+        if (!CSS_DIAGNOSTIC_LANGUAGE_IDS.has(styleLanguage)) continue;
+        const source = match[2];
+        const offset = (match.index || 0) + match[0].indexOf(source);
+        sources.push({
+            source,
+            offset
+        });
+    }
+    return sources;
+}
+function isCSSDirectiveError(error) {
+    return error instanceof CSSDirectiveError || !!error && typeof error === 'object' && error.name === 'CSSDirectiveError' && typeof error.code === 'string';
+}
+function getInitializationSettings(initializationOptions) {
+    if (!initializationOptions || typeof initializationOptions !== 'object') return;
+    const options = initializationOptions;
+    return options.masterCSS ?? options;
+}
+function isWindowsFilePath(fsPath) {
+    return /^[a-z]:[\\/]/i.test(fsPath) || fsPath.startsWith('\\\\') || fsPath.startsWith('//');
+}
+function getFilePathTools(...fsPaths) {
+    return fsPaths.some(isWindowsFilePath) ? path.win32 : path;
+}
+function toComparableFilePath(uri) {
+    const parsedURI = URI.parse(uri);
+    if (parsedURI.scheme !== 'file') return;
+    const fsPath = parsedURI.fsPath;
+    if (!fsPath) return;
+    const filePathTools = getFilePathTools(fsPath);
+    const resolvedPath = filePathTools.resolve(fsPath);
+    return isWindowsFilePath(resolvedPath) ? resolvedPath.toLowerCase() : resolvedPath;
+}
+function containsFilePath(parentPath, childPath) {
+    const filePathTools = getFilePathTools(parentPath, childPath);
+    const relativePath = filePathTools.relative(parentPath, childPath);
+    return relativePath === '' || !!relativePath && relativePath !== '..' && !relativePath.startsWith(`..${filePathTools.sep}`) && !filePathTools.isAbsolute(relativePath);
+}
 class CSSLanguageServer {
     connection;
     customSettings;
@@ -29,6 +136,7 @@ class CSSLanguageServer {
         this.customSettings = customSettings;
         this.documents = new TextDocuments(TextDocument);
         this.settings = extend(settings, this.customSettings);
+        this.globalWorkspace.languageServiceSettings = this.settings;
         this.console = new Proxy(this.connection.console, {
             get: (target, prop)=>{
                 if (!this.settings?.verbose) return ()=>{};
@@ -37,7 +145,7 @@ class CSSLanguageServer {
         });
     }
     start() {
-        this.disposables.push(this.documents.onDidSave(this.onDidSave.bind(this)), this.documents.onDidOpen(this.onDidOpen.bind(this)), this.documents.onDidClose(this.onDidClose.bind(this)), this.documents.listen(this.connection), this.connection.onDidChangeConfiguration(this.onDidChangeConfiguration.bind(this)), this.connection.onHover(this.onHover.bind(this)), this.connection.onCompletion(this.onCompletion.bind(this)), this.connection.onDocumentColor(this.onDocumentColor.bind(this)), this.connection.onColorPresentation(this.onColorPresentation.bind(this)), this.connection.onInitialize(this.onInitialize.bind(this)), this.connection.onInitialized(()=>this.init()));
+        this.disposables.push(this.documents.onDidSave(this.onDidSave.bind(this)), this.documents.onDidOpen(this.onDidOpen.bind(this)), this.documents.onDidChangeContent(this.onDidChangeContent.bind(this)), this.documents.onDidClose(this.onDidClose.bind(this)), this.documents.listen(this.connection), this.connection.onDidChangeConfiguration(this.onDidChangeConfiguration.bind(this)), this.connection.onHover(this.onHover.bind(this)), this.connection.onCompletion(this.onCompletion.bind(this)), this.connection.onDocumentColor(this.onDocumentColor.bind(this)), this.connection.onColorPresentation(this.onColorPresentation.bind(this)), this.connection.languages.semanticTokens.on(this.onSemanticTokens.bind(this)), this.connection.onRequest(DOCUMENT_SEMANTIC_TOKENS_REQUEST, this.onDocumentSemanticTokens.bind(this)), this.connection.onRequest(ACTIVE_SEMANTIC_TOKENS_REQUEST, this.onActiveSemanticTokens.bind(this)), this.connection.onInitialize(this.onInitialize.bind(this)), this.connection.onInitialized(()=>this.init()));
         this.connection.listen();
     }
     init() {
@@ -49,11 +157,23 @@ class CSSLanguageServer {
     }
     onInitialize(params) {
         this.clientCapabilities = params.capabilities;
+        const initializationSettings = getInitializationSettings(params.initializationOptions);
+        if (initializationSettings) {
+            this.customSettings = extend(this.customSettings, initializationSettings);
+            this.settings = extend(settings, this.customSettings);
+            this.globalWorkspace.languageServiceSettings = this.settings;
+        }
         if (params.workspaceFolders?.length) {
             this.workspaceFolders = params.workspaceFolders;
         }
+        const capabilities = {
+            ...SERVER_CAPABILITIES
+        };
+        if (this.settings?.embeddedSyntaxHighlighting !== 'always') {
+            delete capabilities.semanticTokensProvider;
+        }
         return {
-            capabilities: SERVER_CAPABILITIES
+            capabilities
         };
     }
     async onHover(params) {
@@ -77,31 +197,77 @@ class CSSLanguageServer {
         const workspace = this.findClosestWorkspace(params.textDocument.uri);
         if (workspace?.languageService) {
             const document = this.documents.get(params.textDocument.uri);
-            if (document) return workspace.languageService.renderSyntaxColors(document);
+            if (document) return await workspace.languageService.renderSyntaxColors(document) ?? [];
         }
+        return [];
     }
     async onColorPresentation(params) {
         await this.init();
         const workspace = this.findClosestWorkspace(params.textDocument.uri);
         if (workspace?.languageService) {
             const document = this.documents.get(params.textDocument.uri);
-            if (document) return workspace.languageService.editSyntaxColors(document, params.color, params.range);
+            if (document) return workspace.languageService.editSyntaxColors(document, params.color, params.range) ?? [];
         }
+        return [];
+    }
+    async onSemanticTokens(params) {
+        await this.init();
+        const workspace = this.findClosestWorkspace(params.textDocument.uri);
+        if (workspace?.languageService) {
+            const document = this.documents.get(params.textDocument.uri) ?? workspace.openedTextDocuments.find((document)=>document.uri === params.textDocument.uri);
+            if (document) return workspace.languageService.renderSemanticTokens(document) ?? {
+                data: []
+            };
+        }
+        return {
+            data: []
+        };
+    }
+    async onDocumentSemanticTokens(params) {
+        return this.onSemanticTokens(params);
+    }
+    async onActiveSemanticTokens(params) {
+        await this.init();
+        const workspace = this.findClosestWorkspace(params.textDocument.uri);
+        if (workspace?.languageService) {
+            const document = this.documents.get(params.textDocument.uri) ?? workspace.openedTextDocuments.find((document)=>document.uri === params.textDocument.uri);
+            if (document) return workspace.languageService.renderSemanticTokensAtPosition(document, params.position) ?? {
+                data: []
+            };
+        }
+        return {
+            data: []
+        };
     }
     async onDidOpen(params) {
         await this.init();
         const workspace = this.findClosestWorkspace(params.document.uri);
-        if (!workspace || workspace.openedTextDocuments.includes(params.document)) return;
+        if (!workspace) return;
+        if (workspace.openedTextDocuments.includes(params.document)) {
+            this.publishCSSDirectiveDiagnostics(params.document, workspace);
+            return;
+        }
         if (!workspace.openedTextDocuments.length) {
-            this.initWorkspaceLanguageService(workspace);
+            await this.initWorkspaceLanguageService(workspace);
         }
         workspace.openedTextDocuments.push(params.document);
+        this.publishCSSDirectiveDiagnostics(params.document, workspace);
+    }
+    async onDidChangeContent(params) {
+        await this.init();
+        const workspace = this.findClosestWorkspace(params.document.uri);
+        if (!workspace) return;
+        this.publishCSSDirectiveDiagnostics(params.document, workspace);
     }
     async onDidClose(params) {
         await this.init();
         const workspace = this.findClosestWorkspace(params.document.uri);
         if (!workspace) return;
         workspace.openedTextDocuments.splice(workspace.openedTextDocuments.indexOf(params.document), 1);
+        this.connection.sendDiagnostics({
+            uri: params.document.uri,
+            diagnostics: []
+        });
         if (!workspace.openedTextDocuments.length) {
             this.destroyLanguageService(workspace);
         }
@@ -110,21 +276,34 @@ class CSSLanguageServer {
         await this.init();
         const workspace = this.findClosestWorkspace(params.document.uri);
         if (!workspace) return;
-        const name = path.parse(params.document.uri).name;
-        if (name === 'master.css' || name.endsWith('.css')) {
+        this.publishCSSDirectiveDiagnostics(params.document, workspace);
+        const name = path.basename(URI.parse(params.document.uri).fsPath);
+        if (name.endsWith('.css')) {
+            this.refreshSemanticTokens();
             this.connection.sendRequest('masterCSS/restart', {
                 title: 'Updating Master CSS configuration'
             });
         }
     }
-    async onDidChangeConfiguration({ settings }) {
+    async onDidChangeConfiguration({ settings: changedSettings }) {
         await this.init();
-        if (settings?.masterCSS) {
-            this.connection.sendNotification('masterCSS/globalSettingsChanged', settings.masterCSS);
-            this.customSettings = settings.masterCSS;
+        if (changedSettings?.masterCSS) {
+            this.connection.sendNotification('masterCSS/globalSettingsChanged', changedSettings.masterCSS);
+            this.customSettings = changedSettings.masterCSS;
+            this.settings = extend(settings, this.customSettings);
+            this.globalWorkspace.languageServiceSettings = this.settings;
+            this.refreshSemanticTokens();
             this.connection.sendRequest('masterCSS/restart', {
                 title: 'Updating Master CSS settings'
             });
+            for (const workspace of [
+                this.globalWorkspace,
+                ...this.workspaces.values()
+            ]){
+                for (const document of workspace.openedTextDocuments){
+                    this.publishCSSDirectiveDiagnostics(document, workspace);
+                }
+            }
         }
     }
     async initWorkspaceFolder(workspaceFolderURI) {
@@ -146,14 +325,9 @@ class CSSLanguageServer {
             this.console.info(`Registered global workspace folder`);
         }
         if (workspaces === 'auto') {
-            (await glob('**/master.css.*', {
-                cwd: workspaceFolderCWD,
-                absolute: true,
-                onlyFiles: true,
-                ignore: [
-                    '**/node_modules/**'
-                ]
-            })).forEach((workspaceFile)=>resolvedWorkspaceDirectories.add(path.dirname(path.resolve(workspaceFile))));
+            for (const workspaceDir of (await findMasterCSSWorkspaceDirectories(workspaceFolderCWD))){
+                resolvedWorkspaceDirectories.add(workspaceDir);
+            }
         } else if (workspaces?.length) {
             (await glob(workspaces, {
                 cwd: workspaceFolderCWD,
@@ -164,55 +338,142 @@ class CSSLanguageServer {
                 ]
             })).forEach((workspaceDir)=>resolvedWorkspaceDirectories.add(path.resolve(workspaceDir)));
         }
-        resolvedWorkspaceDirectories.forEach(async (workspaceDir)=>{
+        for (const workspaceDir of resolvedWorkspaceDirectories){
             const workspaceURI = URI.file(workspaceDir).toString();
             this.console.info(`Added workspace ${workspaceURI}`);
             this.workspaces.set(workspaceURI, {
                 uri: workspaceURI,
                 openedTextDocuments: [],
-                languageServiceSettings
+                languageServiceSettings,
+                planEntries: await findCSSManifestEntryFiles(workspaceDir)
             });
-        });
+        }
     }
-    initWorkspaceLanguageService(workspace) {
-        let workspaceConfig;
+    async initWorkspaceLanguageService(workspace) {
+        let workspacePlan;
         if (workspace !== this.globalWorkspace) {
             try {
-                workspaceConfig = exploreConfig({
-                    cwd: workspace.uri && URI.parse(workspace.uri).fsPath,
-                    found: undefined
-                });
+                workspacePlan = await this.loadWorkspacePlan(workspace);
             } catch (e) {
-                this.console.info(`Failed to load config from ${workspace}`);
-                this.console.error(e);
+                this.console.info(`Failed to load manifest from ${workspace.uri}`);
+                this.console.error(e instanceof Error ? e.stack : e.toString());
             }
-            if (workspaceConfig) {
-                this.console.info(`Initialized workspace ${workspaceConfig ? '(with config file)' : ''} ${workspace.uri}`);
+            if (workspacePlan) {
+                this.console.info(`Initialized workspace ${workspace.planEntries?.length ? '(with manifest entry)' : '(with manifest)'} ${workspace.uri}`);
             } else {
                 this.console.info(`Initialized workspace ${workspace.uri}`);
             }
         }
         workspace.languageService = new CSSLanguageService({
             ...workspace.languageServiceSettings,
-            config: workspaceConfig
+            manifest: workspacePlan
         });
     }
+    async loadWorkspacePlan(workspace) {
+        const cwd = workspace.uri ? URI.parse(workspace.uri).fsPath : process.cwd();
+        const result = await loadProjectManifest(cwd);
+        return result.entries.length ? result.manifest : workspace.languageServiceSettings.manifest;
+    }
     destroyLanguageService(workspace) {
         this.console.info(`Destroyed workspace ${workspace.uri}`);
         delete workspace.languageService;
     }
     findClosestWorkspace(textDocumentURI) {
+        const documentPath = toComparableFilePath(textDocumentURI);
+        if (!documentPath) {
+            this.console.info(`This is an external document ${textDocumentURI} with the global workspace`);
+            return this.globalWorkspace;
+        }
         let foundWorkspace;
+        let foundWorkspacePath = '';
         for (const [uri, workspace] of this.workspaces){
             if (!uri) continue;
-            if (textDocumentURI.startsWith(uri) && (!foundWorkspace || uri.length > (foundWorkspace.uri || '').length)) {
+            const workspacePath = toComparableFilePath(uri);
+            if (!workspacePath) continue;
+            if (containsFilePath(workspacePath, documentPath) && workspacePath.length > foundWorkspacePath.length) {
                 foundWorkspace = workspace;
+                foundWorkspacePath = workspacePath;
             }
         }
         if (foundWorkspace) return foundWorkspace;
         this.console.info(`This is an external document ${textDocumentURI} with the global workspace`);
         return this.globalWorkspace;
     }
+    publishCSSDirectiveDiagnostics(textDocument, workspace) {
+        if (!isCSSDiagnosticDocument(textDocument)) return;
+        const diagnostics = [];
+        const documentFile = path.resolve(URI.parse(textDocument.uri).fsPath);
+        for (const { source, offset } of getCSSDiagnosticSources(textDocument)){
+            try {
+                compileCSSManifest(source, {
+                    from: documentFile
+                });
+            } catch (error) {
+                if (!isCSSDirectiveError(error)) continue;
+                const diagnostic = this.createCSSDirectiveDiagnostic(error, textDocument, documentFile, offset);
+                if (diagnostic) diagnostics.push(diagnostic);
+            }
+        }
+        this.connection.sendDiagnostics({
+            uri: textDocument.uri,
+            diagnostics
+        });
+    }
+    createCSSDirectiveDiagnostic(error, textDocument, documentFile, sourceOffset) {
+        if (error.source?.file && path.resolve(error.source.file) !== documentFile) return;
+        return {
+            range: this.createCSSDirectiveRange(error.source, textDocument, documentFile, sourceOffset),
+            severity: DiagnosticSeverity.Error,
+            code: error.code,
+            source: 'Master CSS',
+            message: error.message,
+            relatedInformation: this.createCSSDirectiveRelatedInformation(error.related, textDocument, documentFile, sourceOffset)
+        };
+    }
+    createCSSDirectiveRelatedInformation(related, textDocument, documentFile, sourceOffset) {
+        if (!related?.length) return;
+        return related.map(({ message, source })=>({
+                message,
+                location: {
+                    uri: source?.file ? URI.file(source.file).toString() : textDocument.uri,
+                    range: this.createCSSDirectiveRange(source, textDocument, documentFile, sourceOffset)
+                }
+            }));
+    }
+    createCSSDirectiveRange(source, textDocument, documentFile, sourceOffset) {
+        if (source?.file && path.resolve(source.file) !== documentFile) {
+            return source.loc ? {
+                start: {
+                    line: Math.max(0, source.loc.start.line - 1),
+                    character: Math.max(0, source.loc.start.column - 1)
+                },
+                end: {
+                    line: Math.max(0, source.loc.end.line - 1),
+                    character: Math.max(0, source.loc.end.column - 1)
+                }
+            } : {
+                start: {
+                    line: 0,
+                    character: 0
+                },
+                end: {
+                    line: 0,
+                    character: 0
+                }
+            };
+        }
+        const start = Math.max(0, (source?.range.start || 0) + sourceOffset);
+        const end = Math.max(start, (source?.range.end || 0) + sourceOffset);
+        return {
+            start: textDocument.positionAt(start),
+            end: textDocument.positionAt(end)
+        };
+    }
+    refreshSemanticTokens() {
+        if (this.settings?.embeddedSyntaxHighlighting !== 'always') return;
+        if (!this.clientCapabilities.workspace?.semanticTokens?.refreshSupport) return;
+        this.connection.languages.semanticTokens.refresh();
+    }
     stop() {
         this.connection.sendNotification('masterCSS/dispose');
         this.disposables.forEach((disposable)=>disposable.dispose());
@@ -222,4 +483,4 @@ class CSSLanguageServer {
     }
 }
 
-export { CSSLanguageServer as default };
+export { ACTIVE_SEMANTIC_TOKENS_REQUEST, DOCUMENT_SEMANTIC_TOKENS_REQUEST, CSSLanguageServer as default };

package/dist/index.d.ts

@@ -1,3 +1,4 @@
 export { default, default as CSSLanguageServer } from './core';
+export { ACTIVE_SEMANTIC_TOKENS_REQUEST, DOCUMENT_SEMANTIC_TOKENS_REQUEST } from './core';
 export { default as settings, type Settings } from './settings';
 export type { Workspace } from './core';

package/dist/index.mjs

@@ -1,2 +1,2 @@
-export { default as CSSLanguageServer, default } from './core.mjs';
+export { ACTIVE_SEMANTIC_TOKENS_REQUEST, default as CSSLanguageServer, DOCUMENT_SEMANTIC_TOKENS_REQUEST, default } from './core.mjs';
 export { default as settings } from './settings.mjs';

package/package.json

@@ -1 +1 @@
-{"name":"@master/css-language-server","type":"module","scripts":{"build":"techor build \"src/**/*.ts\"","dev":"pnpm build --watch","type-check":"tsc --noEmit","lint":"eslint","test":"vitest"},"description":"Master CSS Language Server","author":"Aoyue Design LLC.","license":"MIT","repository":{"type":"git","url":"https://github.com/master-co/css.git","directory":"packages/language-server"},"dependencies":{"@master/css":"^2.0.0-rc.69","@master/css-explore-config":"^2.0.0-rc.69","@master/css-language-service":"^2.0.0-rc.69","@techor/extend":"^3.2.5","fast-glob":"^3.3.2","js-beautify":"^1.15.1","nanoid":"^5.0.6","vscode-languageserver":"^9.0.1","vscode-languageserver-textdocument":"^1.0.11","vscode-uri":"^3.0.8"},"devDependencies":{"shared":"^2.0.0-rc.69"},"sideEffects":false,"main":"./dist/index.cjs","module":"./dist/index.mjs","jsnext:main":"./dist/index.mjs","esnext":"./dist/index.mjs","types":"./dist/index.d.ts","exports":{".":{"types":"./dist/index.d.ts","import":"./dist/index.mjs","require":"./dist/index.cjs"}},"files":["dist"],"publishConfig":{"access":"public","provenance":true},"version":"2.0.0-rc.69"}
+{"name":"@master/css-language-server","type":"module","scripts":{"build":"techor build \"src/**/*.ts\" --formats esm","dev":"pnpm build --watch","type-check":"tsc --noEmit","lint":"eslint","test":"vitest"},"description":"Master CSS Language Server","author":"Aoyue Design LLC.","license":"MIT","repository":{"type":"git","url":"https://github.com/master-co/css.git","directory":"packages/language-server"},"dependencies":{"@master/css":"^2.0.0-rc.70","@master/css-compiler":"^2.0.0-rc.70","@master/css-language":"^2.0.0-rc.70","@master/css-language-service":"^2.0.0-rc.70","@master/css-project":"^2.0.0-rc.70","@techor/extend":"^3.2.5","fast-glob":"^3.3.3","js-beautify":"^1.15.4","nanoid":"^5.1.15","vscode-languageserver":"^10.0.0","vscode-languageserver-textdocument":"^1.0.12","vscode-uri":"^3.1.0","@master/css-schema":"^2.0.0-rc.70"},"sideEffects":false,"main":"./dist/index.mjs","module":"./dist/index.mjs","jsnext:main":"./dist/index.mjs","esnext":"./dist/index.mjs","types":"./dist/index.d.ts","exports":{".":{"types":"./dist/index.d.ts","import":"./dist/index.mjs","default":"./dist/index.mjs"}},"files":["dist"],"publishConfig":{"access":"public","provenance":true},"version":"2.0.0-rc.70"}

package/dist/core.cjs

@@ -1,227 +0,0 @@
-'use strict';
-
-var node = require('vscode-languageserver/node');
-var vscodeLanguageserverTextdocument = require('vscode-languageserver-textdocument');
-var path = require('node:path');
-var CSSLanguageService = require('@master/css-language-service');
-var exploreConfig = require('@master/css-explore-config');
-var extend = require('@techor/extend');
-var settings = require('./settings.cjs');
-var glob = require('fast-glob');
-var vscodeUri = require('vscode-uri');
-
-class CSSLanguageServer {
-    connection;
-    customSettings;
-    workspaceFolders = [];
-    workspaces = new Map();
-    globalWorkspace = {
-        uri: '',
-        openedTextDocuments: [],
-        languageServiceSettings: this.settings
-    };
-    documents;
-    initializing;
-    clientCapabilities = {};
-    settings;
-    console;
-    disposables = [];
-    constructor(connection = process.argv.includes('--stdio') ? node.createConnection(process.stdin, process.stdout) : node.createConnection(), customSettings){
-        this.connection = connection;
-        this.customSettings = customSettings;
-        this.documents = new node.TextDocuments(vscodeLanguageserverTextdocument.TextDocument);
-        this.settings = extend(settings, this.customSettings);
-        this.console = new Proxy(this.connection.console, {
-            get: (target, prop)=>{
-                if (!this.settings?.verbose) return ()=>{};
-                return this.connection.console[prop];
-            }
-        });
-    }
-    start() {
-        this.disposables.push(this.documents.onDidSave(this.onDidSave.bind(this)), this.documents.onDidOpen(this.onDidOpen.bind(this)), this.documents.onDidClose(this.onDidClose.bind(this)), this.documents.listen(this.connection), this.connection.onDidChangeConfiguration(this.onDidChangeConfiguration.bind(this)), this.connection.onHover(this.onHover.bind(this)), this.connection.onCompletion(this.onCompletion.bind(this)), this.connection.onDocumentColor(this.onDocumentColor.bind(this)), this.connection.onColorPresentation(this.onColorPresentation.bind(this)), this.connection.onInitialize(this.onInitialize.bind(this)), this.connection.onInitialized(()=>this.init()));
-        this.connection.listen();
-    }
-    init() {
-        if (this.initializing) return this.initializing;
-        return this.initializing = new Promise(async (resolve)=>{
-            await Promise.all(this.workspaceFolders.map((folder)=>this.initWorkspaceFolder(folder.uri)));
-            resolve();
-        });
-    }
-    onInitialize(params) {
-        this.clientCapabilities = params.capabilities;
-        if (params.workspaceFolders?.length) {
-            this.workspaceFolders = params.workspaceFolders;
-        }
-        return {
-            capabilities: CSSLanguageService.SERVER_CAPABILITIES
-        };
-    }
-    async onHover(params) {
-        await this.init();
-        const workspace = this.findClosestWorkspace(params.textDocument.uri);
-        if (workspace?.languageService) {
-            const document = this.documents.get(params.textDocument.uri);
-            if (document) return workspace.languageService.inspectSyntax(document, params.position);
-        }
-    }
-    async onCompletion(params) {
-        await this.init();
-        const workspace = this.findClosestWorkspace(params.textDocument.uri);
-        if (workspace?.languageService) {
-            const document = this.documents.get(params.textDocument.uri);
-            if (document) return workspace.languageService.suggestSyntax(document, params.position, params.context);
-        }
-    }
-    async onDocumentColor(params) {
-        await this.init();
-        const workspace = this.findClosestWorkspace(params.textDocument.uri);
-        if (workspace?.languageService) {
-            const document = this.documents.get(params.textDocument.uri);
-            if (document) return workspace.languageService.renderSyntaxColors(document);
-        }
-    }
-    async onColorPresentation(params) {
-        await this.init();
-        const workspace = this.findClosestWorkspace(params.textDocument.uri);
-        if (workspace?.languageService) {
-            const document = this.documents.get(params.textDocument.uri);
-            if (document) return workspace.languageService.editSyntaxColors(document, params.color, params.range);
-        }
-    }
-    async onDidOpen(params) {
-        await this.init();
-        const workspace = this.findClosestWorkspace(params.document.uri);
-        if (!workspace || workspace.openedTextDocuments.includes(params.document)) return;
-        if (!workspace.openedTextDocuments.length) {
-            this.initWorkspaceLanguageService(workspace);
-        }
-        workspace.openedTextDocuments.push(params.document);
-    }
-    async onDidClose(params) {
-        await this.init();
-        const workspace = this.findClosestWorkspace(params.document.uri);
-        if (!workspace) return;
-        workspace.openedTextDocuments.splice(workspace.openedTextDocuments.indexOf(params.document), 1);
-        if (!workspace.openedTextDocuments.length) {
-            this.destroyLanguageService(workspace);
-        }
-    }
-    async onDidSave(params) {
-        await this.init();
-        const workspace = this.findClosestWorkspace(params.document.uri);
-        if (!workspace) return;
-        const name = path.parse(params.document.uri).name;
-        if (name === 'master.css' || name.endsWith('.css')) {
-            this.connection.sendRequest('masterCSS/restart', {
-                title: 'Updating Master CSS configuration'
-            });
-        }
-    }
-    async onDidChangeConfiguration({ settings }) {
-        await this.init();
-        if (settings?.masterCSS) {
-            this.connection.sendNotification('masterCSS/globalSettingsChanged', settings.masterCSS);
-            this.customSettings = settings.masterCSS;
-            this.connection.sendRequest('masterCSS/restart', {
-                title: 'Updating Master CSS settings'
-            });
-        }
-    }
-    async initWorkspaceFolder(workspaceFolderURI) {
-        const workspaceFolderCWD = vscodeUri.URI.parse(workspaceFolderURI).fsPath;
-        let customWorkspaceFolderSettings;
-        if (this.clientCapabilities.workspace?.configuration) {
-            customWorkspaceFolderSettings = await this.connection.workspace.getConfiguration({
-                scopeUri: workspaceFolderURI,
-                section: 'masterCSS'
-            });
-        }
-        const { workspaces, ...languageServiceSettings } = extend(settings, this.customSettings, customWorkspaceFolderSettings);
-        const resolvedWorkspaceDirectories = new Set([
-            workspaceFolderCWD
-        ]);
-        if (workspaceFolderCWD) {
-            this.console.info(`Registered workspace folder ${workspaceFolderURI}`);
-        } else {
-            this.console.info(`Registered global workspace folder`);
-        }
-        if (workspaces === 'auto') {
-            (await glob('**/master.css.*', {
-                cwd: workspaceFolderCWD,
-                absolute: true,
-                onlyFiles: true,
-                ignore: [
-                    '**/node_modules/**'
-                ]
-            })).forEach((workspaceFile)=>resolvedWorkspaceDirectories.add(path.dirname(path.resolve(workspaceFile))));
-        } else if (workspaces?.length) {
-            (await glob(workspaces, {
-                cwd: workspaceFolderCWD,
-                absolute: true,
-                onlyDirectories: true,
-                ignore: [
-                    '**/node_modules/**'
-                ]
-            })).forEach((workspaceDir)=>resolvedWorkspaceDirectories.add(path.resolve(workspaceDir)));
-        }
-        resolvedWorkspaceDirectories.forEach(async (workspaceDir)=>{
-            const workspaceURI = vscodeUri.URI.file(workspaceDir).toString();
-            this.console.info(`Added workspace ${workspaceURI}`);
-            this.workspaces.set(workspaceURI, {
-                uri: workspaceURI,
-                openedTextDocuments: [],
-                languageServiceSettings
-            });
-        });
-    }
-    initWorkspaceLanguageService(workspace) {
-        let workspaceConfig;
-        if (workspace !== this.globalWorkspace) {
-            try {
-                workspaceConfig = exploreConfig({
-                    cwd: workspace.uri && vscodeUri.URI.parse(workspace.uri).fsPath,
-                    found: undefined
-                });
-            } catch (e) {
-                this.console.info(`Failed to load config from ${workspace}`);
-                this.console.error(e);
-            }
-            if (workspaceConfig) {
-                this.console.info(`Initialized workspace ${workspaceConfig ? '(with config file)' : ''} ${workspace.uri}`);
-            } else {
-                this.console.info(`Initialized workspace ${workspace.uri}`);
-            }
-        }
-        workspace.languageService = new CSSLanguageService({
-            ...workspace.languageServiceSettings,
-            config: workspaceConfig
-        });
-    }
-    destroyLanguageService(workspace) {
-        this.console.info(`Destroyed workspace ${workspace.uri}`);
-        delete workspace.languageService;
-    }
-    findClosestWorkspace(textDocumentURI) {
-        let foundWorkspace;
-        for (const [uri, workspace] of this.workspaces){
-            if (!uri) continue;
-            if (textDocumentURI.startsWith(uri) && (!foundWorkspace || uri.length > (foundWorkspace.uri || '').length)) {
-                foundWorkspace = workspace;
-            }
-        }
-        if (foundWorkspace) return foundWorkspace;
-        this.console.info(`This is an external document ${textDocumentURI} with the global workspace`);
-        return this.globalWorkspace;
-    }
-    stop() {
-        this.connection.sendNotification('masterCSS/dispose');
-        this.disposables.forEach((disposable)=>disposable.dispose());
-        this.disposables.length = 0;
-        this.connection.dispose();
-        this.initializing = undefined;
-    }
-}
-
-module.exports = CSSLanguageServer;

package/dist/index.cjs

@@ -1,12 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var core = require('./core.cjs');
-var settings = require('./settings.cjs');
-
-
-
-exports.CSSLanguageServer = core;
-exports.default = core;
-exports.settings = settings;

package/dist/settings.cjs

@@ -1,11 +0,0 @@
-'use strict';
-
-var CSSLanguageService = require('@master/css-language-service');
-
-const settings = {
-    ...CSSLanguageService.settings,
-    workspaces: 'auto',
-    verbose: false
-};
-
-module.exports = settings;

package/dist/utils/create-document.cjs

@@ -1,30 +0,0 @@
-'use strict';
-
-var vscodeLanguageserverTextdocument = require('vscode-languageserver-textdocument');
-var nanoid = require('nanoid');
-var path = require('path');
-var vscodeUri = require('vscode-uri');
-
-const extOfLang = {
-    typescript: 'ts',
-    typescriptreact: 'tsx',
-    javascript: 'js',
-    javascriptreact: 'jsx',
-    css: 'css',
-    scss: 'scss',
-    less: 'less',
-    html: 'html',
-    json: 'json',
-    vue: 'vue',
-    svelte: 'svelte',
-    astro: 'astro'
-};
-function createDocument(text, options) {
-    const lang = options?.lang || 'html';
-    const dir = options?.dir || './';
-    const filePath = path.join(dir, `${nanoid.nanoid()}.${extOfLang[lang]}`);
-    const fileURI = vscodeUri.URI.file(filePath).toString();
-    return vscodeLanguageserverTextdocument.TextDocument.create(fileURI, lang, 0, text);
-}
-
-module.exports = createDocument;