@oml/server 0.14.0 → 0.14.2

package/{src/rest/validation.ts → out/rest/validation.js}

@@ -1,100 +1,15 @@
 // Copyright (c) 2026 Modelware. All rights reserved.
-
 import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
 import { pathToFileURL } from 'node:url';
 import { createHash } from 'node:crypto';
-import { checkConsistency, type ConsistencyResult } from '@oml/reasoner';
+import { checkConsistency } from '@oml/reasoner';
 import { extractLeadingFrontMatter, MarkdownHandlerRegistry, MarkdownPreviewRuntime } from '@oml/markdown';
 import { createDefaultShaclService } from '@oml/owl';
 import { getOntologyModelIndex } from '@oml/language';
-import {
-    buildTemplateCatalog,
-    expandTemplateComposeBlocks,
-    findFilesByExtension,
-    frontMatterString,
-    isTemplateMarkdownFile,
-    normalizeContextOntologyIri,
-} from './template.js';
-
-export interface RestLintProblem {
-    uri: string;
-    line: number;
-    column: number;
-    kind: 'error' | 'warning' | 'information' | 'hint' | 'unknown';
-    severity: number;
-    message: string;
-    source?: string;
-    code?: string | number;
-}
-
-export interface RestLintResult {
-    success: boolean;
-    filesChecked: number;
-    errors: number;
-    warnings: number;
-    elapsedMs: number;
-    totalProblems: number;
-    returnedProblems: number;
-    truncated: boolean;
-    limit?: number;
-    problems: RestLintProblem[];
-    problemsByModelUri: Array<{
-        modelUri: string;
-        errors: number;
-        warnings: number;
-        problems: RestLintProblem[];
-    }>;
-}
-
-type RdfFormat = 'ttl' | 'trig' | 'nt' | 'nq' | 'n3';
-
-type WorkspaceOwlEntry = { modelUri: string; ontologyIri: string; owlPath: string };
-
-type ValidateBlockCachedResult = {
-    errors: number;
-    warnings: number;
-    detail: Record<string, unknown>;
-};
-
-type ValidateBlockCacheEntry = {
-    fingerprint: string;
-    result: ValidateBlockCachedResult;
-};
-
-type ReasonModelCachedResult = {
-    consistent: boolean;
-    ontologyIri: string;
-    result?: ConsistencyResult;
-    error?: string;
-};
-
-type ReasonModelCacheEntry = {
-    fingerprint: string;
-    result: ReasonModelCachedResult;
-};
-
-type ValidationRuntimeCache = {
-    validateBlockCache: Map<string, ValidateBlockCacheEntry>;
-    reasonModelCache: Map<string, ReasonModelCacheEntry>;
-};
-
-const validationRuntimeCaches = new WeakMap<object, ValidationRuntimeCache>();
-
-export type RestValidationContext = {
-    workspaceRoot: string;
-    runtime: { shared: any; Oml: any };
-    ensureInitialized: () => Promise<void>;
-    ensureWorkspaceCurrent: () => Promise<void>;
-    getWorkspaceOmlDocuments: () => any[];
-    writeWorkspaceAssertedOwl: (
-        outputDir: string,
-        format: RdfFormat,
-        pretty: boolean,
-    ) => Promise<WorkspaceOwlEntry[]>;
-};
-
-function normalizeRdfFormat(value: string | undefined): RdfFormat {
+import { buildTemplateCatalog, expandTemplateComposeBlocks, findFilesByExtension, frontMatterString, isTemplateMarkdownFile, normalizeContextOntologyIri, } from './template.js';
+const validationRuntimeCaches = new WeakMap();
+function normalizeRdfFormat(value) {
     if (!value) {
         return 'ttl';
     }
@@ -104,35 +19,35 @@ function normalizeRdfFormat(value: string | undefined): RdfFormat {
     }
     return 'ttl';
 }
-
-function diagnosticKindFromSeverity(severity: unknown): RestLintProblem['kind'] {
-    if (severity === 1) return 'error';
-    if (severity === 2) return 'warning';
-    if (severity === 3) return 'information';
-    if (severity === 4) return 'hint';
+function diagnosticKindFromSeverity(severity) {
+    if (severity === 1)
+        return 'error';
+    if (severity === 2)
+        return 'warning';
+    if (severity === 3)
+        return 'information';
+    if (severity === 4)
+        return 'hint';
     return 'unknown';
 }
-
-function hashText(value: string): string {
+function hashText(value) {
     return createHash('sha256').update(value, 'utf-8').digest('hex');
 }
-
-function getValidationRuntimeCache(client: RestValidationContext): ValidationRuntimeCache {
-    const key = client.runtime.shared as object;
+function getValidationRuntimeCache(client) {
+    const key = client.runtime.shared;
     const existing = validationRuntimeCaches.get(key);
     if (existing) {
         return existing;
     }
-    const created: ValidationRuntimeCache = {
+    const created = {
         validateBlockCache: new Map(),
         reasonModelCache: new Map(),
     };
     validationRuntimeCaches.set(key, created);
     return created;
 }
-
-function getModelContentFingerprints(client: RestValidationContext): Map<string, string> {
-    const fingerprints = new Map<string, string>();
+function getModelContentFingerprints(client) {
+    const fingerprints = new Map();
     const docs = client.getWorkspaceOmlDocuments();
     for (const doc of docs) {
         const modelUri = String(doc?.uri ?? '').trim();
@@ -146,8 +61,7 @@ function getModelContentFingerprints(client: RestValidationContext): Map<string,
     }
     return fingerprints;
 }
-
-export async function lintWorkspace(client: RestValidationContext, params: Record<string, unknown> = {}): Promise<RestLintResult> {
+export async function lintWorkspace(client, params = {}) {
     const startedAt = Date.now();
     await client.ensureInitialized();
     await client.ensureWorkspaceCurrent();
@@ -156,7 +70,7 @@ export async function lintWorkspace(client: RestValidationContext, params: Recor
         ? Math.floor(rawLimit)
         : undefined;
     const docs = client.getWorkspaceOmlDocuments();
-    const allProblems: RestLintProblem[] = [];
+    const allProblems = [];
     let errors = 0;
     let warnings = 0;
     for (const doc of docs) {
@@ -167,7 +81,8 @@ export async function lintWorkspace(client: RestValidationContext, params: Recor
             const kind = diagnosticKindFromSeverity(severity);
             if (kind === 'error') {
                 errors += 1;
-            } else if (kind === 'warning') {
+            }
+            else if (kind === 'warning') {
                 warnings += 1;
             }
             allProblems.push({
@@ -184,14 +99,12 @@ export async function lintWorkspace(client: RestValidationContext, params: Recor
             });
         }
     }
-    allProblems.sort((left, right) =>
-        left.uri.localeCompare(right.uri)
+    allProblems.sort((left, right) => left.uri.localeCompare(right.uri)
         || left.message.localeCompare(right.message)
         || left.line - right.line
-        || left.column - right.column
-    );
+        || left.column - right.column);
     const limitedProblems = limit === undefined ? allProblems : allProblems.slice(0, limit);
-    const grouped = new Map<string, RestLintProblem[]>();
+    const grouped = new Map();
     for (const problem of limitedProblems) {
         const existing = grouped.get(problem.uri) ?? [];
         existing.push(problem);
@@ -199,15 +112,12 @@ export async function lintWorkspace(client: RestValidationContext, params: Recor
     }
     const problemsByModelUri = Array.from(grouped.entries())
         .map(([modelUri, problems]) => ({
-            modelUri,
-            errors: problems.filter((problem) => problem.kind === 'error').length,
-            warnings: problems.filter((problem) => problem.kind === 'warning').length,
-            problems: problems.sort((left, right) =>
-                left.message.localeCompare(right.message) || left.line - right.line || left.column - right.column
-            ),
-        }))
+        modelUri,
+        errors: problems.filter((problem) => problem.kind === 'error').length,
+        warnings: problems.filter((problem) => problem.kind === 'warning').length,
+        problems: problems.sort((left, right) => left.message.localeCompare(right.message) || left.line - right.line || left.column - right.column),
+    }))
         .sort((left, right) => left.modelUri.localeCompare(right.modelUri));
-
     return {
         success: errors === 0 && warnings === 0,
         filesChecked: docs.length,
@@ -222,12 +132,11 @@ export async function lintWorkspace(client: RestValidationContext, params: Recor
         problemsByModelUri,
     };
 }
-
-export async function reasonWorkspace(client: RestValidationContext, params: Record<string, unknown>): Promise<Record<string, unknown>> {
+export async function reasonWorkspace(client, params) {
     const startedAt = Date.now();
     await client.ensureInitialized();
     await client.ensureWorkspaceCurrent();
-    let validateResult: Record<string, unknown> | undefined;
+    let validateResult;
     if (params.only !== true) {
         validateResult = await validateWorkspace(client, {
             only: false,
@@ -240,9 +149,9 @@ export async function reasonWorkspace(client: RestValidationContext, params: Rec
                 elapsedMs: Math.max(0, Date.now() - startedAt),
                 inconsistent: [],
                 failed: [{
-                    modelUri: '',
-                    error: String(validateResult.error ?? 'validate failed'),
-                }],
+                        modelUri: '',
+                        error: String(validateResult.error ?? 'validate failed'),
+                    }],
                 validate: validateResult,
             };
         }
@@ -254,26 +163,18 @@ export async function reasonWorkspace(client: RestValidationContext, params: Rec
         await fs.rm(tempRoot, { recursive: true, force: true });
         return { success: true, ontologiesReasoned: 0, inconsistent: [], failed: [] };
     }
-
     const explanation = params.explanation !== false;
     const uniqueNamesAssumption = params.uniqueNamesAssumption === true;
     const profile = params.profile === true;
     const timeout = typeof params.timeout === 'number' && Number.isFinite(params.timeout) && params.timeout > 0
         ? Math.floor(params.timeout)
-        : 120_000;
-    const inconsistent: Array<{ modelUri: string; validationWarnings: string[] }> = [];
-    const failed: Array<{ modelUri: string; error: string }> = [];
-    const results: Array<{
-        modelUri: string;
-        ontologyIri: string;
-        consistent: boolean;
-        result?: ConsistencyResult;
-        error?: string;
-    }> = [];
+        : 120000;
+    const inconsistent = [];
+    const failed = [];
+    const results = [];
     const runtimeCache = getValidationRuntimeCache(client);
     const modelFingerprints = getModelContentFingerprints(client);
-    const seenReasonKeys = new Set<string>();
-
+    const seenReasonKeys = new Set();
     const reasonStartedAt = Date.now();
     for (const entry of entries) {
         const modelFingerprint = modelFingerprints.get(entry.modelUri) ?? '';
@@ -321,7 +222,7 @@ export async function reasonWorkspace(client: RestValidationContext, params: Rec
                 timeout,
             });
             const warnings = Array.isArray(result.reports) ? result.reports : [];
-            const modelResult: ReasonModelCachedResult = {
+            const modelResult = {
                 consistent: result.consistent,
                 ontologyIri: entry.ontologyIri,
                 result,
@@ -342,7 +243,8 @@ export async function reasonWorkspace(client: RestValidationContext, params: Rec
                 consistent: result.consistent,
                 result,
             });
-        } catch (error) {
+        }
+        catch (error) {
             const message = error instanceof Error ? error.message : String(error);
             const modelError = message || 'reason failed';
             runtimeCache.reasonModelCache.set(entry.modelUri, {
@@ -371,7 +273,6 @@ export async function reasonWorkspace(client: RestValidationContext, params: Rec
         }
     }
     await fs.rm(tempRoot, { recursive: true, force: true });
-
     return {
         success: failed.length === 0 && inconsistent.length === 0,
         ontologiesReasoned: entries.length,
@@ -383,12 +284,11 @@ export async function reasonWorkspace(client: RestValidationContext, params: Rec
         validate: validateResult,
     };
 }
-
-export async function validateWorkspace(client: RestValidationContext, params: Record<string, unknown>): Promise<Record<string, unknown>> {
+export async function validateWorkspace(client, params) {
     const startedAt = Date.now();
     await client.ensureInitialized();
     await client.ensureWorkspaceCurrent();
-    let lint: RestLintResult | undefined;
+    let lint;
     if (params.only !== true) {
         lint = await lintWorkspace(client, { limit: params.lintLimit });
         if (lint.errors > 0 || lint.warnings > 0) {
@@ -407,32 +307,25 @@ export async function validateWorkspace(client: RestValidationContext, params: R
     const markdownFiles = await findFilesByExtension(workspaceRoot, '.md');
     const templateCatalog = await buildTemplateCatalog(workspaceRoot);
     const runtime = new MarkdownPreviewRuntime(new MarkdownHandlerRegistry());
-    const ontologyIndex = getOntologyModelIndex(client.runtime.shared as any);
-    const reasoningService = client.runtime.Oml.reasoning.ReasoningService as any;
-    const shaclService = createDefaultShaclService(
-        reasoningService.getSparqlService(),
-        (uri) => reasoningService.ensureQueryContext(uri),
-        (uri) => reasoningService.getContextIri(uri),
-    );
+    const ontologyIndex = getOntologyModelIndex(client.runtime.shared);
+    const reasoningService = client.runtime.Oml.reasoning.ReasoningService;
+    const shaclService = createDefaultShaclService(reasoningService.getSparqlService(), (uri) => reasoningService.ensureQueryContext(uri), (uri) => reasoningService.getContextIri(uri));
     const runtimeCache = getValidationRuntimeCache(client);
     const modelFingerprints = getModelContentFingerprints(client);
-    const seenValidateKeys = new Set<string>();
+    const seenValidateKeys = new Set();
     let filesChecked = 0;
     let errors = 0;
     let warnings = 0;
-    const details: Array<Record<string, unknown>> = [];
-
+    const details = [];
     for (const markdownPath of markdownFiles) {
         const markdown = await fs.readFile(markdownPath, 'utf-8');
         if (isTemplateMarkdownFile(markdown)) {
             continue;
         }
         const frontMatter = extractLeadingFrontMatter(markdown);
-        const contextOntologyIri = normalizeContextOntologyIri(
-            frontMatter?.contextOntologyIri
-                ?? frontMatterString(frontMatter?.data, 'ontologyIri')
-                ?? frontMatterString(frontMatter?.data, 'ontology')
-        );
+        const contextOntologyIri = normalizeContextOntologyIri(frontMatter?.contextOntologyIri
+            ?? frontMatterString(frontMatter?.data, 'ontologyIri')
+            ?? frontMatterString(frontMatter?.data, 'ontology'));
         const contextMemberIri = frontMatterString(frontMatter?.data, 'memberIri')
             ?? frontMatterString(frontMatter?.data, 'contextMemberIri');
         const markdownUri = pathToFileURL(markdownPath).toString();
@@ -504,11 +397,13 @@ export async function validateWorkspace(client: RestValidationContext, params: R
             let blockWarnings = 0;
             if (result.error) {
                 blockErrors += 1;
-            } else if (!result.conforms) {
+            }
+            else if (!result.conforms) {
                 for (const issue of result.issues) {
                     if (String(issue.severity ?? '').toLowerCase().includes('warning')) {
                         blockWarnings += 1;
-                    } else {
+                    }
+                    else {
                         blockErrors += 1;
                     }
                 }
@@ -553,3 +448,4 @@ export async function validateWorkspace(client: RestValidationContext, params: R
         lint,
     };
 }
+//# sourceMappingURL=validation.js.map

package/out/rest/validation.js.map

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

package/package.json

@@ -1,8 +1,13 @@
 {
     "name": "@oml/server",
     "description": "Standalone OML language server host",
-    "version": "0.14.0",
+    "version": "0.14.2",
     "type": "module",
+    "files": [
+        "out",
+        "README.md",
+        "package.json"
+    ],
     "main": "./out/index.js",
     "exports": {
         ".": "./out/index.js",
@@ -22,9 +27,9 @@
     },
     "dependencies": {
         "@leeoniya/ufuzzy": "^1.0.19",
-        "@oml/language": "0.14.0",
-        "@oml/markdown": "0.14.0",
-        "@oml/owl": "0.14.0",
+        "@oml/language": "0.14.2",
+        "@oml/markdown": "0.14.2",
+        "@oml/owl": "0.14.2",
         "@oml/platform": "^0.5.0",
         "@oml/reasoner": "^0.3.0",
         "langium": "^4.2.1",

package/src/lsp/diagram-server.ts

@@ -1,48 +0,0 @@
-// Copyright (c) 2026 Modelware. All rights reserved.
-
-import type { SModelRoot } from 'sprotty-protocol';
-import {
-    computeLaidOutSModelForUri,
-    resolveDefinition,
-    resolveOntologyMemberLabels,
-    type OntologyMemberLabelEntry,
-    type RangeResponse,
-} from '@oml/language';
-import { RequestType } from 'vscode-languageserver-protocol';
-
-type ConnectionLike = {
-    onRequest: (type: RequestType<any, any, any>, handler: (params: any) => any | Promise<any>) => void;
-};
-
-const DiagramModelRequest = new RequestType<{ modelUri: string }, SModelRoot, void>('oml/diagram/model');
-const DefinitionRequest = new RequestType<{ elementId: string; referencingUri?: string }, RangeResponse | null, void>('oml/definition');
-const OntologyLabelsRequest = new RequestType<{ modelUri: string }, OntologyMemberLabelEntry[], void>('oml/labels');
-
-export function registerDiagramRequests(connection: ConnectionLike, shared: any, oml?: any): void {
-    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: [] } as unknown as SModelRoot;
-        }
-    });
-
-    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 [];
-        }
-    });
-}

package/tsconfig.json

@@ -1,22 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "rootDir": "src",
-    "outDir": "out",
-    "declarationDir": "out"
-  },
-  "references": [
-    {
-      "path": "../owl/tsconfig.json"
-    },
-    {
-      "path": "../markdown/tsconfig.json"
-    },
-    {
-      "path": "../language/tsconfig.src.json"
-    }
-  ],
-  "include": [
-    "src/**/*.ts"
-  ]
-}