@oslo-flanders/core 1.0.17 → 1.1.0

package/lib/constants/prefixes.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPrefixes = void 0;
+/* eslint-disable @typescript-eslint/consistent-type-assertions */
 const core_1 = require("@oslo-flanders/core");
 const node_fetch_1 = __importDefault(require("node-fetch"));
 const PREFIX_CC_URL = 'https://prefix.cc/context';
@@ -14,7 +15,7 @@ async function getPrefixes() {
         if (!response.ok) {
             throw new Error(`Failed to fetch prefixes: ${response.statusText}`);
         }
-        const data = await response.json();
+        const data = (await response.json());
         if (data['@context']) {
             return data['@context'];
         }
@@ -35,4 +36,5 @@ async function getPrefixes() {
     }
 }
 exports.getPrefixes = getPrefixes;
+/* eslint-enable @typescript-eslint/consistent-type-assertions */
 //# sourceMappingURL=prefixes.js.map

package/lib/store/QuadStore.js

@@ -31,14 +31,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QuadStore = void 0;
 const inversify_1 = require("inversify");
 const N3 = __importStar(require("n3"));
-const rdf_parse_1 = __importDefault(require("rdf-parse"));
+const rdf_parse_1 = require("rdf-parse");
 const fetchFileOrUrl_1 = require("../utils/fetchFileOrUrl");
 const namespaces_1 = require("../utils/namespaces");
 let QuadStore = class QuadStore {
@@ -61,7 +58,7 @@ let QuadStore = class QuadStore {
         const buffer = await (0, fetchFileOrUrl_1.fetchFileOrUrl)(file);
         const textStream = require('streamify-string')(buffer.toString());
         return new Promise((resolve, reject) => {
-            rdf_parse_1.default
+            rdf_parse_1.rdfParser
                 .parse(textStream, { path: file })
                 .on('data', (quad) => this.store.addQuad(quad))
                 .on('error', (error) => reject(error))

package/lib/utils/fetchFileOrUrl.d.ts

@@ -1,2 +1,3 @@
 /// <reference types="node" />
+/// <reference types="node" />
 export declare function fetchFileOrUrl(file: string): Promise<Buffer>;

package/lib/utils/storeUtils.js

@@ -117,12 +117,12 @@ function createList(items, store, df) {
 }
 exports.createList = createList;
 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);
-    let parentIds = store.findObjects(subject, namespaces_1.ns.rdfs('subClassOf'));
     // Merge all referenced dummy parents with the real one based on assigned URI
     let additionalParentIds = [];
     for (const parentId of parentIds) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oslo-flanders/core",
-  "version": "1.0.17",
+  "version": "1.1.0",
   "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",
@@ -32,17 +32,17 @@
   "dependencies": {
     "crypto-js": "^4.1.1",
     "inversify": "^6.0.1",
-    "n3": "^1.16.2",
-    "rdf-data-factory": "^1.1.1",
-    "rdf-parse": "^2.1.1",
-    "reflect-metadata": "^0.1.13",
+    "n3": "^2.0.0",
     "node-fetch": "^2.6.7",
+    "rdf-data-factory": "^2.0.0",
+    "rdf-parse": "^5.0.0",
+    "reflect-metadata": "^0.2.1",
     "streamify-string": "^1.0.1",
     "winston": "^3.8.2",
     "winston-transport": "^4.5.0"
   },
   "devDependencies": {
-    "@rdfjs/types": "^1.1.0",
+    "@rdfjs/types": "^2.0.0",
     "@types/crypto-js": "^4.1.1",
     "@types/n3": "^1.10.4",
     "@types/node-fetch": "^2.6.2",

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