@oslo-flanders/core 1.0.13 → 1.0.15

package/lib/interfaces/AppRunner.d.ts

@@ -13,6 +13,7 @@ export type YargsParams = {
     $0: string;
 };
 export declare abstract class AppRunner<T extends IService, K extends IConfiguration> {
+    protected createYargsInstance(argv: string[]): any;
     runCliSync(process: NodeJS.Process): void;
     abstract runCli(argv: CliArgv): Promise<void>;
     startApp(params: YargsParams, container: Container): Promise<void>;

package/lib/interfaces/AppRunner.js

@@ -1,10 +1,21 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppRunner = void 0;
 const process_1 = require("process");
 const LogUtil_1 = require("../logging/LogUtil");
 const ServiceIdentifier_1 = require("../ServiceIdentifier");
+const yargs_1 = __importDefault(require("yargs"));
 class AppRunner {
+    createYargsInstance(argv) {
+        return (0, yargs_1.default)(argv)
+            .parserConfiguration({
+            'duplicate-arguments-array': false,
+        })
+            .usage('node ./bin/runner.js [args]');
+    }
     runCliSync(process) {
         this.runCli(process.argv).catch((error) => {
             process_1.stderr.write(error.message);
@@ -16,11 +27,15 @@ class AppRunner {
         const configuration = container.get(ServiceIdentifier_1.ServiceIdentifier.Configuration);
         await configuration.createFromCli(params);
         (0, LogUtil_1.setLoggerFactory)(params);
-        container.bind(ServiceIdentifier_1.ServiceIdentifier.Logger).toDynamicValue(() => (0, LogUtil_1.createLogger)()).inSingletonScope();
+        container
+            .bind(ServiceIdentifier_1.ServiceIdentifier.Logger)
+            .toDynamicValue(() => (0, LogUtil_1.createLogger)())
+            .inSingletonScope();
         const service = container.get(ServiceIdentifier_1.ServiceIdentifier.Service);
-        service.init()
+        service
+            .init()
             .then(() => service.run())
-            .catch(error => console.error(error));
+            .catch((error) => console.error(error));
     }
 }
 exports.AppRunner = AppRunner;

package/lib/utils/storeUtils.d.ts

@@ -11,3 +11,4 @@ export declare function getMinCount(subject: RDF.Term, store: QuadStore): string
 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 areStoresEqual(store1: QuadStore, store2: QuadStore): boolean;

package/lib/utils/storeUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findAllAttributes = exports.createList = exports.getMaxCount = exports.getMinCount = exports.getVocabularyUsageNote = exports.getApplicationProfileUsageNote = exports.getVocabularyDefinition = exports.getApplicationProfileDefinition = exports.getVocabularyLabel = exports.getApplicationProfileLabel = void 0;
+exports.areStoresEqual = exports.findAllAttributes = exports.createList = exports.getMaxCount = exports.getMinCount = exports.getVocabularyUsageNote = exports.getApplicationProfileUsageNote = exports.getVocabularyDefinition = exports.getApplicationProfileDefinition = exports.getVocabularyLabel = exports.getApplicationProfileLabel = void 0;
 const namespaces_1 = require("./namespaces");
 function getApplicationProfileLabel(subject, store, language = null) {
     var _a, _b, _c;
@@ -128,4 +128,26 @@ function findAllAttributes(subject, attributeIds, store) {
     return attributeIds;
 }
 exports.findAllAttributes = findAllAttributes;
+function areStoresEqual(store1, store2) {
+    var _a, _b, _c, _d;
+    const quads1 = store1.findQuads(null, null, null, null);
+    const quads2 = store2.findQuads(null, null, null, null);
+    // 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}.`);
+        return false;
+    }
+    // Check if every quad in store1 exists in store2
+    // If there is a variation in quads, we know something is up
+    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}`);
+            return false;
+        }
+    }
+    return true;
+}
+exports.areStoresEqual = areStoresEqual;
 //# sourceMappingURL=storeUtils.js.map

package/package.json

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