@oslo-flanders/core 1.3.1 → 1.3.2

package/lib/utils/storeUtils.js

@@ -116,6 +116,19 @@ function createList(items, store, df) {
     return list[0];
 }
 exports.createList = createList;
+// Checks whether node inherits from ancestor regardless of number of generations
+function isSubclassOf(node, ancestor, store, seen = new Set()) {
+    for (const parent of store.findObjects(node, namespaces_1.ns.rdfs('subClassOf'))) {
+        if (parent.value === ancestor.value)
+            return true;
+        if (seen.has(parent.value))
+            continue;
+        seen.add(parent.value);
+        if (isSubclassOf(parent, ancestor, store, seen))
+            return true;
+    }
+    return false;
+}
 function findAllAttributes(subject, attributeIds, store, logger, visited = new Set()) {
     let parentIds = store.findObjects(subject, namespaces_1.ns.rdfs('subClassOf'));
     if (visited.has(subject.value)) {
@@ -129,11 +142,14 @@ function findAllAttributes(subject, attributeIds, store, logger, visited = new S
         const assignedUri = store.findObject(parentId, namespaces_1.ns.oslo('assignedURI'));
         if (!assignedUri)
             continue;
+        // Can't be a dummy if it has attributes
+        if (store.findSubjects(namespaces_1.ns.rdfs('domain'), parentId).length > 0)
+            continue;
         additionalParentIds = [
             ...additionalParentIds,
-            ...store
-                .findSubjects(namespaces_1.ns.oslo('assignedURI'), assignedUri)
-                .filter((item) => item.value !== subject.value),
+            ...store.findSubjects(namespaces_1.ns.oslo('assignedURI'), assignedUri).filter((item) => item.value !== parentId.value && // not the potential dummy itself
+                !visited.has(item.value) && // not on the current path
+                !isSubclassOf(item, parentId, store)),
         ];
     }
     parentIds = [...parentIds, ...additionalParentIds];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oslo-flanders/core",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Core interfaces and utilities",
   "author": "Digitaal Vlaanderen <https://data.vlaanderen.be/id/organisatie/OVO002949>",
   "homepage": "https://github.com/informatievlaanderen/OSLO-UML-Transformer/tree/main/packages/oslo-core#readme",