@spyglassmc/language-server 0.1.3 → 0.4.0

package/bin/server

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require('../lib/server.js')
+import '../lib/server.js'

package/lib/server.d.ts

@@ -1,2 +1,2 @@
-export * from './util/types';
+export * from './util/types.js';
 //# sourceMappingURL=server.d.ts.map

package/lib/server.js

@@ -1,55 +1,28 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const core = __importStar(require("@spyglassmc/core"));
-const je = __importStar(require("@spyglassmc/java-edition"));
-const locales = __importStar(require("@spyglassmc/locales"));
-const mcdoc = __importStar(require("@spyglassmc/mcdoc"));
-const env_paths_1 = __importDefault(require("env-paths"));
-const util = __importStar(require("util"));
-const ls = __importStar(require("vscode-languageserver/node"));
-const util_1 = require("./util");
-__exportStar(require("./util/types"), exports);
+import * as core from '@spyglassmc/core';
+import { fileUtil } from '@spyglassmc/core';
+import { NodeJsExternals } from '@spyglassmc/core/lib/nodejs.js';
+import * as je from '@spyglassmc/java-edition';
+import * as locales from '@spyglassmc/locales';
+import * as mcdoc from '@spyglassmc/mcdoc';
+import envPaths from 'env-paths';
+import url from 'url';
+import * as util from 'util';
+import * as ls from 'vscode-languageserver/node.js';
+import { toCore, toLS } from './util/index.js';
+export * from './util/types.js';
 if (process.argv.length === 2) {
     // When the server is launched from the cmd script, the process arguments
     // are wiped. I don't know why it happens, but this is what it is.
     // Therefore, we push a '--stdio' if the argument list is too short.
     process.argv.push('--stdio');
 }
-const { cache: cacheRoot } = (0, env_paths_1.default)('spyglassmc');
+const { cache: cacheRoot } = envPaths('spyglassmc');
 const connection = ls.createConnection();
 let capabilities;
 let workspaceFolders;
 let hasShutdown = false;
 let progressReporter;
+const externals = NodeJsExternals;
 const logger = {
     error: (msg, ...args) => connection.console.error(util.format(msg, ...args)),
     info: (msg, ...args) => connection.console.info(util.format(msg, ...args)),
@@ -80,31 +53,32 @@ connection.onInitialize(async (params) => {
     }
     try {
         service = new core.Service({
-            cacheRoot,
-            initializers: [
-                mcdoc.initialize,
-                je.initialize,
-            ],
-            isDebugging: false,
+            isDebugging: initializationOptions?.inDevelopmentMode && false,
             logger,
             profilers: new core.ProfilerFactory(logger, [
                 'cache#load',
                 'cache#save',
                 'project#init',
                 'project#ready',
+                'project#ready#bind',
             ]),
-            projectPath: core.fileUtil.fileUriToPath(workspaceFolders[0].uri),
+            project: {
+                cacheRoot: fileUtil.ensureEndingSlash(url.pathToFileURL(cacheRoot).toString()),
+                externals,
+                initializers: [
+                    mcdoc.initialize,
+                    je.initialize,
+                ],
+                projectRoot: core.fileUtil.ensureEndingSlash(workspaceFolders[0].uri),
+            },
         });
         service.project
-            .on('documentErrorred', ({ doc, errors }) => {
+            .on('documentErrored', ({ errors, uri, version }) => {
             connection.sendDiagnostics({
-                diagnostics: util_1.toLS.diagnostics(errors, doc),
-                uri: doc.uri,
-                version: doc.version,
+                diagnostics: toLS.diagnostics(errors),
+                uri: uri,
+                version: version,
             });
-        })
-            .on('documentRemoved', ({ uri }) => {
-            connection.sendDiagnostics({ uri, diagnostics: [] });
         })
             .on('ready', () => {
             progressReporter?.done();
@@ -141,8 +115,8 @@ connection.onInitialize(async (params) => {
             },
             hoverProvider: {},
             semanticTokensProvider: {
-                documentSelector: util_1.toLS.documentSelector(service.project.meta),
-                legend: util_1.toLS.semanticTokensLegend(),
+                documentSelector: toLS.documentSelector(service.project.meta),
+                legend: toLS.semanticTokensLegend(),
                 full: { delta: false },
                 range: true,
             },
@@ -179,10 +153,10 @@ connection.onInitialized(async () => {
     }
 });
 connection.onDidOpenTextDocument(({ textDocument: { text, uri, version, languageId: languageID } }) => {
-    service.project.onDidOpen(uri, languageID, version, text);
+    return service.project.onDidOpen(uri, languageID, version, text);
 });
 connection.onDidChangeTextDocument(({ contentChanges, textDocument: { uri, version } }) => {
-    service.project.onDidChange(uri, contentChanges, version);
+    return service.project.onDidChange(uri, contentChanges, version);
 });
 connection.onDidCloseTextDocument(({ textDocument: { uri } }) => {
     service.project.onDidClose(uri);
@@ -190,155 +164,154 @@ connection.onDidCloseTextDocument(({ textDocument: { uri } }) => {
 connection.workspace.onDidRenameFiles(({}) => {
 });
 connection.onColorPresentation(async ({ textDocument: { uri }, color, range }) => {
-    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
+    const docAndNode = await service.project.ensureClientManagedChecked(uri);
     if (!docAndNode) {
         return undefined;
     }
     const { doc, node } = docAndNode;
-    const presentation = service.getColorPresentation(node, doc, util_1.toCore.range(range, doc), util_1.toCore.color(color));
-    return util_1.toLS.colorPresentationArray(presentation, doc);
+    const presentation = service.getColorPresentation(node, doc, toCore.range(range, doc), toCore.color(color));
+    return toLS.colorPresentationArray(presentation, doc);
 });
 connection.onDocumentColor(async ({ textDocument: { uri } }) => {
-    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
+    const docAndNode = await service.project.ensureClientManagedChecked(uri);
     if (!docAndNode) {
         return undefined;
     }
     const { doc, node } = docAndNode;
     const info = service.getColorInfo(node, doc);
-    return util_1.toLS.colorInformationArray(info, doc);
+    return toLS.colorInformationArray(info, doc);
 });
 connection.onCompletion(async ({ textDocument: { uri }, position, context }) => {
-    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
+    const docAndNode = await service.project.ensureClientManagedChecked(uri);
     if (!docAndNode) {
         return undefined;
     }
     const { doc, node } = docAndNode;
-    const offset = util_1.toCore.offset(position, doc);
+    const offset = toCore.offset(position, doc);
     const items = service.complete(node, doc, offset, context?.triggerCharacter);
-    return items.map(item => util_1.toLS.completionItem(item, doc, offset, capabilities.textDocument?.completion?.completionItem?.insertReplaceSupport));
+    return items.map(item => toLS.completionItem(item, doc, offset, capabilities.textDocument?.completion?.completionItem?.insertReplaceSupport));
 });
 connection.onRequest('spyglassmc/dataHackPubify', ({ initialism }) => {
     return service.dataHackPubify(initialism);
 });
 connection.onDeclaration(async ({ textDocument: { uri }, position }) => {
-    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
+    const docAndNode = await service.project.ensureClientManagedChecked(uri);
     if (!docAndNode) {
         return undefined;
     }
     const { doc, node } = docAndNode;
-    const ans = await service.getSymbolLocations(node, doc, util_1.toCore.offset(position, doc), ['declaration', 'definition']);
-    return util_1.toLS.locationLink(ans, doc, capabilities.textDocument?.declaration?.linkSupport);
+    const ans = await service.getSymbolLocations(node, doc, toCore.offset(position, doc), ['declaration', 'definition']);
+    return toLS.locationLink(ans, doc, capabilities.textDocument?.declaration?.linkSupport);
 });
 connection.onDefinition(async ({ textDocument: { uri }, position }) => {
-    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
+    const docAndNode = await service.project.ensureClientManagedChecked(uri);
     if (!docAndNode) {
         return undefined;
     }
     const { doc, node } = docAndNode;
-    const ans = await service.getSymbolLocations(node, doc, util_1.toCore.offset(position, doc), ['definition', 'declaration', 'implementation', 'typeDefinition']);
-    return util_1.toLS.locationLink(ans, doc, capabilities.textDocument?.definition?.linkSupport);
+    const ans = await service.getSymbolLocations(node, doc, toCore.offset(position, doc), ['definition', 'declaration', 'implementation', 'typeDefinition']);
+    return toLS.locationLink(ans, doc, capabilities.textDocument?.definition?.linkSupport);
 });
 connection.onImplementation(async ({ textDocument: { uri }, position }) => {
-    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
+    const docAndNode = await service.project.ensureClientManagedChecked(uri);
     if (!docAndNode) {
         return undefined;
     }
     const { doc, node } = docAndNode;
-    const ans = await service.getSymbolLocations(node, doc, util_1.toCore.offset(position, doc), ['implementation', 'definition']);
-    return util_1.toLS.locationLink(ans, doc, capabilities.textDocument?.implementation?.linkSupport);
+    const ans = await service.getSymbolLocations(node, doc, toCore.offset(position, doc), ['implementation', 'definition']);
+    return toLS.locationLink(ans, doc, capabilities.textDocument?.implementation?.linkSupport);
 });
 connection.onReferences(async ({ textDocument: { uri }, position, context: { includeDeclaration } }) => {
-    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
+    const docAndNode = await service.project.ensureClientManagedChecked(uri);
     if (!docAndNode) {
         return undefined;
     }
     const { doc, node } = docAndNode;
-    const ans = await service.getSymbolLocations(node, doc, util_1.toCore.offset(position, doc), includeDeclaration ? undefined : ['reference']);
-    return util_1.toLS.locationLink(ans, doc, false);
+    const ans = await service.getSymbolLocations(node, doc, toCore.offset(position, doc), includeDeclaration ? undefined : ['reference']);
+    return toLS.locationLink(ans, doc, false);
 });
 connection.onTypeDefinition(async ({ textDocument: { uri }, position }) => {
-    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
+    const docAndNode = await service.project.ensureClientManagedChecked(uri);
     if (!docAndNode) {
         return undefined;
     }
     const { doc, node } = docAndNode;
-    const ans = await service.getSymbolLocations(node, doc, util_1.toCore.offset(position, doc), ['typeDefinition']);
-    return util_1.toLS.locationLink(ans, doc, capabilities.textDocument?.typeDefinition?.linkSupport);
+    const ans = await service.getSymbolLocations(node, doc, toCore.offset(position, doc), ['typeDefinition']);
+    return toLS.locationLink(ans, doc, capabilities.textDocument?.typeDefinition?.linkSupport);
 });
 connection.onDocumentHighlight(async ({ textDocument: { uri }, position }) => {
-    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
+    const docAndNode = await service.project.ensureClientManagedChecked(uri);
     if (!docAndNode) {
         return undefined;
     }
     const { doc, node } = docAndNode;
-    const ans = await service.getSymbolLocations(node, doc, util_1.toCore.offset(position, doc), undefined, true);
-    return util_1.toLS.documentHighlight(ans);
+    const ans = await service.getSymbolLocations(node, doc, toCore.offset(position, doc), undefined, true);
+    return toLS.documentHighlight(ans);
 });
 connection.onDocumentSymbol(async ({ textDocument: { uri } }) => {
-    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
+    const docAndNode = await service.project.ensureClientManagedChecked(uri);
     if (!docAndNode) {
         return undefined;
     }
     const { doc, node } = docAndNode;
-    return util_1.toLS.documentSymbolsFromTables([service.project.symbols.global, ...core.AstNode.getLocalsToLeaves(node)], doc, capabilities.textDocument?.documentSymbol?.hierarchicalDocumentSymbolSupport, capabilities.textDocument?.documentSymbol?.symbolKind?.valueSet);
+    return toLS.documentSymbolsFromTables([service.project.symbols.global, ...core.AstNode.getLocalsToLeaves(node)], doc, capabilities.textDocument?.documentSymbol?.hierarchicalDocumentSymbolSupport, capabilities.textDocument?.documentSymbol?.symbolKind?.valueSet);
 });
 connection.onHover(async ({ textDocument: { uri }, position }) => {
-    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
+    const docAndNode = await service.project.ensureClientManagedChecked(uri);
     if (!docAndNode) {
         return undefined;
     }
     const { doc, node } = docAndNode;
-    const ans = service.getHover(node, doc, util_1.toCore.offset(position, doc));
-    return ans ? util_1.toLS.hover(ans, doc) : undefined;
+    const ans = service.getHover(node, doc, toCore.offset(position, doc));
+    return ans ? toLS.hover(ans, doc) : undefined;
 });
 connection.onRequest('spyglassmc/inlayHints', async ({ textDocument: { uri }, range }) => {
-    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
+    const docAndNode = await service.project.ensureClientManagedChecked(uri);
     if (!docAndNode) {
         return [];
     }
     const { doc, node } = docAndNode;
-    const hints = service.getInlayHints(node, doc, util_1.toCore.range(range, doc));
-    return util_1.toLS.inlayHints(hints, doc);
+    const hints = service.getInlayHints(node, doc, toCore.range(range, doc));
+    return toLS.inlayHints(hints, doc);
 });
 connection.onRequest('spyglassmc/resetProjectCache', async () => {
-    service.project.resetCache();
-    return service.project.restart();
+    return service.project.resetCache();
 });
 connection.onRequest('spyglassmc/showCacheRoot', async () => {
     return service.project.showCacheRoot();
 });
 connection.languages.semanticTokens.on(async ({ textDocument: { uri } }) => {
-    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
+    const docAndNode = await service.project.ensureClientManagedChecked(uri);
     if (!docAndNode) {
         return { data: [] };
     }
     const { doc, node } = docAndNode;
     const tokens = service.colorize(node, doc);
-    return util_1.toLS.semanticTokens(tokens, doc, capabilities.textDocument?.semanticTokens?.multilineTokenSupport);
+    return toLS.semanticTokens(tokens, doc, capabilities.textDocument?.semanticTokens?.multilineTokenSupport);
 });
 connection.languages.semanticTokens.onRange(async ({ textDocument: { uri }, range }) => {
-    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
+    const docAndNode = await service.project.ensureClientManagedChecked(uri);
     if (!docAndNode) {
         return { data: [] };
     }
     const { doc, node } = docAndNode;
-    const tokens = service.colorize(node, doc, util_1.toCore.range(range, doc));
-    return util_1.toLS.semanticTokens(tokens, doc, capabilities.textDocument?.semanticTokens?.multilineTokenSupport);
+    const tokens = service.colorize(node, doc, toCore.range(range, doc));
+    return toLS.semanticTokens(tokens, doc, capabilities.textDocument?.semanticTokens?.multilineTokenSupport);
 });
 connection.onSignatureHelp(async ({ textDocument: { uri }, position }) => {
-    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
+    const docAndNode = await service.project.ensureClientManagedChecked(uri);
     if (!docAndNode) {
         return undefined;
     }
     const { doc, node } = docAndNode;
-    const help = service.getSignatureHelp(node, doc, util_1.toCore.offset(position, doc));
-    return util_1.toLS.signatureHelp(help);
+    const help = service.getSignatureHelp(node, doc, toCore.offset(position, doc));
+    return toLS.signatureHelp(help);
 });
 connection.onWorkspaceSymbol(({ query }) => {
-    return util_1.toLS.symbolInformationArrayFromTable(service.project.symbols.global, query, capabilities.textDocument?.documentSymbol?.symbolKind?.valueSet);
+    return toLS.symbolInformationArrayFromTable(service.project.symbols.global, query, capabilities.textDocument?.documentSymbol?.symbolKind?.valueSet);
 });
 connection.onDocumentFormatting(async ({ textDocument: { uri }, options }) => {
-    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
+    const docAndNode = await service.project.ensureClientManagedChecked(uri);
     if (!docAndNode) {
         return undefined;
     }
@@ -347,7 +320,7 @@ connection.onDocumentFormatting(async ({ textDocument: { uri }, options }) => {
     if (options.insertFinalNewline && text.charAt(text.length - 1) !== '\n') {
         text += '\n';
     }
-    return [util_1.toLS.textEdit(node.range, text, doc)];
+    return [toLS.textEdit(node.range, text, doc)];
 });
 connection.onShutdown(async () => {
     await service.project.close();

package/lib/util/index.d.ts

@@ -1,4 +1,4 @@
-export * as toCore from './toCore';
-export * as toLS from './toLS';
-export * from './types';
+export * as toCore from './toCore.js';
+export * as toLS from './toLS.js';
+export * from './types.js';
 //# sourceMappingURL=index.d.ts.map

package/lib/util/index.js

@@ -1,33 +1,4 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.toLS = exports.toCore = void 0;
-exports.toCore = __importStar(require("./toCore"));
-exports.toLS = __importStar(require("./toLS"));
-__exportStar(require("./types"), exports);
+export * as toCore from './toCore.js';
+export * as toLS from './toLS.js';
+export * from './types.js';
 //# sourceMappingURL=index.js.map

package/lib/util/toCore.d.ts

@@ -1,6 +1,6 @@
 import * as core from '@spyglassmc/core';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
-import type * as ls from 'vscode-languageserver/node';
+import type * as ls from 'vscode-languageserver/node.js';
 export declare function offset(position: ls.Position, doc: TextDocument): number;
 export declare function range(range: ls.Range, doc: TextDocument): core.Range;
 export declare function color(color: ls.Color): core.Color;

package/lib/util/toCore.js

@@ -1,45 +1,16 @@
-"use strict";
 /*
  * A series of functions that can transform `vscode-languageserver` types to `@spyglassmc/core` types.
  *
  * Functions are named after types in `@spyglassmc/core`.
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.color = exports.range = exports.offset = void 0;
-const core = __importStar(require("@spyglassmc/core"));
-function offset(position, doc) {
+import * as core from '@spyglassmc/core';
+export function offset(position, doc) {
     return doc.offsetAt(position);
 }
-exports.offset = offset;
-function range(range, doc) {
+export function range(range, doc) {
     return core.Range.create(offset(range.start, doc), offset(range.end, doc));
 }
-exports.range = range;
-function color(color) {
+export function color(color) {
     return [color.red, color.green, color.blue, color.alpha];
 }
-exports.color = color;
 //# sourceMappingURL=toCore.js.map

package/lib/util/toLS.d.ts

@@ -1,14 +1,14 @@
 import * as core from '@spyglassmc/core';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
-import * as ls from 'vscode-languageserver/node';
-import type { MyLspInlayHint } from './types';
+import * as ls from 'vscode-languageserver/node.js';
+import type { MyLspInlayHint } from './types.js';
 export declare function color(color: core.Color): ls.Color;
 export declare function colorInformation(info: core.ColorInfo, doc: TextDocument): ls.ColorInformation;
 export declare function colorInformationArray(info: core.ColorInfo[], doc: TextDocument): ls.ColorInformation[];
 export declare function colorPresentation(presentation: core.ColorPresentation, doc: TextDocument): ls.ColorPresentation;
 export declare function colorPresentationArray(presentation: core.ColorPresentation[], doc: TextDocument): ls.ColorPresentation[];
-export declare function diagnostic(error: core.LanguageError, doc: TextDocument): ls.Diagnostic;
-export declare function diagnostics(errors: readonly core.LanguageError[], doc: TextDocument): ls.Diagnostic[];
+export declare function diagnostic(error: core.PosRangeLanguageError): ls.Diagnostic;
+export declare function diagnostics(errors: readonly core.PosRangeLanguageError[]): ls.Diagnostic[];
 export declare function diagnosticSeverity(severity: core.ErrorSeverity): ls.DiagnosticSeverity;
 export declare function documentHighlight(locations: core.SymbolLocations | undefined): ls.DocumentHighlight[] | undefined;
 export declare function documentSelector(meta: core.MetaRegistry): ls.DocumentSelector;

package/lib/util/toLS.js

@@ -1,67 +1,36 @@
-"use strict";
 /*
  * A series of functions that can transform `@spyglassmc/core` types to `vscode-languageserver` types.
  *
  * Functions are named after types in `vscode-languageserver`.
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.textEdit = exports.symbolKind = exports.symbolInformationArrayFromTable = exports.symbolInformationArray = exports.symbolInformation = exports.parameterInformation = exports.signatureInformation = exports.signatureHelp = exports.semanticTokenType = exports.semanticTokensLegend = exports.semanticTokens = exports.semanticTokenModifiers = exports.semanticTokenModifier = exports.range = exports.position = exports.markupContent = exports.locationLink = exports.location = exports.completionItem = exports.inlayHints = exports.inlayHint = exports.hover = exports.documentSymbolsFromTables = exports.documentSymbolsFromTable = exports.documentSymbols = exports.documentSymbol = exports.documentSelector = exports.documentHighlight = exports.diagnosticSeverity = exports.diagnostics = exports.diagnostic = exports.colorPresentationArray = exports.colorPresentation = exports.colorInformationArray = exports.colorInformation = exports.color = void 0;
-const core = __importStar(require("@spyglassmc/core"));
-const ls = __importStar(require("vscode-languageserver/node"));
-const node_1 = require("vscode-languageserver/node");
+import * as core from '@spyglassmc/core';
+import * as ls from 'vscode-languageserver/node.js';
+import { InsertTextFormat } from 'vscode-languageserver/node.js';
 const ZeroPosition = { line: 0, character: 0 };
 const ZeroRange = { start: ZeroPosition, end: ZeroPosition };
-function color(color) {
+export function color(color) {
     return ls.Color.create(...color);
 }
-exports.color = color;
-function colorInformation(info, doc) {
+export function colorInformation(info, doc) {
     return ls.ColorInformation.create(range(info.range, doc), color(info.color));
 }
-exports.colorInformation = colorInformation;
-function colorInformationArray(info, doc) {
+export function colorInformationArray(info, doc) {
     return info.map(i => colorInformation(i, doc));
 }
-exports.colorInformationArray = colorInformationArray;
-function colorPresentation(presentation, doc) {
+export function colorPresentation(presentation, doc) {
     const edit = ls.TextEdit.replace(range(presentation.range, doc), presentation.text);
     return ls.ColorPresentation.create(presentation.label, edit);
 }
-exports.colorPresentation = colorPresentation;
-function colorPresentationArray(presentation, doc) {
+export function colorPresentationArray(presentation, doc) {
     return presentation.map(p => colorPresentation(p, doc));
 }
-exports.colorPresentationArray = colorPresentationArray;
-function diagnostic(error, doc) {
-    const ans = ls.Diagnostic.create(range(error.range, doc), error.message, diagnosticSeverity(error.severity), undefined, 'spyglassmc');
+export function diagnostic(error) {
+    const ans = ls.Diagnostic.create(error.posRange, error.message, diagnosticSeverity(error.severity), undefined, 'spyglassmc');
     if (error.info?.deprecated) {
-        (ans.tags ?? (ans.tags = []))?.push(ls.DiagnosticTag.Deprecated);
+        (ans.tags ??= [])?.push(ls.DiagnosticTag.Deprecated);
     }
     if (error.info?.unnecessary) {
-        (ans.tags ?? (ans.tags = []))?.push(ls.DiagnosticTag.Unnecessary);
+        (ans.tags ??= [])?.push(ls.DiagnosticTag.Unnecessary);
     }
     if (error.info?.codeAction) {
         ans.data = {
@@ -76,12 +45,10 @@ function diagnostic(error, doc) {
     }
     return ans;
 }
-exports.diagnostic = diagnostic;
-function diagnostics(errors, doc) {
-    return errors.map(e => diagnostic(e, doc));
+export function diagnostics(errors) {
+    return errors.map(e => diagnostic(e));
 }
-exports.diagnostics = diagnostics;
-function diagnosticSeverity(severity) {
+export function diagnosticSeverity(severity) {
     switch (severity) {
         case 0 /* core.ErrorSeverity.Hint */:
             return ls.DiagnosticSeverity.Hint;
@@ -93,19 +60,16 @@ function diagnosticSeverity(severity) {
             return ls.DiagnosticSeverity.Error;
     }
 }
-exports.diagnosticSeverity = diagnosticSeverity;
-function documentHighlight(locations) {
+export function documentHighlight(locations) {
     return locations?.locations
         ?.filter(loc => loc.posRange)
         ?.map(loc => ({ range: loc.posRange }));
 }
-exports.documentHighlight = documentHighlight;
-function documentSelector(meta) {
+export function documentSelector(meta) {
     const ans = meta.getLanguages().map(id => ({ language: id }));
     return ans;
 }
-exports.documentSelector = documentSelector;
-function documentSymbol(symbol, symLoc, doc, hierarchicalSupport, supportedKinds = []) {
+export function documentSymbol(symbol, symLoc, doc, hierarchicalSupport, supportedKinds = []) {
     return {
         name: symbol.identifier,
         kind: symbolKind(symbol.category, symbol.subcategory, supportedKinds),
@@ -114,46 +78,39 @@ function documentSymbol(symbol, symLoc, doc, hierarchicalSupport, supportedKinds
         children: hierarchicalSupport ? documentSymbols(symbol.members, doc, hierarchicalSupport, supportedKinds) : undefined,
     };
 }
-exports.documentSymbol = documentSymbol;
-function documentSymbols(map = {}, doc, hierarchicalSupport, supportedKinds = []) {
+export function documentSymbols(map = {}, doc, hierarchicalSupport, supportedKinds = []) {
     return Object.values(map)
         .map(s => [s, [...s.declaration ?? [], ...s.definition ?? [], ...s.implementation ?? [], ...s.typeDefinition ?? []].find(l => l.uri === doc.uri)])
         .filter(([_s, l]) => !!l)
         .map(([s, l]) => documentSymbol(s, l, doc, hierarchicalSupport, supportedKinds));
 }
-exports.documentSymbols = documentSymbols;
-function documentSymbolsFromTable(table, doc, hierarchicalSupport, supportedKinds = []) {
+export function documentSymbolsFromTable(table, doc, hierarchicalSupport, supportedKinds = []) {
     return Object.values(table)
         .map(m => documentSymbols(m, doc, hierarchicalSupport, supportedKinds))
         .flat();
 }
-exports.documentSymbolsFromTable = documentSymbolsFromTable;
-function documentSymbolsFromTables(tables, doc, hierarchicalSupport, supportedKinds = []) {
+export function documentSymbolsFromTables(tables, doc, hierarchicalSupport, supportedKinds = []) {
     return tables
         .map(t => documentSymbolsFromTable(t, doc, hierarchicalSupport, supportedKinds))
         .flat();
 }
-exports.documentSymbolsFromTables = documentSymbolsFromTables;
-function hover(hover, doc) {
+export function hover(hover, doc) {
     const ans = {
         contents: markupContent(hover.markdown),
         range: range(hover.range, doc),
     };
     return ans;
 }
-exports.hover = hover;
-function inlayHint(hint, doc) {
+export function inlayHint(hint, doc) {
     return {
         position: doc.positionAt(hint.offset),
         text: hint.text,
     };
 }
-exports.inlayHint = inlayHint;
-function inlayHints(hints, doc) {
+export function inlayHints(hints, doc) {
     return hints.map(h => inlayHint(h, doc));
 }
-exports.inlayHints = inlayHints;
-function completionItem(completion, doc, requestedOffset, insertReplaceSupport) {
+export function completionItem(completion, doc, requestedOffset, insertReplaceSupport) {
     const insertText = completion.insertText ?? completion.label;
     const canInsertReplace = insertReplaceSupport && ![core.CR, core.LF, core.CRLF].includes(insertText);
     const textEdit = canInsertReplace
@@ -169,21 +126,19 @@ function completionItem(completion, doc, requestedOffset, insertReplaceSupport)
         filterText: completion.filterText,
         sortText: completion.sortText,
         textEdit,
-        insertTextFormat: node_1.InsertTextFormat.Snippet,
+        insertTextFormat: InsertTextFormat.Snippet,
         insertTextMode: ls.InsertTextMode.adjustIndentation,
         ...completion.deprecated ? { tags: [ls.CompletionItemTag.Deprecated] } : {},
     };
     return ans;
 }
-exports.completionItem = completionItem;
-function location(location) {
+export function location(location) {
     return {
         uri: location.uri,
         range: location.posRange,
     };
 }
-exports.location = location;
-function locationLink(locations, doc, linkSupport) {
+export function locationLink(locations, doc, linkSupport) {
     return locations?.locations
         ? linkSupport
             ? locations.locations.map(loc => ({
@@ -195,36 +150,30 @@ function locationLink(locations, doc, linkSupport) {
             : (locations.locations).map(loc => location({ uri: loc.uri, posRange: loc.posRange ?? ZeroRange }))
         : undefined;
 }
-exports.locationLink = locationLink;
-function markupContent(value) {
+export function markupContent(value) {
     return {
         kind: ls.MarkupKind.Markdown,
         value: value,
     };
 }
-exports.markupContent = markupContent;
-function position(offset, doc) {
+export function position(offset, doc) {
     return doc.positionAt(offset);
 }
-exports.position = position;
-function range(range, doc) {
+export function range(range, doc) {
     return ls.Range.create(position(range.start, doc), position(range.end, doc));
 }
-exports.range = range;
-function semanticTokenModifier(modifier) {
+export function semanticTokenModifier(modifier) {
     return core.ColorTokenModifiers.indexOf(modifier);
 }
-exports.semanticTokenModifier = semanticTokenModifier;
-function semanticTokenModifiers(modifiers = []) {
+export function semanticTokenModifiers(modifiers = []) {
     let ans = 0;
     for (const modifier of modifiers) {
         ans += 1 << semanticTokenModifier(modifier);
     }
     return ans;
 }
-exports.semanticTokenModifiers = semanticTokenModifiers;
 const MaxCharacterNumber = 2147483647;
-function semanticTokens(tokens, doc, multilineSupport) {
+export function semanticTokens(tokens, doc, multilineSupport) {
     const builder = new ls.SemanticTokensBuilder();
     for (const token of tokens) {
         const pos = position(token.range.start, doc);
@@ -248,20 +197,17 @@ function semanticTokens(tokens, doc, multilineSupport) {
     }
     return builder.build();
 }
-exports.semanticTokens = semanticTokens;
-function semanticTokensLegend() {
+export function semanticTokensLegend() {
     const ans = {
         tokenTypes: core.ColorTokenTypes,
         tokenModifiers: core.ColorTokenModifiers,
     };
     return ans;
 }
-exports.semanticTokensLegend = semanticTokensLegend;
-function semanticTokenType(type) {
+export function semanticTokenType(type) {
     return core.ColorTokenTypes.indexOf(type);
 }
-exports.semanticTokenType = semanticTokenType;
-function signatureHelp(help) {
+export function signatureHelp(help) {
     if (!help || help.signatures.length === 0) {
         return undefined;
     }
@@ -271,8 +217,7 @@ function signatureHelp(help) {
         activeSignature: help.activeSignature,
     };
 }
-exports.signatureHelp = signatureHelp;
-function signatureInformation(info) {
+export function signatureInformation(info) {
     return {
         label: info.label,
         activeParameter: info.activeParameter,
@@ -280,37 +225,32 @@ function signatureInformation(info) {
         parameters: info.parameters.map(parameterInformation),
     };
 }
-exports.signatureInformation = signatureInformation;
-function parameterInformation(info) {
+export function parameterInformation(info) {
     return {
         label: info.label,
         documentation: info.documentation ? markupContent(info.documentation) : undefined,
     };
 }
-exports.parameterInformation = parameterInformation;
-function symbolInformation(symbol, symLoc, supportedKinds = []) {
+export function symbolInformation(symbol, symLoc, supportedKinds = []) {
     return {
         name: symbol.identifier,
         kind: symbolKind(symbol.category, symbol.subcategory, supportedKinds),
         location: location({ uri: symLoc.uri, posRange: symLoc.fullPosRange ?? symLoc.posRange ?? ZeroRange }),
     };
 }
-exports.symbolInformation = symbolInformation;
-function symbolInformationArray(map = {}, query, supportedKinds = []) {
+export function symbolInformationArray(map = {}, query, supportedKinds = []) {
     return Object.values(map)
         .filter(s => s.identifier.includes(query))
         .map(s => [s, [...s.declaration ?? [], ...s.definition ?? [], ...s.implementation ?? [], ...s.typeDefinition ?? []][0]])
         .filter(([_s, l]) => !!l)
         .map(([s, l]) => symbolInformation(s, l, supportedKinds));
 }
-exports.symbolInformationArray = symbolInformationArray;
-function symbolInformationArrayFromTable(table, query, supportedKinds = []) {
+export function symbolInformationArrayFromTable(table, query, supportedKinds = []) {
     return Object.values(table)
         .map(m => symbolInformationArray(m, query, supportedKinds))
         .flat();
 }
-exports.symbolInformationArrayFromTable = symbolInformationArrayFromTable;
-function symbolKind(category, subcategory = '', supportedKinds = []) {
+export function symbolKind(category, subcategory = '', supportedKinds = []) {
     const UltimateFallback = ls.SymbolKind.Variable;
     const getKind = (kind, fallback) => supportedKinds?.includes(kind) ? kind : fallback;
     if (core.ResourceLocationCategory.is(category)) {
@@ -336,9 +276,7 @@ function symbolKind(category, subcategory = '', supportedKinds = []) {
     ]);
     return map.get(category) ?? UltimateFallback;
 }
-exports.symbolKind = symbolKind;
-function textEdit(editRange, text, doc) {
+export function textEdit(editRange, text, doc) {
     return ls.TextEdit.replace(range(editRange, doc), text);
 }
-exports.textEdit = textEdit;
 //# sourceMappingURL=toLS.js.map

package/lib/util/types.d.ts

@@ -1,4 +1,4 @@
-import type * as ls from 'vscode-languageserver/node';
+import type * as ls from 'vscode-languageserver/node.js';
 export interface CustomInitializationOptions {
     inDevelopmentMode?: boolean;
 }

package/lib/util/types.js

@@ -1,3 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};
 //# sourceMappingURL=types.js.map

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@spyglassmc/language-server",
-  "version": "0.1.3",
+  "version": "0.4.0",
+  "type": "module",
   "main": "lib/server.js",
   "types": "lib/server.d.ts",
   "author": "SPGoding",
@@ -20,10 +21,10 @@
     "env-paths": "^2.2.1",
     "vscode-languageserver": "^7.0.0",
     "vscode-languageserver-textdocument": "^1.0.1",
-    "@spyglassmc/core": "0.1.2",
-    "@spyglassmc/java-edition": "0.1.3",
-    "@spyglassmc/locales": "0.1.2",
-    "@spyglassmc/mcdoc": "0.1.1"
+    "@spyglassmc/core": "0.4.0",
+    "@spyglassmc/java-edition": "0.3.1",
+    "@spyglassmc/locales": "0.3.0",
+    "@spyglassmc/mcdoc": "0.3.1"
   },
   "publishConfig": {
     "access": "public"