@oml/language 0.19.1 → 0.19.3

package/out/oml/oml-update.js

@@ -213,9 +213,9 @@ async function executeOperation(shared, context, operation, contexts) {
             return new Set([context.ontologyIri]);
         case 'createInstanceRef':
             ensureDescriptionOntology(context.ontology, operation.kind);
-            await ensureReferenceImport(shared, context.ontology, operation.instanceIri);
+            await ensureReferenceImport(shared, context.ontology, operation.instanceIri, contexts);
             if (operation.typeIri) {
-                await ensureReferenceImport(shared, context.ontology, operation.typeIri);
+                await ensureReferenceImport(shared, context.ontology, operation.typeIri, contexts);
             }
             {
                 const ownedTypes = [];
@@ -241,9 +241,9 @@ async function executeOperation(shared, context, operation, contexts) {
             return new Set([context.ontologyIri]);
         case 'createRelationInstanceRef':
             ensureDescriptionOntology(context.ontology, operation.kind);
-            await ensureReferenceImport(shared, context.ontology, operation.instanceIri);
+            await ensureReferenceImport(shared, context.ontology, operation.instanceIri, contexts);
             if (operation.typeIri) {
-                await ensureReferenceImport(shared, context.ontology, operation.typeIri);
+                await ensureReferenceImport(shared, context.ontology, operation.typeIri, contexts);
             }
             {
                 const ownedTypes = [];
@@ -271,12 +271,12 @@ async function executeOperation(shared, context, operation, contexts) {
             return new Set([context.ontologyIri]);
         case 'addAssertion':
             ensureDescriptionOntology(context.ontology, operation.kind);
-            return await addAssertion(shared, context.ontology, operation.subjectIri, operation.predicateIri, operation.object)
+            return await addAssertion(shared, context.ontology, operation.subjectIri, operation.predicateIri, operation.object, contexts)
                 ? new Set([context.ontologyIri])
                 : new Set();
         case 'updateAssertion':
             ensureDescriptionOntology(context.ontology, operation.kind);
-            return await updateAssertion(shared, context.ontology, operation.subjectIri, operation.predicateIri, operation.object)
+            return await updateAssertion(shared, context.ontology, operation.subjectIri, operation.predicateIri, operation.object, contexts)
                 ? new Set([context.ontologyIri])
                 : new Set();
         case 'removeAssertion':
@@ -285,11 +285,11 @@ async function executeOperation(shared, context, operation, contexts) {
                 ? new Set([context.ontologyIri])
                 : new Set();
         case 'addAnnotation':
-            return await addAnnotation(shared, context.ontology, operation.subjectIri, operation.predicateIri, operation.object)
+            return await addAnnotation(shared, context.ontology, operation.subjectIri, operation.predicateIri, operation.object, contexts)
                 ? new Set([context.ontologyIri])
                 : new Set();
         case 'updateAnnotation':
-            return await updateAnnotation(shared, context.ontology, operation.subjectIri, operation.predicateIri, operation.object)
+            return await updateAnnotation(shared, context.ontology, operation.subjectIri, operation.predicateIri, operation.object, contexts)
                 ? new Set([context.ontologyIri])
                 : new Set();
         case 'removeAnnotation':
@@ -343,7 +343,7 @@ function ensureUniqueLocalName(ontology, memberName) {
         throw new Error(`A member named '${memberName}' already exists in the ontology.`);
     }
 }
-async function addAssertion(shared, ontology, subjectIri, predicateIri, objectValue) {
+async function addAssertion(shared, ontology, subjectIri, predicateIri, objectValue, contexts) {
     const normalizedPredicate = normalizeIri(predicateIri);
     const subject = findNamedInstanceByIri(ontology, subjectIri);
     if (!subject) {
@@ -354,7 +354,7 @@ async function addAssertion(shared, ontology, subjectIri, predicateIri, objectVa
         if ((subject.ownedTypes ?? []).some((entry) => matchesPredicateRef(ontology, entry?.type, normalizedTypeIri))) {
             return false;
         }
-        await ensureReferenceImport(shared, ontology, normalizedTypeIri);
+        await ensureReferenceImport(shared, ontology, normalizedTypeIri, contexts);
         subject.ownedTypes ?? (subject.ownedTypes = []);
         pushAstArrayChild(subject, 'ownedTypes', {
             $type: 'TypeAssertion',
@@ -367,7 +367,7 @@ async function addAssertion(shared, ontology, subjectIri, predicateIri, objectVa
             throw new Error(`Predicate '${predicateIri}' applies only to relation instances.`);
         }
         const sourceIri = normalizeIri(asRequiredIri(objectValue, 'source assertion object'));
-        await ensureReferenceImport(shared, ontology, sourceIri);
+        await ensureReferenceImport(shared, ontology, sourceIri, contexts);
         subject.sources ?? (subject.sources = []);
         subject.sources.push(asRef(ontology, sourceIri));
         return true;
@@ -377,7 +377,7 @@ async function addAssertion(shared, ontology, subjectIri, predicateIri, objectVa
             throw new Error(`Predicate '${predicateIri}' applies only to relation instances.`);
         }
         const targetIri = normalizeIri(asRequiredIri(objectValue, 'target assertion object'));
-        await ensureReferenceImport(shared, ontology, targetIri);
+        await ensureReferenceImport(shared, ontology, targetIri, contexts);
         subject.targets ?? (subject.targets = []);
         subject.targets.push(asRef(ontology, targetIri));
         return true;
@@ -387,7 +387,7 @@ async function addAssertion(shared, ontology, subjectIri, predicateIri, objectVa
         .filter((assertion) => matchesPredicateRef(ontology, assertion?.property, normalizedPredicate));
     let propertyAssertion = matchingAssertions[0];
     if (!propertyAssertion) {
-        await ensureReferenceImport(shared, ontology, normalizedPredicate);
+        await ensureReferenceImport(shared, ontology, normalizedPredicate, contexts);
         propertyAssertion = {
             $type: 'PropertyValueAssertion',
             property: asRef(ontology, normalizedPredicate),
@@ -401,10 +401,10 @@ async function addAssertion(shared, ontology, subjectIri, predicateIri, objectVa
         normalizePropertyAssertionGroup(subject, propertyAssertion, matchingAssertions.slice(1));
     }
     if (isIriLike(objectValue)) {
-        await ensureReferenceImport(shared, ontology, normalizeIri(asRequiredIri(objectValue, 'assertion object')));
+        await ensureReferenceImport(shared, ontology, normalizeIri(asRequiredIri(objectValue, 'assertion object')), contexts);
     }
     else {
-        await ensureTypedLiteralDatatypeImport(shared, ontology, objectValue);
+        await ensureTypedLiteralDatatypeImport(shared, ontology, objectValue, contexts);
     }
     appendAssertionValue(ontology, propertyAssertion, objectValue);
     normalizeAllPropertyAssertions(subject, ontology);
@@ -498,7 +498,7 @@ function removeAssertion(ontology, subjectIri, predicateIri, objectValue) {
     subject.ownedPropertyValues = remaining;
     return changed;
 }
-async function updateAssertion(shared, ontology, subjectIri, predicateIri, objectValue) {
+async function updateAssertion(shared, ontology, subjectIri, predicateIri, objectValue, contexts) {
     const normalizedPredicate = normalizeIri(predicateIri);
     const subject = findNamedInstanceByIri(ontology, subjectIri);
     if (!subject) {
@@ -506,19 +506,19 @@ async function updateAssertion(shared, ontology, subjectIri, predicateIri, objec
     }
     if (normalizedPredicate === RDF_TYPE_IRI || isSourcePredicate(normalizedPredicate) || isTargetPredicate(normalizedPredicate)) {
         const removed = removeAssertion(ontology, subjectIri, predicateIri, undefined);
-        const added = await addAssertion(shared, ontology, subjectIri, predicateIri, objectValue);
+        const added = await addAssertion(shared, ontology, subjectIri, predicateIri, objectValue, contexts);
         return removed || added;
     }
     subject.ownedPropertyValues ?? (subject.ownedPropertyValues = []);
     let propertyAssertion = subject.ownedPropertyValues.find((assertion) => matchesPredicateRef(ontology, assertion?.property, normalizedPredicate));
     if (!propertyAssertion) {
-        return addAssertion(shared, ontology, subjectIri, predicateIri, objectValue);
+        return addAssertion(shared, ontology, subjectIri, predicateIri, objectValue, contexts);
     }
     if (isIriLike(objectValue)) {
-        await ensureReferenceImport(shared, ontology, normalizeIri(asRequiredIri(objectValue, 'assertion object')));
+        await ensureReferenceImport(shared, ontology, normalizeIri(asRequiredIri(objectValue, 'assertion object')), contexts);
     }
     else {
-        await ensureTypedLiteralDatatypeImport(shared, ontology, objectValue);
+        await ensureTypedLiteralDatatypeImport(shared, ontology, objectValue, contexts);
     }
     propertyAssertion.literalValues = [];
     propertyAssertion.referencedValues = [];
@@ -526,13 +526,13 @@ async function updateAssertion(shared, ontology, subjectIri, predicateIri, objec
     appendAssertionValue(ontology, propertyAssertion, objectValue);
     return true;
 }
-async function addAnnotation(shared, ontology, subjectIri, predicateIri, objectValue) {
+async function addAnnotation(shared, ontology, subjectIri, predicateIri, objectValue, contexts) {
     const subject = findAnnotationSubjectByIri(ontology, subjectIri);
     if (!subject) {
         throw new Error(`Annotation subject '${subjectIri}' was not found in the ontology.`);
     }
     const normalizedPredicate = normalizeIri(predicateIri);
-    await ensureReferenceImport(shared, ontology, normalizedPredicate);
+    await ensureReferenceImport(shared, ontology, normalizedPredicate, contexts);
     subject.ownedAnnotations ?? (subject.ownedAnnotations = []);
     const matchingAnnotations = subject.ownedAnnotations
         .filter((entry) => matchesPredicateRef(ontology, entry?.property, normalizedPredicate));
@@ -550,10 +550,10 @@ async function addAnnotation(shared, ontology, subjectIri, predicateIri, objectV
         normalizeAnnotationGroup(subject, annotation, matchingAnnotations.slice(1));
     }
     if (isIriLike(objectValue)) {
-        await ensureReferenceImport(shared, ontology, normalizeIri(asRequiredIri(objectValue, 'annotation object')));
+        await ensureReferenceImport(shared, ontology, normalizeIri(asRequiredIri(objectValue, 'annotation object')), contexts);
     }
     else {
-        await ensureTypedLiteralDatatypeImport(shared, ontology, objectValue);
+        await ensureTypedLiteralDatatypeImport(shared, ontology, objectValue, contexts);
     }
     appendAnnotationValue(ontology, annotation, objectValue);
     normalizeAllAnnotations(subject, ontology);
@@ -596,7 +596,7 @@ function removeAnnotation(ontology, subjectIri, predicateIri, objectValue) {
     subject.ownedAnnotations = kept;
     return changed;
 }
-async function updateAnnotation(shared, ontology, subjectIri, predicateIri, objectValue) {
+async function updateAnnotation(shared, ontology, subjectIri, predicateIri, objectValue, contexts) {
     const subject = findAnnotationSubjectByIri(ontology, subjectIri);
     if (!subject) {
         throw new Error(`Annotation subject '${subjectIri}' was not found in the ontology.`);
@@ -605,13 +605,13 @@ async function updateAnnotation(shared, ontology, subjectIri, predicateIri, obje
     subject.ownedAnnotations ?? (subject.ownedAnnotations = []);
     const annotation = subject.ownedAnnotations.find((entry) => matchesPredicateRef(ontology, entry?.property, normalizedPredicate));
     if (!annotation) {
-        return addAnnotation(shared, ontology, subjectIri, predicateIri, objectValue);
+        return addAnnotation(shared, ontology, subjectIri, predicateIri, objectValue, contexts);
     }
     if (isIriLike(objectValue)) {
-        await ensureReferenceImport(shared, ontology, normalizeIri(asRequiredIri(objectValue, 'annotation object')));
+        await ensureReferenceImport(shared, ontology, normalizeIri(asRequiredIri(objectValue, 'annotation object')), contexts);
     }
     else {
-        await ensureTypedLiteralDatatypeImport(shared, ontology, objectValue);
+        await ensureTypedLiteralDatatypeImport(shared, ontology, objectValue, contexts);
     }
     annotation.literalValues = [];
     annotation.referencedValues = [];
@@ -1033,7 +1033,7 @@ function toRefText(ontology, iri) {
     }
     return `<${normalizedIri}>`;
 }
-async function ensureReferenceImport(shared, ontology, iri) {
+async function ensureReferenceImport(shared, ontology, iri, contexts) {
     const target = parseIriParts(iri);
     if (!target) {
         return;
@@ -1058,7 +1058,8 @@ async function ensureReferenceImport(shared, ontology, iri) {
         const importedNamespace = normalizeNamespace(String(resolveImportNamespaceRaw(imp) ?? ''));
         return importedNamespace === target.namespace;
     });
-    const importedOntology = await findOntologyByNamespace(shared, target.namespace);
+    const importedOntology = findOntologyInContexts(contexts, target.namespace)
+        ?? await findOntologyByNamespace(shared, target.namespace);
     const declaredPrefix = typeof importedOntology?.prefix === 'string' ? importedOntology.prefix.trim() : '';
     const preferredPrefix = declaredPrefix && !usedPrefixes.has(declaredPrefix)
         ? declaredPrefix
@@ -1199,6 +1200,12 @@ async function findOntologyByNamespace(shared, namespace) {
     const ontology = document?.parseResult?.value;
     return ontology && isOntology(ontology) ? ontology : undefined;
 }
+function findOntologyInContexts(contexts, namespace) {
+    if (!contexts) {
+        return undefined;
+    }
+    return contexts.get(normalizeOntologyIriKey(namespace))?.ontology;
+}
 function matchesRefTextTarget(ontology, statement, namespace, fragment) {
     const refText = getRefText(statement?.ref);
     if (!refText) {
@@ -1250,6 +1257,9 @@ function matchesRefTextFragment(statement, fragment) {
     return !!local && local === fragment;
 }
 function asLiteral(ontology, value) {
+    if (isExplicitLiteralTransport(value)) {
+        return explicitLiteralFromTransport(ontology, value);
+    }
     if (isQuantityLiteralTransport(value)) {
         const raw = value.value;
         const num = typeof raw === 'number' ? raw : Number(raw);
@@ -1281,12 +1291,6 @@ function asLiteral(ontology, value) {
         }
         return literal;
     }
-    if (typeof value === 'object' && value !== null && !Array.isArray(value)) {
-        const record = value;
-        if ((record.$type === 'DoubleLiteral' || record.$type === 'DecimalLiteral') && 'value' in record) {
-            return { $type: record.$type, value: record.value };
-        }
-    }
     if (typeof value === 'boolean') {
         return { $type: 'BooleanLiteral', value };
     }
@@ -1298,17 +1302,90 @@ function asLiteral(ontology, value) {
     }
     return { $type: 'QuotedLiteral', value: String(value ?? '') };
 }
-async function ensureTypedLiteralDatatypeImport(shared, ontology, value) {
+function isExplicitLiteralTransport(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value)) {
+        return false;
+    }
+    const type = value.$type;
+    return type === 'BooleanLiteral'
+        || type === 'DecimalLiteral'
+        || type === 'DoubleLiteral'
+        || type === 'IntegerLiteral'
+        || type === 'QuotedLiteral';
+}
+function explicitLiteralFromTransport(ontology, value) {
+    if (value.$type === 'QuotedLiteral') {
+        const literalValue = String(value.value ?? '');
+        const langTag = literalLanguageTagFromTransport(value);
+        const datatypeIri = literalDatatypeIriFromTransport(ontology, value);
+        const literal = {
+            $type: 'QuotedLiteral',
+            value: literalValue,
+        };
+        if (langTag) {
+            literal.langTag = langTag;
+        }
+        if (datatypeIri && !isXsdStringDatatypeIri(ontology, datatypeIri)) {
+            literal.type = { $refText: toRefText(ontology, datatypeIri) };
+        }
+        return literal;
+    }
+    if (value.$type === 'BooleanLiteral') {
+        return {
+            $type: 'BooleanLiteral',
+            value: booleanLiteralValue(value.value),
+        };
+    }
+    const literal = {
+        $type: value.$type,
+        value: numericLiteralValue(value.$type, value.value),
+    };
+    const unitIri = literalUnitIriFromTransport(ontology, value);
+    if (unitIri) {
+        literal.unit = { $refText: toRefText(ontology, unitIri) };
+    }
+    return literal;
+}
+function numericLiteralValue(type, value) {
+    const numberValue = typeof value === 'number'
+        ? value
+        : typeof value === 'string' && value.trim().length > 0
+            ? Number(value.trim())
+            : Number.NaN;
+    if (!Number.isFinite(numberValue)) {
+        throw new Error(`${type} value must be a finite number.`);
+    }
+    if (type === 'IntegerLiteral' && !Number.isInteger(numberValue)) {
+        throw new Error('IntegerLiteral value must be an integer.');
+    }
+    return numberValue;
+}
+function booleanLiteralValue(value) {
+    if (typeof value === 'boolean') {
+        return value;
+    }
+    if (typeof value === 'string') {
+        const normalized = value.trim().toLowerCase();
+        if (normalized === 'true') {
+            return true;
+        }
+        if (normalized === 'false') {
+            return false;
+        }
+    }
+    throw new Error('BooleanLiteral value must be true or false.');
+}
+async function ensureTypedLiteralDatatypeImport(shared, ontology, value, contexts) {
     if (isTypedQuotedLiteralTransport(value)) {
         const datatypeIri = literalDatatypeIriFromTransport(ontology, value);
         if (datatypeIri && !isXsdStringDatatypeIri(ontology, datatypeIri)) {
-            await ensureReferenceImport(shared, ontology, datatypeIri);
+            await ensureReferenceImport(shared, ontology, datatypeIri, contexts);
         }
     }
     if (isQuantityLiteralTransport(value)) {
         const unitIri = literalUnitIriFromTransport(ontology, value);
         if (unitIri) {
-            await ensureReferenceImport(shared, ontology, unitIri);
+            await ensureReferenceImport(shared, ontology, unitIri, contexts);
         }
     }
 }