@oslo-flanders/core 1.0.16 → 1.0.19

package/lib/enums/DataTypes.d.ts

@@ -1,3 +1,4 @@
+export declare const DataTypes: Map<string, string>;
 export declare const getDataType: (key: string) => string | undefined;
 export declare const datatypeIdentifierToHash: (uri: string) => number;
 export declare const isStandardDatatype: (uri: string) => boolean;

package/lib/enums/DataTypes.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isStandardDatatype = exports.datatypeIdentifierToHash = exports.getDataType = void 0;
+exports.isStandardDatatype = exports.datatypeIdentifierToHash = exports.getDataType = exports.DataTypes = void 0;
 const rdf = 'http://www.w3.org/1999/02/22-rdf-syntax-ns';
 const rdfs = 'http://www.w3.org/2000/01/rdf-schema';
 const xsd = 'http://www.w3.org/2001/XMLSchema';
-const DataTypes = new Map([
+exports.DataTypes = new Map([
     ['string', `${xsd}#string`],
     ['date', `${xsd}#date`],
     ['time', `${xsd}#time`],
@@ -38,7 +38,7 @@ const DataTypes = new Map([
     ['unsignedshort', `${xsd}#unsignedShort`],
     ['unsignedbyte', `${xsd}#unsignedByte`],
 ]);
-const getDataType = (key) => DataTypes.get(key.toLowerCase());
+const getDataType = (key) => exports.DataTypes.get(key.toLowerCase());
 exports.getDataType = getDataType;
 const datatypeIdentifierToHash = (uri) => {
     let hash = 0;
@@ -48,6 +48,6 @@ const datatypeIdentifierToHash = (uri) => {
     return hash > 0 ? hash : hash * -1;
 };
 exports.datatypeIdentifierToHash = datatypeIdentifierToHash;
-const isStandardDatatype = (uri) => Array.from(DataTypes.values()).includes(uri);
+const isStandardDatatype = (uri) => Array.from(exports.DataTypes.values()).includes(uri);
 exports.isStandardDatatype = isStandardDatatype;
 //# sourceMappingURL=DataTypes.js.map

package/lib/enums/OutputFormat.d.ts

@@ -1,5 +1,6 @@
 export declare enum OutputFormat {
     JsonLd = "application/ld+json",
+    JsonProblem = "application/problem+json",
     Json = "application/json",
     trig = "application/trig",
     turtle = "text/turtle",

package/lib/enums/OutputFormat.js

@@ -4,6 +4,7 @@ exports.OutputFormat = void 0;
 var OutputFormat;
 (function (OutputFormat) {
     OutputFormat["JsonLd"] = "application/ld+json";
+    OutputFormat["JsonProblem"] = "application/problem+json";
     OutputFormat["Json"] = "application/json";
     OutputFormat["trig"] = "application/trig";
     OutputFormat["turtle"] = "text/turtle";

package/lib/utils/fileSystem.js

@@ -9,7 +9,7 @@ exports.ensureOutputDirectory = void 0;
 const fs_1 = __importDefault(require("fs"));
 function ensureOutputDirectory(directory) {
     if (!fs_1.default.existsSync(directory)) {
-        fs_1.default.mkdirSync(directory);
+        fs_1.default.mkdirSync(directory, { recursive: true });
     }
 }
 exports.ensureOutputDirectory = ensureOutputDirectory;

package/lib/utils/storeUtils.d.ts

@@ -1,3 +1,4 @@
+import type { Logger } from '@oslo-flanders/core';
 import type * as RDF from '@rdfjs/types';
 import type { DataFactory } from 'rdf-data-factory';
 import type { QuadStore } from '../store/QuadStore';
@@ -10,5 +11,5 @@ export declare function getVocabularyUsageNote(subject: RDF.Term, store: QuadSto
 export declare function getMinCount(subject: RDF.Term, store: QuadStore): string | undefined;
 export declare function getMaxCount(subject: RDF.Term, store: QuadStore): string | undefined;
 export declare function createList(items: RDF.Term[], store: QuadStore, df: DataFactory): RDF.BlankNode | RDF.NamedNode;
-export declare function findAllAttributes(subject: RDF.Term, attributeIds: RDF.Term[], store: QuadStore): RDF.Term[];
+export declare function findAllAttributes(subject: RDF.Term, attributeIds: RDF.Term[], store: QuadStore, logger: Logger, visited?: Set<string>): RDF.Term[];
 export declare function areStoresEqual(store1: QuadStore, store2: QuadStore): boolean;

package/lib/utils/storeUtils.js

@@ -116,15 +116,37 @@ function createList(items, store, df) {
     return list[0];
 }
 exports.createList = createList;
-function findAllAttributes(subject, attributeIds, store) {
-    const parentIds = store.findObjects(subject, namespaces_1.ns.rdfs('subClassOf'));
+function findAllAttributes(subject, attributeIds, store, logger, visited = new Set()) {
+    let parentIds = store.findObjects(subject, namespaces_1.ns.rdfs('subClassOf'));
+    if (visited.has(subject.value)) {
+        logger.warn(`[QuadStore]: Circular reference detected for ${subject.value}`);
+        return attributeIds;
+    }
+    visited.add(subject.value);
+    // Merge all referenced dummy parents with the real one based on assigned URI
+    let additionalParentIds = [];
+    for (const parentId of parentIds) {
+        const assignedUri = store.findObject(parentId, namespaces_1.ns.oslo('assignedURI'));
+        if (!assignedUri)
+            continue;
+        additionalParentIds = [
+            ...additionalParentIds,
+            ...store
+                .findSubjects(namespaces_1.ns.oslo('assignedURI'), assignedUri)
+                .filter((item) => item.value !== subject.value),
+        ];
+    }
+    parentIds = [...parentIds, ...additionalParentIds];
+    // Collect all attributes
     attributeIds = [
         ...attributeIds,
         ...store.findSubjects(namespaces_1.ns.rdfs('domain'), subject),
     ];
-    for (const parentId of parentIds) {
-        attributeIds = findAllAttributes(parentId, attributeIds, store);
-    }
+    // Recursive search further for attributes
+    for (const parentId of parentIds)
+        attributeIds = findAllAttributes(parentId, attributeIds, store, logger, visited);
+    // Remove from visited so other paths can still traverse through this node
+    visited.delete(subject.value);
     return attributeIds;
 }
 exports.findAllAttributes = findAllAttributes;
@@ -135,7 +157,7 @@ function areStoresEqual(store1, store2) {
     // Quick check: different sizes means not equal
     // Second check allows store2 to have more quads than store1 if it has all quads of store1 plus more
     if (quads1.length !== quads2.length) {
-        console.log(`[QUadStore]: Store1 has a length of ${quads1.length} whilst Store2 has a length of ${quads2.length}.`);
+        console.log(`[QuadStore]: Store1 has a length of ${quads1.length} whilst Store2 has a length of ${quads2.length}.`);
         return false;
     }
     // Check if every quad in store1 exists in store2
@@ -143,7 +165,7 @@ function areStoresEqual(store1, store2) {
     for (const quad1 of quads1) {
         const matchingQuad = store2.findQuad(quad1.subject, quad1.predicate, quad1.object, quad1.graph);
         if (!matchingQuad) {
-            console.log(`[QUadStore]: Quad not found in store2: ${(_a = quad1.subject) === null || _a === void 0 ? void 0 : _a.value} ${(_b = quad1.predicate) === null || _b === void 0 ? void 0 : _b.value} ${(_c = quad1.object) === null || _c === void 0 ? void 0 : _c.value} ${(_d = quad1.graph) === null || _d === void 0 ? void 0 : _d.value}`);
+            console.log(`[QuadStore]: Quad not found in store2: ${(_a = quad1.subject) === null || _a === void 0 ? void 0 : _a.value} ${(_b = quad1.predicate) === null || _b === void 0 ? void 0 : _b.value} ${(_c = quad1.object) === null || _c === void 0 ? void 0 : _c.value} ${(_d = quad1.graph) === null || _d === void 0 ? void 0 : _d.value}`);
             return false;
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oslo-flanders/core",
-  "version": "1.0.16",
+  "version": "1.0.19",
   "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",

package/lib/types/splitUri.d.ts

@@ -1,6 +0,0 @@
-export interface SplittedUri {
-    prefix: string;
-    uri: string;
-    element: string;
-}
-export declare function splitUri(uri: string): Promise<SplittedUri | undefined>;

package/lib/types/splitUri.js

@@ -1,35 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.splitUri = void 0;
-const prefixes_1 = require("../constants/prefixes");
-async function splitUri(uri) {
-    /* Extract prefix and element by finding the last occurrence of # or / */
-    const hashIndex = uri.lastIndexOf('#');
-    const slashIndex = uri.lastIndexOf('/');
-    const splitIndex = Math.max(hashIndex, slashIndex);
-    if (splitIndex > 0) {
-        const prefixUri = uri.slice(0, Math.max(0, splitIndex + 1));
-        const element = uri.replace(prefixUri, '');
-        const prefixes = await (0, prefixes_1.getPrefixes)();
-        let prefixLabel;
-        for (const [label, puri] of Object.entries(prefixes)) {
-            if (puri === prefixUri) {
-                prefixLabel = label;
-                break;
-            }
-        }
-        /* No known prefix found for URI */
-        if (!prefixLabel) {
-            return undefined;
-        }
-        return {
-            prefix: prefixLabel,
-            uri: prefixUri,
-            element,
-        };
-    }
-    /* Splitting failed */
-    return undefined;
-}
-exports.splitUri = splitUri;
-//# sourceMappingURL=splitUri.js.map

package/lib/utils/quadSort.d.ts

@@ -1,8 +0,0 @@
-import type * as RDF from '@rdfjs/types';
-/**
- * Sort function used on an array of quads. First sorts named nodes alphabetically, then blank nodes alphabetically.
- * @param quadA An RDF.Quad
- * @param quadB An RDF.Quad
- * @returns a number
- */
-export declare const quadSort: (quadA: RDF.Quad, quadB: RDF.Quad) => number;

package/lib/utils/quadSort.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.quadSort = void 0;
-/**
- * Sort function used on an array of quads. First sorts named nodes alphabetically, then blank nodes alphabetically.
- * @param quadA An RDF.Quad
- * @param quadB An RDF.Quad
- * @returns a number
- */
-const quadSort = (quadA, quadB) => {
-    if (quadA.subject.termType === quadB.subject.termType) {
-        return quadA.subject.value.localeCompare(quadB.subject.value);
-    }
-    return quadA.subject.termType === 'BlankNode' ? 1 : -1;
-};
-exports.quadSort = quadSort;
-//# sourceMappingURL=quadSort.js.map