@master/css-language-server 2.0.0-rc.71 → 2.0.0-rc.73

package/README.md

@@ -99,4 +99,4 @@ import { settings } from '@master/css-language-server'
 | `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.
+With `workspaces: 'auto'`, the server creates workspaces from CSS files containing `@master entry;` or `@import '@master/css'`, and from `package.json` files that declare Master CSS package dependencies.

package/dist/core.d.ts

@@ -2,11 +2,16 @@ import { TextDocuments, InitializeParams, InitializeResult, WorkspaceFolder, Con
 import { TextDocument } from 'vscode-languageserver-textdocument';
 import CSSLanguageService, { Settings as CSSLanguageServiceSettings } from '@master/css-language-service';
 import { Settings } from './settings';
+import { type MasterCSSWorkspacePackageResolution } from '@master/css-project/workspace';
+import { type CSSLanguageRuntime } from '@master/css-language';
 export declare interface Workspace {
     uri: string;
     openedTextDocuments: TextDocument[];
     languageService?: CSSLanguageService;
     languageServiceSettings: CSSLanguageServiceSettings;
+    languageRuntime?: CSSLanguageRuntime;
+    languageRuntimeResolution?: MasterCSSWorkspacePackageResolution;
+    languageRuntimeSource?: 'workspace' | 'bundled';
     planEntries?: string[];
 }
 export declare const ACTIVE_SEMANTIC_TOKENS_REQUEST = "masterCSS/renderActiveSemanticTokens";
@@ -42,6 +47,8 @@ export default class CSSLanguageServer {
     private initWorkspaceFolder;
     initWorkspaceLanguageService(workspace: Workspace): Promise<void>;
     private loadWorkspacePlan;
+    private loadWorkspaceLanguageRuntime;
+    private importWorkspaceModule;
     destroyLanguageService(workspace: Workspace): void;
     findClosestWorkspace(textDocumentURI: string): Workspace;
     private publishCSSDirectiveDiagnostics;

package/dist/core.mjs

@@ -1,14 +1,17 @@
 import { TextDocumentSyncKind, TextDocuments, createConnection, DiagnosticSeverity } from 'vscode-languageserver/node';
 import { TextDocument } from 'vscode-languageserver-textdocument';
 import path from 'node:path';
+import { readFile } from 'node:fs/promises';
+import { pathToFileURL } from 'node:url';
 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 { resolveMasterCSSWorkspacePackages } from '@master/css-project/workspace';
 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 { defaultCSSLanguageRuntime, SEMANTIC_TOKENS_LEGEND, matchesLanguageServiceNativeDeclaration } from '@master/css-language';
 import glob from 'fast-glob';
 import { URI } from 'vscode-uri';
 import { CSSDirectiveError } from '@master/css-schema/css-directives';
@@ -123,7 +126,9 @@ class CSSLanguageServer {
     globalWorkspace = {
         uri: '',
         openedTextDocuments: [],
-        languageServiceSettings: this.settings
+        languageServiceSettings: this.settings,
+        languageRuntime: defaultCSSLanguageRuntime,
+        languageRuntimeSource: 'bundled'
     };
     documents;
     initializing;
@@ -350,6 +355,7 @@ class CSSLanguageServer {
         }
     }
     async initWorkspaceLanguageService(workspace) {
+        workspace.languageRuntime = await this.loadWorkspaceLanguageRuntime(workspace);
         let workspacePlan;
         if (workspace !== this.globalWorkspace) {
             try {
@@ -367,13 +373,79 @@ class CSSLanguageServer {
         workspace.languageService = new CSSLanguageService({
             ...workspace.languageServiceSettings,
             manifest: workspacePlan
+        }, {
+            runtime: workspace.languageRuntime
         });
     }
     async loadWorkspacePlan(workspace) {
         const cwd = workspace.uri ? URI.parse(workspace.uri).fsPath : process.cwd();
-        const result = await loadProjectManifest(cwd);
+        const result = await loadProjectManifest(cwd, {
+            baseManifest: (workspace.languageRuntime ?? defaultCSSLanguageRuntime).defaultManifest
+        });
         return result.entries.length ? result.manifest : workspace.languageServiceSettings.manifest;
     }
+    async loadWorkspaceLanguageRuntime(workspace) {
+        if (workspace === this.globalWorkspace || !workspace.uri) {
+            workspace.languageRuntimeSource = 'bundled';
+            return defaultCSSLanguageRuntime;
+        }
+        const cwd = URI.parse(workspace.uri).fsPath;
+        let resolution;
+        try {
+            resolution = resolveMasterCSSWorkspacePackages(cwd);
+            workspace.languageRuntimeResolution = resolution;
+            const missingPackages = [
+                !resolution.css && '@master/css',
+                !resolution.engine && '@master/css-engine',
+                !resolution.presetManifest && '@master/css-preset/default-manifest.json'
+            ].filter(Boolean);
+            if (missingPackages.length) {
+                throw new Error(`Missing workspace package(s): ${missingPackages.join(', ')}`);
+            }
+            const cssPackage = resolution.css;
+            const enginePackage = resolution.engine;
+            const presetManifestPackage = resolution.presetManifest;
+            if (!cssPackage || !enginePackage || !presetManifestPackage) {
+                throw new Error('Missing required workspace Master CSS runtime packages.');
+            }
+            const [cssModule, engineModule, utilityTypeModule] = await Promise.all([
+                this.importWorkspaceModule(cssPackage.entry),
+                this.importWorkspaceModule(enginePackage.entry),
+                resolution.utilityType ? this.importWorkspaceModule(resolution.utilityType.entry) : undefined
+            ]);
+            const MasterCSS = cssModule.MasterCSS || cssModule.default;
+            const builtinKeyAliases = engineModule.builtinKeyAliases;
+            const builtinNativeValueNamespaces = engineModule.builtinNativeValueNamespaces;
+            if (!MasterCSS) throw new Error(`Missing MasterCSS export from ${cssPackage.entry}`);
+            if (!builtinKeyAliases) throw new Error(`Missing builtinKeyAliases export from ${enginePackage.entry}`);
+            if (!builtinNativeValueNamespaces) throw new Error(`Missing builtinNativeValueNamespaces export from ${enginePackage.entry}`);
+            const manifest = JSON.parse(await readFile(presetManifestPackage.entry, 'utf8'));
+            workspace.languageRuntimeSource = 'workspace';
+            this.console.info(`Using workspace Master CSS runtime ${cssPackage.version ?? '(unknown version)'} from ${cssPackage.directory}`);
+            if (resolution.errors.length) {
+                this.console.info(`Workspace Master CSS runtime optional resolution warnings: ${resolution.errors.map(({ name, message })=>`${name}: ${message}`).join('; ')}`);
+            }
+            return {
+                MasterCSS,
+                UtilityType: utilityTypeModule?.UtilityType || utilityTypeModule?.default || defaultCSSLanguageRuntime.UtilityType,
+                defaultManifest: manifest,
+                builtinKeyAliases,
+                builtinNativeValueNamespaces,
+                nativeDeclarationMatcher: matchesLanguageServiceNativeDeclaration
+            };
+        } catch (error) {
+            workspace.languageRuntimeSource = 'bundled';
+            this.console.info(`Using bundled Master CSS runtime for ${workspace.uri}`);
+            if (resolution?.errors.length) {
+                this.console.info(`Workspace Master CSS package resolution errors: ${resolution.errors.map(({ name, message })=>`${name}: ${message}`).join('; ')}`);
+            }
+            this.console.error(error instanceof Error ? error.stack || error.message : String(error));
+            return defaultCSSLanguageRuntime;
+        }
+    }
+    async importWorkspaceModule(path) {
+        return await import(pathToFileURL(path).href);
+    }
     destroyLanguageService(workspace) {
         this.console.info(`Destroyed workspace ${workspace.uri}`);
         delete workspace.languageService;
@@ -406,7 +478,8 @@ class CSSLanguageServer {
         for (const { source, offset } of getCSSDiagnosticSources(textDocument)){
             try {
                 compileCSSManifest(source, {
-                    from: documentFile
+                    from: documentFile,
+                    baseManifest: (workspace.languageRuntime ?? defaultCSSLanguageRuntime).defaultManifest
                 });
             } catch (error) {
                 if (!isCSSDirectiveError(error)) continue;

package/dist/server.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/server.mjs

@@ -0,0 +1,9 @@
+import CSSLanguageServer from './core.mjs';
+
+const server = new CSSLanguageServer(undefined, {
+    verbose: true
+});
+server.start();
+process.on('unhandledRejection', (error)=>{
+    console.error('Unhandled rejection', error);
+});

package/package.json

@@ -1 +1 @@
-{"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.71","@master/css-compiler":"^2.0.0-rc.71","@master/css-language":"^2.0.0-rc.71","@master/css-language-service":"^2.0.0-rc.71","@master/css-project":"^2.0.0-rc.71","@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.71"},"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.71"}
+{"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.73","@master/css-compiler":"^2.0.0-rc.73","@master/css-language":"^2.0.0-rc.73","@master/css-language-service":"^2.0.0-rc.73","@master/css-project":"^2.0.0-rc.73","@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.73"},"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"},"./server":{"types":"./dist/server.d.ts","import":"./dist/server.mjs","default":"./dist/server.mjs"}},"files":["dist"],"publishConfig":{"access":"public","provenance":true},"version":"2.0.0-rc.73"}