@oml/server 0.14.0 → 0.14.1

package/out/cli.d.ts

@@ -0,0 +1 @@
+export declare function runServerCli(argv?: string[]): void;

package/{src/cli.ts → out/cli.js}

@@ -1,26 +1,15 @@
 // Copyright (c) 2026 Modelware. All rights reserved.
-
 import * as fs from 'node:fs/promises';
 import * as os from 'node:os';
 import * as path from 'node:path';
 import { createHash } from 'node:crypto';
 import { NodeFileSystem } from 'langium/node';
 import { createConnection } from 'vscode-languageserver/node.js';
-import { startOmlLanguageServer, type OmlLanguageServerRuntime } from './lsp/language-server.js';
+import { startOmlLanguageServer } from './lsp/language-server.js';
 import { startOmlRestServer } from './rest/server.js';
-
-interface RemoteOptions {
-    host: string;
-    port: number;
-    workspaceRoot: string;
-    token?: string;
-}
-
-type ServerLockOwner = 'daemon' | 'extension';
-
-function formatStartupError(error: unknown, host: string, port: number): string {
+function formatStartupError(error, host, port) {
     if (error && typeof error === 'object' && 'code' in error) {
-        const code = (error as NodeJS.ErrnoException).code;
+        const code = error.code;
         if (code === 'EADDRINUSE') {
             return `Port ${port} is already in use on ${host}.`;
         }
@@ -30,8 +19,7 @@ function formatStartupError(error: unknown, host: string, port: number): string
     }
     return error instanceof Error ? error.message : String(error);
 }
-
-function readOptionValue(argv: string[], index: number, aliases: string[]): string {
+function readOptionValue(argv, index, aliases) {
     const current = argv[index];
     const equalsIndex = current.indexOf('=');
     if (equalsIndex >= 0) {
@@ -43,11 +31,10 @@ function readOptionValue(argv: string[], index: number, aliases: string[]): stri
     }
     return next;
 }
-
-function parseRemoteOptions(argv: string[]): RemoteOptions {
-    let portValue: string | undefined;
-    let workspaceValue: string | undefined;
-    let tokenValue: string | undefined;
+function parseRemoteOptions(argv) {
+    let portValue;
+    let workspaceValue;
+    let tokenValue;
     for (let index = 0; index < argv.length; index += 1) {
         const arg = argv[index];
         if (arg === '--node-ipc' || arg.startsWith('--clientProcessId=')) {
@@ -78,7 +65,6 @@ function parseRemoteOptions(argv: string[]): RemoteOptions {
             throw new Error(`Unknown option '${arg}'.`);
         }
     }
-
     const host = '127.0.0.1';
     const rawPort = Number(portValue ?? process.env.OML_SERVER_PORT ?? '8080');
     const port = Number.isFinite(rawPort) ? Math.max(0, Math.min(65535, Math.trunc(rawPort))) : 8080;
@@ -86,8 +72,7 @@ function parseRemoteOptions(argv: string[]): RemoteOptions {
     const token = tokenValue && tokenValue.length > 0 ? tokenValue : undefined;
     return { host, port, workspaceRoot, token };
 }
-
-function startIpcLanguageServerIfAvailable(): { connection: import('vscode-languageserver').Connection; runtime: OmlLanguageServerRuntime } | undefined {
+function startIpcLanguageServerIfAvailable() {
     if (typeof process.send !== 'function') {
         return undefined;
     }
@@ -100,39 +85,34 @@ function startIpcLanguageServerIfAvailable(): { connection: import('vscode-langu
     });
     return { connection, runtime };
 }
-
-function workspaceHash(workspaceRoot: string): string {
+function workspaceHash(workspaceRoot) {
     return createHash('sha256').update(path.resolve(workspaceRoot)).digest('hex');
 }
-
-function lockFilePathForWorkspace(workspaceRoot: string): string {
+function lockFilePathForWorkspace(workspaceRoot) {
     return path.join(os.homedir(), '.oml', 'workspaces', workspaceHash(workspaceRoot), 'server.lock');
 }
-
-async function writeServerLock(workspaceRoot: string, port: number, owner: ServerLockOwner): Promise<string> {
+async function writeServerLock(workspaceRoot, port, owner) {
     const lockFile = lockFilePathForWorkspace(workspaceRoot);
     await fs.mkdir(path.dirname(lockFile), { recursive: true });
     await fs.writeFile(lockFile, JSON.stringify({ port, pid: process.pid, owner }) + '\n', 'utf-8');
     return lockFile;
 }
-
-async function removeServerLock(lockFile: string): Promise<void> {
+async function removeServerLock(lockFile) {
     await fs.rm(lockFile, { force: true });
 }
-
-function resolveListeningPort(server: import('node:http').Server): number {
+function resolveListeningPort(server) {
     const address = server.address();
     if (!address || typeof address === 'string') {
         throw new Error('Unable to resolve listening port.');
     }
     return address.port;
 }
-
-export function runServerCli(argv: string[] = process.argv.slice(2)): void {
-    let options: RemoteOptions;
+export function runServerCli(argv = process.argv.slice(2)) {
+    let options;
     try {
         options = parseRemoteOptions(argv);
-    } catch (error) {
+    }
+    catch (error) {
         const message = error instanceof Error ? error.message : String(error);
         process.stderr.write(`[oml-server] REST startup failed: ${message}\n`);
         process.exitCode = 1;
@@ -140,7 +120,7 @@ export function runServerCli(argv: string[] = process.argv.slice(2)): void {
         return;
     }
     const ipcServer = startIpcLanguageServerIfAvailable();
-    const owner: ServerLockOwner = ipcServer ? 'extension' : 'daemon';
+    const owner = ipcServer ? 'extension' : 'daemon';
     void startOmlRestServer({
         host: options.host,
         port: options.port,
@@ -150,7 +130,7 @@ export function runServerCli(argv: string[] = process.argv.slice(2)): void {
         runtime: ipcServer?.runtime,
     }).then(async ({ server, updateToken }) => {
         if (ipcServer) {
-            ipcServer.connection.onNotification('$/tokenRefreshed', (params: { accessToken: string }) => {
+            ipcServer.connection.onNotification('$/tokenRefreshed', (params) => {
                 if (params?.accessToken) {
                     updateToken(params.accessToken);
                 }
@@ -159,7 +139,7 @@ export function runServerCli(argv: string[] = process.argv.slice(2)): void {
         const listeningPort = resolveListeningPort(server);
         const lockFile = await writeServerLock(options.workspaceRoot, listeningPort, owner);
         let shuttingDown = false;
-        const shutdown = (exitCode: number): void => {
+        const shutdown = (exitCode) => {
             if (shuttingDown) {
                 return;
             }
@@ -170,20 +150,18 @@ export function runServerCli(argv: string[] = process.argv.slice(2)): void {
                 });
             });
         };
-
         process.once('SIGINT', () => shutdown(0));
         process.once('SIGTERM', () => shutdown(0));
         server.once('close', () => {
             void removeServerLock(lockFile);
         });
-
         process.stdout.write(`[oml-server] REST listening on http://${options.host}:${listeningPort}\n`);
-    }).catch((error: unknown) => {
+    }).catch((error) => {
         const message = formatStartupError(error, options.host, options.port);
         process.stderr.write(`[oml-server] REST startup failed: ${message}\n`);
         process.exitCode = 1;
         process.exit();
     });
 }
-
 runServerCli();
+//# sourceMappingURL=cli.js.map

package/out/cli.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}

package/out/index.d.ts

@@ -0,0 +1,7 @@
+export * from './lsp/language-server.js';
+export * from './lsp/diagram-server.js';
+export * from './rest/server.js';
+export * from './lsp/providers/browser-fs-provider.js';
+export * from './lsp/providers/hybrid-fs-provider.js';
+export * from './lsp/protocol/reasoner-protocol.js';
+export * from './lsp/protocol/browser-fs-protocol.js';

package/{src/index.ts → out/index.js}

@@ -1,5 +1,4 @@
 // Copyright (c) 2026 Modelware. All rights reserved.
-
 export * from './lsp/language-server.js';
 export * from './lsp/diagram-server.js';
 export * from './rest/server.js';
@@ -7,3 +6,4 @@ export * from './lsp/providers/browser-fs-provider.js';
 export * from './lsp/providers/hybrid-fs-provider.js';
 export * from './lsp/protocol/reasoner-protocol.js';
 export * from './lsp/protocol/browser-fs-protocol.js';
+//# sourceMappingURL=index.js.map

package/out/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,qDAAqD;AAErD,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,kBAAkB,CAAC;AACjC,cAAc,wCAAwC,CAAC;AACvD,cAAc,uCAAuC,CAAC;AACtD,cAAc,qCAAqC,CAAC;AACpD,cAAc,uCAAuC,CAAC"}

package/out/lsp/diagram-server.d.ts

@@ -0,0 +1,6 @@
+import { RequestType } from 'vscode-languageserver-protocol';
+type ConnectionLike = {
+    onRequest: (type: RequestType<any, any, any>, handler: (params: any) => any | Promise<any>) => void;
+};
+export declare function registerDiagramRequests(connection: ConnectionLike, shared: any, oml?: any): void;
+export {};

package/out/lsp/diagram-server.js

@@ -0,0 +1,36 @@
+// Copyright (c) 2026 Modelware. All rights reserved.
+import { computeLaidOutSModelForUri, resolveDefinition, resolveOntologyMemberLabels, } from '@oml/language';
+import { RequestType } from 'vscode-languageserver-protocol';
+const DiagramModelRequest = new RequestType('oml/diagram/model');
+const DefinitionRequest = new RequestType('oml/definition');
+const OntologyLabelsRequest = new RequestType('oml/labels');
+export function registerDiagramRequests(connection, shared, oml) {
+    connection.onRequest(DiagramModelRequest, async ({ modelUri }) => {
+        try {
+            return await computeLaidOutSModelForUri(shared, modelUri);
+        }
+        catch (err) {
+            console.error('[oml] diagram model error', err);
+            return { id: 'root', type: 'graph', children: [] };
+        }
+    });
+    connection.onRequest(DefinitionRequest, async ({ elementId, referencingUri }) => {
+        try {
+            return await resolveDefinition(shared, elementId, referencingUri);
+        }
+        catch (err) {
+            console.error('[oml] definition error', err);
+            return null;
+        }
+    });
+    connection.onRequest(OntologyLabelsRequest, async ({ modelUri }) => {
+        try {
+            return await resolveOntologyMemberLabels(shared, oml, modelUri);
+        }
+        catch (err) {
+            console.error('[oml] labels error', err);
+            return [];
+        }
+    });
+}
+//# sourceMappingURL=diagram-server.js.map

package/out/lsp/diagram-server.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"diagram-server.js","sourceRoot":"","sources":["../../src/lsp/diagram-server.ts"],"names":[],"mappings":"AAAA,qDAAqD;AAGrD,OAAO,EACH,0BAA0B,EAC1B,iBAAiB,EACjB,2BAA2B,GAG9B,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAM7D,MAAM,mBAAmB,GAAG,IAAI,WAAW,CAAyC,mBAAmB,CAAC,CAAC;AACzG,MAAM,iBAAiB,GAAG,IAAI,WAAW,CAA6E,gBAAgB,CAAC,CAAC;AACxI,MAAM,qBAAqB,GAAG,IAAI,WAAW,CAAyD,YAAY,CAAC,CAAC;AAEpH,MAAM,UAAU,uBAAuB,CAAC,UAA0B,EAAE,MAAW,EAAE,GAAS;IACtF,UAAU,CAAC,SAAS,CAAC,mBAAmB,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE;QAC7D,IAAI,CAAC;YACD,OAAO,MAAM,0BAA0B,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC9D,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,2BAA2B,EAAE,GAAG,CAAC,CAAC;YAChD,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAA2B,CAAC;QAChF,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,UAAU,CAAC,SAAS,CAAC,iBAAiB,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,cAAc,EAAE,EAAE,EAAE;QAC5E,IAAI,CAAC;YACD,OAAO,MAAM,iBAAiB,CAAC,MAAM,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC;QACtE,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,wBAAwB,EAAE,GAAG,CAAC,CAAC;YAC7C,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,UAAU,CAAC,SAAS,CAAC,qBAAqB,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE;QAC/D,IAAI,CAAC;YACD,OAAO,MAAM,2BAA2B,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;QACpE,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,oBAAoB,EAAE,GAAG,CAAC,CAAC;YACzC,OAAO,EAAE,CAAC;QACd,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC"}

package/out/lsp/language-server.d.ts

@@ -0,0 +1,13 @@
+import type { DefaultSharedModuleContext } from 'langium/lsp';
+import type { Connection } from 'vscode-languageserver';
+export interface OmlLanguageServerStartOptions {
+    fileSystem: Omit<DefaultSharedModuleContext, 'connection'>;
+    registerDiagramHandlers?: boolean;
+    suppressTransientDiagnostics?: boolean;
+    installNodeProcessHandlers?: boolean;
+}
+export interface OmlLanguageServerRuntime {
+    shared: any;
+    Oml: any;
+}
+export declare function startOmlLanguageServer(connection: Connection, options: OmlLanguageServerStartOptions): OmlLanguageServerRuntime;

package/{src/lsp/language-server.ts → out/lsp/language-server.js}

@@ -1,78 +1,29 @@
 // Copyright (c) 2026 Modelware. All rights reserved.
-
 import { DocumentState, URI } from 'langium';
 import { startLanguageServer } from 'langium/lsp';
-import type { DefaultSharedModuleContext } from 'langium/lsp';
-import type { Connection } from 'vscode-languageserver';
-import {
-    collectOntologyMembers,
-    getIriForNode,
-    getOntologyModelIndex,
-    iriFragment,
-    isDescription,
-    isOntology,
-    type OmlFuzzyIndexedEntry,
-    isVocabulary,
-    registerOmlCandidatesRequests,
-    registerOmlEditRequests,
-    tokenizeForFuzzy,
-} from '@oml/language';
+import { collectOntologyMembers, getIriForNode, getOntologyModelIndex, iriFragment, isDescription, isOntology, isVocabulary, registerOmlCandidatesRequests, registerOmlEditRequests, tokenizeForFuzzy, } from '@oml/language';
 import { createOwlServices, detectSparqlKind, registerShaclValidationRequests } from '@oml/owl';
 import uFuzzy from '@leeoniya/ufuzzy';
-import {
-    MarkdownExecutionRequest,
-    MarkdownExecutor,
-    type MdExecuteBlocksParams,
-    type MdExecuteBlocksResult
-} from '@oml/markdown';
+import { MarkdownExecutionRequest, MarkdownExecutor } from '@oml/markdown';
 import { registerDiagramRequests } from './diagram-server.js';
-import {
-    ReasoningNotifications,
-    ReasoningRequests,
-    type ActiveDocumentParams,
-    type FuzzySearchParams,
-    type FuzzySearchResult,
-    type ResolveModelUriParams,
-    type ResolveModelUriResult,
-    type SemanticChangedParams,
-    type SparqlQueryParams,
-    type SparqlQueryResult,
-    type SparqlTermDto,
-} from './protocol/reasoner-protocol.js';
-
-export interface OmlLanguageServerStartOptions {
-    fileSystem: Omit<DefaultSharedModuleContext, 'connection'>;
-    registerDiagramHandlers?: boolean;
-    suppressTransientDiagnostics?: boolean;
-    installNodeProcessHandlers?: boolean;
-}
-
-export interface OmlLanguageServerRuntime {
-    shared: any;
-    Oml: any;
-}
-
-const workspacePreloadState = new WeakMap<object, { completed: boolean; promise?: Promise<void> }>();
-
-function formatError(error: unknown, depth = 0): string {
+import { ReasoningNotifications, ReasoningRequests, } from './protocol/reasoner-protocol.js';
+const workspacePreloadState = new WeakMap();
+function formatError(error, depth = 0) {
     if (!(error instanceof Error)) {
         return String(error);
     }
-
     const indent = depth > 0 ? '\n' + '  '.repeat(depth) : '';
     const stack = error.stack ? `${indent}${error.stack}` : `${indent}${error.message}`;
-    const cause = (error as any).cause;
+    const cause = error.cause;
     if (cause === undefined) {
         return stack;
     }
     return `${stack}\n${'  '.repeat(depth)}cause: ${formatError(cause, depth + 1)}`;
 }
-
-export function startOmlLanguageServer(connection: Connection, options: OmlLanguageServerStartOptions): OmlLanguageServerRuntime {
-    const logServerError = (scope: string, error: unknown): void => {
+export function startOmlLanguageServer(connection, options) {
+    const logServerError = (scope, error) => {
         connection.console.error(`[oml] ${scope}: ${formatError(error)}`);
     };
-
     if (options.installNodeProcessHandlers) {
         process.on('unhandledRejection', (reason) => {
             logServerError('Unhandled rejection', reason);
@@ -81,9 +32,8 @@ export function startOmlLanguageServer(connection: Connection, options: OmlLangu
             logServerError('Uncaught exception', error);
         });
     }
-
     const sendDiagnostics = connection.sendDiagnostics.bind(connection);
-    connection.sendDiagnostics = ((params: any): Promise<void> => {
+    connection.sendDiagnostics = ((params) => {
         if (!params?.uri) {
             return sendDiagnostics(params);
         }
@@ -91,38 +41,35 @@ export function startOmlLanguageServer(connection: Connection, options: OmlLangu
             return sendDiagnostics({ ...params, diagnostics: [] });
         }
         return sendDiagnostics(params);
-    }) as any;
-
+    });
     const { shared, Oml } = createOwlServices({ connection, ...options.fileSystem });
-
     if (options.registerDiagramHandlers !== false) {
-        registerDiagramRequests(connection as any, shared, Oml);
+        registerDiagramRequests(connection, shared, Oml);
     }
-    registerOmlCandidatesRequests(connection as any, shared);
-    registerOmlEditRequests(connection as any, shared);
-    registerShaclValidationRequests(connection as any, Oml);
-
+    registerOmlCandidatesRequests(connection, shared);
+    registerOmlEditRequests(connection, shared);
+    registerShaclValidationRequests(connection, Oml);
     {
-        const reasoningService = Oml.reasoning.ReasoningService as any;
-        reasoningService.onSemanticChanged((modelUris: string[]) => {
-            const params: SemanticChangedParams = { modelUris };
+        const reasoningService = Oml.reasoning.ReasoningService;
+        reasoningService.onSemanticChanged((modelUris) => {
+            const params = { modelUris };
             connection.sendNotification(ReasoningNotifications.semanticChanged, params);
         });
     }
-    connection.onNotification(ReasoningNotifications.markDocumentActive, ({ modelUri }: ActiveDocumentParams) => {
-        const reasoningService = Oml.reasoning.ReasoningService as any;
+    connection.onNotification(ReasoningNotifications.markDocumentActive, ({ modelUri }) => {
+        const reasoningService = Oml.reasoning.ReasoningService;
         reasoningService.markDocumentActive(modelUri);
     });
-    connection.onNotification(ReasoningNotifications.markDocumentInactive, ({ modelUri }: ActiveDocumentParams) => {
-        const reasoningService = Oml.reasoning.ReasoningService as any;
+    connection.onNotification(ReasoningNotifications.markDocumentInactive, ({ modelUri }) => {
+        const reasoningService = Oml.reasoning.ReasoningService;
         reasoningService.markDocumentInactive(modelUri);
     });
-    connection.onRequest(MarkdownExecutionRequest, async (params: MdExecuteBlocksParams): Promise<MdExecuteBlocksResult> => {
+    connection.onRequest(MarkdownExecutionRequest, async (params) => {
         try {
-            const reasoningService = Oml.reasoning.ReasoningService as any;
-            const ontologyIndex = getOntologyModelIndex(shared as any);
-            const knownNamespaceCache = new Map<string, boolean>();
-            const isKnownOntologyIriNamespace = (ontologyIri: string): boolean => {
+            const reasoningService = Oml.reasoning.ReasoningService;
+            const ontologyIndex = getOntologyModelIndex(shared);
+            const knownNamespaceCache = new Map();
+            const isKnownOntologyIriNamespace = (ontologyIri) => {
                 const normalized = ontologyIri.trim().replace(/[\/#]+$/, '');
                 if (!normalized) {
                     return false;
@@ -148,7 +95,8 @@ export function startOmlLanguageServer(connection: Connection, options: OmlLangu
                 isKnownOntologyIriNamespace,
             });
             return await executor.executeBlocks(params);
-        } catch (error) {
+        }
+        catch (error) {
             logServerError('MarkdownExecutionRequest failed', error);
             return {
                 results: params.blocks.map((block) => ({
@@ -161,9 +109,9 @@ export function startOmlLanguageServer(connection: Connection, options: OmlLangu
             };
         }
     });
-    connection.onRequest(ReasoningRequests.sparqlQuery, async (params: SparqlQueryParams): Promise<SparqlQueryResult> => {
+    connection.onRequest(ReasoningRequests.sparqlQuery, async (params) => {
         try {
-            const reasoningService = Oml.reasoning.ReasoningService as any;
+            const reasoningService = Oml.reasoning.ReasoningService;
             const kind = detectSparqlKind(params.sparql);
             await reasoningService.ensureQueryContext(params.modelUri);
             const sparqlService = reasoningService.getSparqlService();
@@ -173,7 +121,7 @@ export function startOmlLanguageServer(connection: Connection, options: OmlLangu
                     success: result.success,
                     kind,
                     warnings: result.warnings ?? [],
-                    rows: result.rows.map((row: Map<string, any>) => toRowDto(row)),
+                    rows: result.rows.map((row) => toRowDto(row)),
                     error: result.error,
                 };
             }
@@ -193,7 +141,7 @@ export function startOmlLanguageServer(connection: Connection, options: OmlLangu
                     success: result.success,
                     kind,
                     warnings: result.warnings ?? [],
-                    quads: result.quads.map((quad: any) => ({
+                    quads: result.quads.map((quad) => ({
                         subject: quad.subject.value,
                         predicate: quad.predicate.value,
                         object: quad.object.value,
@@ -208,7 +156,8 @@ export function startOmlLanguageServer(connection: Connection, options: OmlLangu
                 warnings: [],
                 error: 'Unsupported or unknown SPARQL query kind.',
             };
-        } catch (error) {
+        }
+        catch (error) {
             logServerError('oml/query failed', error);
             return {
                 success: false,
@@ -218,22 +167,21 @@ export function startOmlLanguageServer(connection: Connection, options: OmlLangu
             };
         }
     });
-
-    connection.onRequest(ReasoningRequests.fuzzySearch, async (params: FuzzySearchParams): Promise<FuzzySearchResult> => {
+    connection.onRequest(ReasoningRequests.fuzzySearch, async (params) => {
         try {
             const text = (params.text ?? '').trim();
             if (!text) {
                 return { success: true, candidates: [] };
             }
             const limit = Math.max(1, Math.min(50, params.limit ?? 12));
-            const ontologyIndex = getOntologyModelIndex(shared as any);
-            const langiumDocuments: any = shared.workspace.LangiumDocuments;
+            const ontologyIndex = getOntologyModelIndex(shared);
+            const langiumDocuments = shared.workspace.LangiumDocuments;
             const allDocs = langiumDocuments.all ?? [];
-            const iterable: any[] = Array.isArray(allDocs)
+            const iterable = Array.isArray(allDocs)
                 ? allDocs
-                : (typeof allDocs?.toArray === 'function' ? allDocs.toArray() : Array.from(allDocs as Iterable<any>));
-            const modelUris: string[] = [];
-            const candidateByIri = new Map<string, { iri: string; label?: string }>();
+                : (typeof allDocs?.toArray === 'function' ? allDocs.toArray() : Array.from(allDocs));
+            const modelUris = [];
+            const candidateByIri = new Map();
             for (const doc of iterable) {
                 const root = doc?.parseResult?.value;
                 if (!root || !isOntology(root) || (!isVocabulary(root) && !isDescription(root))) {
@@ -254,8 +202,7 @@ export function startOmlLanguageServer(connection: Connection, options: OmlLangu
                 entry.label = label;
                 candidateByIri.set(iri, entry);
             }
-
-            const indexedEntries: OmlFuzzyIndexedEntry[] = [...candidateByIri.values()].map((entry) => ({
+            const indexedEntries = [...candidateByIri.values()].map((entry) => ({
                 iri: entry.iri,
                 label: entry.label,
                 fragment: iriFragment(entry.iri),
@@ -271,11 +218,11 @@ export function startOmlLanguageServer(connection: Connection, options: OmlLangu
             const info = uf.info(filtered, haystack, text);
             const order = info ? uf.sort(info, haystack, text) : null;
             const ranked = (order ?? filtered.map((_, index) => index))
-                .map((index) => filtered[index]!)
+                .map((index) => filtered[index])
                 .slice(0, limit);
             const queryTokens = tokenizeForFuzzy(text).slice(0, 6);
             const candidates = ranked.map((entryIndex, index) => {
-                const entry = indexedEntries[entryIndex]!;
+                const entry = indexedEntries[entryIndex];
                 const fragment = entry.fragment.toLowerCase();
                 const lowerLabel = (entry.label ?? '').toLowerCase();
                 const lowerInput = text.toLowerCase();
@@ -308,13 +255,13 @@ export function startOmlLanguageServer(connection: Connection, options: OmlLangu
                 };
             });
             return { success: true, candidates };
-        } catch (error) {
+        }
+        catch (error) {
             logServerError('oml/fuzzysearch failed', error);
             return { success: false, candidates: [], error: error instanceof Error ? error.message : String(error) };
         }
     });
-
-    connection.onRequest(ReasoningRequests.resolveModelUri, async (params: ResolveModelUriParams): Promise<ResolveModelUriResult> => {
+    connection.onRequest(ReasoningRequests.resolveModelUri, async (params) => {
         await ensureWorkspaceIndexed(shared);
         const ontologyIri = typeof params?.ontologyIri === 'string' ? params.ontologyIri.trim() : '';
         if (!ontologyIri) {
@@ -324,38 +271,35 @@ export function startOmlLanguageServer(connection: Connection, options: OmlLangu
             ? params.referencingUri.trim()
             : undefined;
         const normalized = normalizeOntologyIri(ontologyIri);
-        const ontologyIndex = getOntologyModelIndex(shared as any);
+        const ontologyIndex = getOntologyModelIndex(shared);
         const modelUri = ontologyIndex.resolveModelUri(normalized, referencingUri);
         if (modelUri) {
             await ensureResolvedModelDocumentLoaded(shared, modelUri);
         }
         return modelUri ? { modelUri } : {};
     });
-
     startLanguageServer(shared, {
         CodeActionProvider: DocumentState.IndexedReferences
     });
     return { shared, Oml };
 }
-
-function normalizeOntologyIri(value: string): string {
+function normalizeOntologyIri(value) {
     return value.replace(/^<|>$/g, '').replace(/[\/#]+$/, '');
 }
-
-function isTransientDiagnosticsUri(uri: string): boolean {
+function isTransientDiagnosticsUri(uri) {
     try {
         const scheme = URI.parse(uri).scheme;
         return scheme === 'git'
             || scheme === 'chat-editing-text-model'
             || scheme === 'chat-editing-snapshot-text-model'
             || scheme === 'vscode-chat-code-block';
-    } catch {
+    }
+    catch {
         return false;
     }
 }
-
-async function ensureWorkspaceIndexed(sharedServices: any): Promise<void> {
-    const key = sharedServices as object;
+async function ensureWorkspaceIndexed(sharedServices) {
+    const key = sharedServices;
     const existing = workspacePreloadState.get(key);
     if (existing?.completed) {
         return;
@@ -371,7 +315,7 @@ async function ensureWorkspaceIndexed(sharedServices: any): Promise<void> {
         const builder = sharedServices.workspace.DocumentBuilder;
         await workspace.ready;
         const folderUris = workspace.workspaceFolders ?? [];
-        const omlUris = new Set<string>();
+        const omlUris = new Set();
         for (const folder of folderUris) {
             const entries = await workspace.searchFolder(URI.parse(folder.uri));
             for (const entry of entries) {
@@ -382,9 +326,7 @@ async function ensureWorkspaceIndexed(sharedServices: any): Promise<void> {
             }
         }
         if (omlUris.size > 0) {
-            const docs = await Promise.all(
-                [...omlUris].map((uri) => documents.getOrCreateDocument(URI.parse(uri)))
-            );
+            const docs = await Promise.all([...omlUris].map((uri) => documents.getOrCreateDocument(URI.parse(uri))));
             await builder.build(docs, { validation: { categories: ['built-in', 'fast'] } });
         }
         state.completed = true;
@@ -395,22 +337,21 @@ async function ensureWorkspaceIndexed(sharedServices: any): Promise<void> {
     workspacePreloadState.set(key, state);
     await promise;
 }
-
-async function ensureResolvedModelDocumentLoaded(sharedServices: any, modelUri: string): Promise<void> {
+async function ensureResolvedModelDocumentLoaded(sharedServices, modelUri) {
     try {
         const documents = sharedServices.workspace.LangiumDocuments;
         const uri = URI.parse(modelUri);
         if (!documents.getDocument(uri)) {
             await documents.getOrCreateDocument(uri);
         }
-    } catch {
+    }
+    catch {
         // Resolution must stay deterministic and non-throwing;
         // loading failures are surfaced later by query/edit operations.
     }
 }
-
-function toRowDto(row: Map<string, any>): Record<string, SparqlTermDto> {
-    const result: Record<string, SparqlTermDto> = {};
+function toRowDto(row) {
+    const result = {};
     for (const [name, term] of row.entries()) {
         result[name] = {
             termType: term.termType,
@@ -421,3 +362,4 @@ function toRowDto(row: Map<string, any>): Record<string, SparqlTermDto> {
     }
     return result;
 }
+//# sourceMappingURL=language-server.js.map