@oml/owl 0.14.14 → 0.14.16

package/src/owl/owl-service.ts

@@ -1,9 +1,10 @@
 // Copyright (c) 2026 Modelware. All rights reserved.
 
 import { DocumentState, URI, type LangiumDocument } from 'langium';
-import type { NamedNode, Quad } from 'n3';
+import { DataFactory, type NamedNode, type Quad } from 'n3';
 import { OmlIndex, getOntologyModelIndex, isDescription, isDescriptionBundle, isOntology, isVocabulary, isVocabularyBundle, type Import, type OmlServices, type Ontology } from '@oml/language';
 import { Oml2OwlMapper } from './owl-mapper.js';
+import { VocabularyBundleClosureBuilder } from './owl-closure.js';
 import { ReasoningStore } from './owl-store.js';
 import { ABoxChainer, ABoxEntailmentCache, type ChainingResult } from './owl-abox.js';
 import { ImportGraph } from './owl-imports.js';
@@ -73,7 +74,7 @@ export class ReasoningService {
         const importedModelUris = this.extractImportedModelUris(ontology as Ontology);
         this.importGraph.update(modelUri, importedModelUris);
 
-        const quads = this.mapper.toQuads(ontology as Ontology);
+        const quads = this.mapOntologyToQuads(ontology as Ontology);
         const diff = this.reasoningStore.diffModel(modelUri, quads);
         if (diff.isEmpty) {
             return;
@@ -91,6 +92,7 @@ export class ReasoningService {
             const tboxIndex = this.tboxIndexBuilder.buildOwn(modelUri, ontology);
             this.tboxIndexCache.setOwn(modelUri, tboxIndex);
             const dependents = this.importGraph.dependentsOf(modelUri);
+            this.refreshDependentVocabularyBundleModels(dependents);
             this.tboxIndexCache.invalidateMergedAll(dependents);
             this.aboxEntailmentCache.markDirtyAll(dependents);
             for (const dependent of dependents) {
@@ -659,6 +661,62 @@ export class ReasoningService {
             listener(unique);
         }
     }
+
+    private mapOntologyToQuads(ontology: Ontology): Quad[] {
+        const mapped = this.mapper.toQuads(ontology);
+        if (!isVocabularyBundle(ontology)) {
+            return mapped;
+        }
+        const builder = this.createVocabularyBundleClosureBuilder();
+        const closure = builder.buildClosureQuads(ontology)
+            .map((quad) => DataFactory.quad(quad.subject, quad.predicate, quad.object));
+        return [...mapped, ...closure];
+    }
+
+    private createVocabularyBundleClosureBuilder(): VocabularyBundleClosureBuilder {
+        const ontologyByNamespace = new Map<string, Ontology>();
+        const documents = this.services.shared.workspace.LangiumDocuments;
+        const all = documents.all ?? [];
+        const iterable: LangiumDocument[] = Array.isArray(all)
+            ? all
+            : (typeof (all as any)?.toArray === 'function'
+                ? (all as any).toArray()
+                : Array.from(all as Iterable<LangiumDocument>));
+
+        for (const document of iterable) {
+            const root = document?.parseResult?.value;
+            if (!isOntology(root)) {
+                continue;
+            }
+            const ontology = root as Ontology;
+            const namespace = this.normalizeNamespace((ontology as any).namespace ?? '').replace(/[\/#]+$/, '');
+            if (!namespace) {
+                continue;
+            }
+            ontologyByNamespace.set(namespace, ontology);
+        }
+        return new VocabularyBundleClosureBuilder(ontologyByNamespace);
+    }
+
+    private refreshDependentVocabularyBundleModels(modelUris: ReadonlyArray<string>): void {
+        for (const modelUri of modelUris) {
+            const document = this.services.shared.workspace.LangiumDocuments.getDocument(URI.parse(modelUri));
+            if (!document) {
+                continue;
+            }
+            const ontology = document.parseResult?.value;
+            if (!isVocabularyBundle(ontology)) {
+                continue;
+            }
+            const quads = this.mapOntologyToQuads(ontology);
+            const diff = this.reasoningStore.diffModel(modelUri, quads);
+            if (diff.isEmpty) {
+                continue;
+            }
+            this.reasoningStore.retractModel(modelUri);
+            this.reasoningStore.loadModel(modelUri, quads);
+        }
+    }
 }
 
 export interface PreparedReasonedModel {