@oslo-flanders/core 0.0.12-alpha.0 → 0.0.13-alpha.0

package/README.md

@@ -5,7 +5,7 @@
 ## Install
 
 ```bash
-npm install @oslo-flanders/Core
+npm install @oslo-flanders/core
 ```
 
 ## Usage

package/index.d.ts

@@ -1,22 +1,21 @@
 import 'reflect-metadata';
-import 'module-alias/register';
-export * from '@oslo-core/interfaces/AppRunner';
-export * from '@oslo-core/interfaces/IConfiguration';
-export * from '@oslo-core/interfaces/IOutputHandler';
-export * from '@oslo-core/interfaces/IService';
-export * from '@oslo-core/utils/fetchFileOrUrl';
-export * from '@oslo-core/utils/namespaces';
-export * from '@oslo-core/utils/uniqueId';
-export * from '@oslo-core/store/QuadStore';
-export * from '@oslo-core/ServiceIdentifier';
-export * from '@oslo-core/enums/Scope';
-export * from '@oslo-core/enums/PropertyTypes';
-export * from '@oslo-core/logging/LogLevel';
-export * from '@oslo-core/logging/Logger';
-export * from '@oslo-core/logging/VoidLogger';
-export * from '@oslo-core/logging/WinstonLogger';
-export * from '@oslo-core/logging/LogUtil';
-export * from '@oslo-core/logging/LoggerFactory';
-export * from '@oslo-core/logging/VoidLoggerFactory';
-export * from '@oslo-core/logging/WinstonLoggerFactory';
-export * from '@oslo-core/utils/storeUtils';
+export * from './lib/interfaces/AppRunner';
+export * from './lib/interfaces/IConfiguration';
+export * from './lib/interfaces/IOutputHandler';
+export * from './lib/interfaces/IService';
+export * from './lib/utils/fetchFileOrUrl';
+export * from './lib/utils/namespaces';
+export * from './lib/utils/uniqueId';
+export * from './lib/store/QuadStore';
+export * from './lib/ServiceIdentifier';
+export * from './lib/enums/Scope';
+export * from './lib/enums/PropertyTypes';
+export * from './lib/logging/LogLevel';
+export * from './lib/logging/Logger';
+export * from './lib/logging/VoidLogger';
+export * from './lib/logging/WinstonLogger';
+export * from './lib/logging/LogUtil';
+export * from './lib/logging/LoggerFactory';
+export * from './lib/logging/VoidLoggerFactory';
+export * from './lib/logging/WinstonLoggerFactory';
+export * from './lib/utils/storeUtils';

package/index.js

@@ -15,30 +15,24 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 require("reflect-metadata");
-// Extra manually added alias was required for nested NPM packages:
-// https://github.com/ilearnio/module-alias?tab=readme-ov-file#using-within-another-npm-package
-const moduleAlias = require('module-alias');
-moduleAlias.addAliases({
-    '@oslo-core': `${__dirname}/lib`,
-});
-__exportStar(require("@oslo-core/interfaces/AppRunner"), exports);
-__exportStar(require("@oslo-core/interfaces/IConfiguration"), exports);
-__exportStar(require("@oslo-core/interfaces/IOutputHandler"), exports);
-__exportStar(require("@oslo-core/interfaces/IService"), exports);
-__exportStar(require("@oslo-core/utils/fetchFileOrUrl"), exports);
-__exportStar(require("@oslo-core/utils/namespaces"), exports);
-__exportStar(require("@oslo-core/utils/uniqueId"), exports);
-__exportStar(require("@oslo-core/store/QuadStore"), exports);
-__exportStar(require("@oslo-core/ServiceIdentifier"), exports);
-__exportStar(require("@oslo-core/enums/Scope"), exports);
-__exportStar(require("@oslo-core/enums/PropertyTypes"), exports);
-__exportStar(require("@oslo-core/logging/LogLevel"), exports);
-__exportStar(require("@oslo-core/logging/Logger"), exports);
-__exportStar(require("@oslo-core/logging/VoidLogger"), exports);
-__exportStar(require("@oslo-core/logging/WinstonLogger"), exports);
-__exportStar(require("@oslo-core/logging/LogUtil"), exports);
-__exportStar(require("@oslo-core/logging/LoggerFactory"), exports);
-__exportStar(require("@oslo-core/logging/VoidLoggerFactory"), exports);
-__exportStar(require("@oslo-core/logging/WinstonLoggerFactory"), exports);
-__exportStar(require("@oslo-core/utils/storeUtils"), exports);
+__exportStar(require("./lib/interfaces/AppRunner"), exports);
+__exportStar(require("./lib/interfaces/IConfiguration"), exports);
+__exportStar(require("./lib/interfaces/IOutputHandler"), exports);
+__exportStar(require("./lib/interfaces/IService"), exports);
+__exportStar(require("./lib/utils/fetchFileOrUrl"), exports);
+__exportStar(require("./lib/utils/namespaces"), exports);
+__exportStar(require("./lib/utils/uniqueId"), exports);
+__exportStar(require("./lib/store/QuadStore"), exports);
+__exportStar(require("./lib/ServiceIdentifier"), exports);
+__exportStar(require("./lib/enums/Scope"), exports);
+__exportStar(require("./lib/enums/PropertyTypes"), exports);
+__exportStar(require("./lib/logging/LogLevel"), exports);
+__exportStar(require("./lib/logging/Logger"), exports);
+__exportStar(require("./lib/logging/VoidLogger"), exports);
+__exportStar(require("./lib/logging/WinstonLogger"), exports);
+__exportStar(require("./lib/logging/LogUtil"), exports);
+__exportStar(require("./lib/logging/LoggerFactory"), exports);
+__exportStar(require("./lib/logging/VoidLoggerFactory"), exports);
+__exportStar(require("./lib/logging/WinstonLoggerFactory"), exports);
+__exportStar(require("./lib/utils/storeUtils"), exports);
 //# sourceMappingURL=index.js.map

package/lib/interfaces/AppRunner.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import type { Container } from 'inversify';
-import type { IConfiguration } from '@oslo-core/interfaces/IConfiguration';
-import type { IService } from '@oslo-core/interfaces/IService';
+import type { IConfiguration } from './IConfiguration';
+import type { IService } from './IService';
 export type CliArgv = string[];
 export type YargsParams = {
     [x: string]: unknown;

package/lib/interfaces/AppRunner.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppRunner = void 0;
 const process_1 = require("process");
-const LogUtil_1 = require("@oslo-core/logging/LogUtil");
-const ServiceIdentifier_1 = require("@oslo-core/ServiceIdentifier");
+const LogUtil_1 = require("../logging/LogUtil");
+const ServiceIdentifier_1 = require("../ServiceIdentifier");
 class AppRunner {
     runCliSync(process) {
         this.runCli(process.argv).catch((error) => {

package/lib/interfaces/IConfiguration.d.ts

@@ -1,4 +1,4 @@
-import type { YargsParams } from '@oslo-core/interfaces/AppRunner';
+import type { YargsParams } from './AppRunner';
 /**
  * Interface that must be implemented by classes that contain configuration properties
  */

package/lib/interfaces/IOutputHandler.d.ts

@@ -1,4 +1,4 @@
-import type { QuadStore } from '@oslo-core/store/QuadStore';
+import type { QuadStore } from '../store/QuadStore';
 /**
  * Writes the triples in an RDF store to a write stream
  */

package/lib/interfaces/IService.d.ts

@@ -1,5 +1,5 @@
-import type { IConfiguration } from '@oslo-core/interfaces/IConfiguration';
-import type { Logger } from '@oslo-core/logging/Logger';
+import type { Logger } from '../logging/Logger';
+import type { IConfiguration } from './IConfiguration';
 /**
  * Interface that must be implemented by conversion of generation services
  */

package/lib/logging/LogUtil.d.ts

@@ -1,4 +1,4 @@
-import type { YargsParams } from '@oslo-core/interfaces/AppRunner';
-import type { Logger } from '@oslo-core/logging/Logger';
+import type { YargsParams } from '../interfaces/AppRunner';
+import type { Logger } from './Logger';
 export declare function createLogger(): Logger;
 export declare function setLoggerFactory(params: YargsParams): void;

package/lib/logging/LogUtil.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setLoggerFactory = exports.createLogger = void 0;
-const VoidLoggerFactory_1 = require("@oslo-core/logging/VoidLoggerFactory");
-const WinstonLoggerFactory_1 = require("@oslo-core/logging/WinstonLoggerFactory");
+const VoidLoggerFactory_1 = require("./VoidLoggerFactory");
+const WinstonLoggerFactory_1 = require("./WinstonLoggerFactory");
 let loggerFactory = new VoidLoggerFactory_1.VoidLoggerFactory();
 function createLogger() {
     return loggerFactory.createLogger();

package/lib/logging/Logger.d.ts

@@ -1,5 +1,5 @@
 import 'reflect-metadata';
-import type { LogLevel } from '@oslo-core/logging/LogLevel';
+import type { LogLevel } from './LogLevel';
 export interface Logger {
     log: (level: LogLevel, message: string) => Logger;
     error: (message: string) => Logger;

package/lib/logging/LoggerFactory.d.ts

@@ -1,4 +1,4 @@
-import type { Logger } from '@oslo-core/logging/Logger';
+import type { Logger } from './Logger';
 /**
  * Instantiates new logger instances.
  */

package/lib/logging/VoidLogger.d.ts

@@ -1,6 +1,6 @@
-import type { Logger } from '@oslo-core/logging/Logger';
-import { BaseLogger } from '@oslo-core/logging/Logger';
-import type { LogLevel } from '@oslo-core/logging/LogLevel';
+import type { Logger } from './Logger';
+import { BaseLogger } from './Logger';
+import type { LogLevel } from './LogLevel';
 export declare class VoidLogger extends BaseLogger {
     constructor();
     log(level: LogLevel, message: string): Logger;

package/lib/logging/VoidLogger.js

@@ -11,7 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VoidLogger = void 0;
 const inversify_1 = require("inversify");
-const Logger_1 = require("@oslo-core/logging/Logger");
+const Logger_1 = require("./Logger");
 let VoidLogger = class VoidLogger extends Logger_1.BaseLogger {
     constructor() {
         super();

package/lib/logging/VoidLoggerFactory.d.ts

@@ -1,5 +1,5 @@
-import type { LoggerFactory } from '@oslo-core/logging/LoggerFactory';
-import { VoidLogger } from '@oslo-core/logging/VoidLogger';
+import type { LoggerFactory } from './LoggerFactory';
+import { VoidLogger } from './VoidLogger';
 /**
  * A factory that always returns {@link VoidLogger}, which does nothing on log messages.
  */

package/lib/logging/VoidLoggerFactory.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VoidLoggerFactory = void 0;
-const VoidLogger_1 = require("@oslo-core/logging/VoidLogger");
+const VoidLogger_1 = require("./VoidLogger");
 /**
  * A factory that always returns {@link VoidLogger}, which does nothing on log messages.
  */

package/lib/logging/WinstonLogger.d.ts

@@ -1,6 +1,6 @@
 import { Logger as WinstonInnerLogger } from 'winston';
-import { BaseLogger } from '@oslo-core/logging/Logger';
-import type { LogLevel } from '@oslo-core/logging/LogLevel';
+import { BaseLogger } from './Logger';
+import type { LogLevel } from './LogLevel';
 export declare class WinstonLogger extends BaseLogger {
     private readonly logger;
     constructor(logger: WinstonInnerLogger);

package/lib/logging/WinstonLogger.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WinstonLogger = void 0;
 const inversify_1 = require("inversify");
 const winston_1 = require("winston");
-const Logger_1 = require("@oslo-core/logging/Logger");
+const Logger_1 = require("./Logger");
 let WinstonLogger = class WinstonLogger extends Logger_1.BaseLogger {
     constructor(logger) {
         super();

package/lib/logging/WinstonLoggerFactory.d.ts

@@ -1,7 +1,7 @@
 import type * as Transport from 'winston-transport';
-import type { Logger } from '@oslo-core/logging/Logger';
-import type { LoggerFactory } from '@oslo-core/logging/LoggerFactory';
-import type { LogLevel } from '@oslo-core/logging/LogLevel';
+import type { Logger } from './Logger';
+import type { LoggerFactory } from './LoggerFactory';
+import type { LogLevel } from './LogLevel';
 export declare class WinstonLoggerFactory implements LoggerFactory {
     private readonly level;
     constructor(level: LogLevel);

package/lib/logging/WinstonLoggerFactory.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WinstonLoggerFactory = void 0;
 const winston_1 = require("winston");
-const WinstonLogger_1 = require("@oslo-core/logging/WinstonLogger");
+const WinstonLogger_1 = require("./WinstonLogger");
 const { combine, colorize, printf } = winston_1.format;
 const messageFormat = printf(({ level, message, messageTimestamp }) => `${new Date(Date.now()).toISOString()} ${level}: ${message}`);
 class WinstonLoggerFactory {

package/lib/store/QuadStore.d.ts

@@ -21,6 +21,11 @@ export declare class QuadStore {
      * @returns an array of RDF.NamedNodes
      */
     getClassIds(graph?: RDF.Term | null): RDF.NamedNode[];
+    /**
+     * Finds all subjects where predicate is 'rdf:type' and object 'rdfs:Datatype'
+     * @returns an array of RDF.NamedNodes
+     */
+    getDatatypes(graph?: RDF.Term | null): RDF.NamedNode[];
     /**
      * Finds all subjects where predicate is 'rdf:type' and object 'owl:DatatypeProperty'
      * @returns an array of RDF.NamedNodes

package/lib/store/QuadStore.js

@@ -39,8 +39,8 @@ exports.QuadStore = void 0;
 const inversify_1 = require("inversify");
 const N3 = __importStar(require("n3"));
 const rdf_parse_1 = __importDefault(require("rdf-parse"));
-const fetchFileOrUrl_1 = require("@oslo-core/utils/fetchFileOrUrl");
-const namespaces_1 = require("@oslo-core/utils/namespaces");
+const fetchFileOrUrl_1 = require("../utils/fetchFileOrUrl");
+const namespaces_1 = require("../utils/namespaces");
 let QuadStore = class QuadStore {
     constructor() {
         this.store = new N3.Store();
@@ -94,6 +94,13 @@ let QuadStore = class QuadStore {
     getClassIds(graph = null) {
         return (this.store.getSubjects(namespaces_1.ns.rdf('type'), namespaces_1.ns.owl('Class'), graph));
     }
+    /**
+     * Finds all subjects where predicate is 'rdf:type' and object 'rdfs:Datatype'
+     * @returns an array of RDF.NamedNodes
+     */
+    getDatatypes(graph = null) {
+        return (this.store.getSubjects(namespaces_1.ns.rdf('type'), namespaces_1.ns.rdfs('Datatype'), graph));
+    }
     /**
      * Finds all subjects where predicate is 'rdf:type' and object 'owl:DatatypeProperty'
      * @returns an array of RDF.NamedNodes

package/lib/utils/namespaces.d.ts

@@ -13,9 +13,10 @@ declare enum Prefixes {
     xsd = "http://www.w3.org/2001/XMLSchema#",
     person = "http://www.w3.org/ns/person#",
     vann = "http://purl.org/vocab/vann/",
-    shacl = "http://w3.org/ns/shacl#",
+    shacl = "http://www.w3.org/ns/shacl#",
     prov = "http://www.w3.org/ns/prov#",
-    oslo = "https://implementatie.data.vlaanderen.be/ns/oslo-toolchain#"
+    oslo = "https://implementatie.data.vlaanderen.be/ns/oslo-toolchain#",
+    vl = "https://data.vlaanderen.be/ns/shacl#"
 }
 export type Namespace = {
     [T in keyof typeof Prefixes]: Function;

package/lib/utils/namespaces.js

@@ -19,9 +19,10 @@ var Prefixes;
     Prefixes["xsd"] = "http://www.w3.org/2001/XMLSchema#";
     Prefixes["person"] = "http://www.w3.org/ns/person#";
     Prefixes["vann"] = "http://purl.org/vocab/vann/";
-    Prefixes["shacl"] = "http://w3.org/ns/shacl#";
+    Prefixes["shacl"] = "http://www.w3.org/ns/shacl#";
     Prefixes["prov"] = "http://www.w3.org/ns/prov#";
     Prefixes["oslo"] = "https://implementatie.data.vlaanderen.be/ns/oslo-toolchain#";
+    Prefixes["vl"] = "https://data.vlaanderen.be/ns/shacl#";
 })(Prefixes || (Prefixes = {}));
 const vocab = () => {
     const namespaces = {};

package/lib/utils/storeUtils.d.ts

@@ -1,5 +1,5 @@
 import type * as RDF from '@rdfjs/types';
-import type { QuadStore } from '@oslo-core/store/QuadStore';
+import type { QuadStore } from '../store/QuadStore';
 export declare function getApplicationProfileLabel(subject: RDF.Term, store: QuadStore, language?: string | null): RDF.Literal | undefined;
 export declare function getVocabularyLabel(subject: RDF.Term, store: QuadStore, language?: string | null): RDF.Literal | undefined;
 export declare function getApplicationProfileDefinition(subject: RDF.Term, store: QuadStore, language?: string | null): RDF.Literal | undefined;

package/lib/utils/storeUtils.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMaxCount = exports.getMinCount = exports.getVocabularyUsageNote = exports.getApplicationProfileUsageNote = exports.getVocabularyDefinition = exports.getApplicationProfileDefinition = exports.getVocabularyLabel = exports.getApplicationProfileLabel = void 0;
-const namespaces_1 = require("@oslo-core/utils/namespaces");
+const namespaces_1 = require("./namespaces");
 function getApplicationProfileLabel(subject, store, language = null) {
     var _a, _b, _c;
     const labels = store.getLabels(subject);

package/package.json

@@ -1,14 +1,11 @@
 {
   "name": "@oslo-flanders/core",
-  "version": "0.0.12-alpha.0",
+  "version": "0.0.13-alpha.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",
   "license": "MIT",
   "main": "index.js",
-  "_moduleAliases": {
-    "@oslo-core": "./lib"
-  },
   "directories": {
     "lib": "lib"
   },
@@ -24,32 +21,10 @@
     "type": "git",
     "url": "git+https://github.com/Informatievlaanderen/OSLO-UML-Transformer.git"
   },
-  "jest": {
-    "runner": "groups",
-    "transform": {
-      "^.+\\.ts$": "ts-jest"
-    },
-    "testRegex": "/test/.*.test.ts$",
-    "moduleFileExtensions": [
-      "ts",
-      "js"
-    ],
-    "collectCoverage": true,
-    "coveragePathIgnorePatterns": [
-      "/node_modules/",
-      "index.js",
-      "test/data/*",
-      "lib/utils/namespaces.ts"
-    ],
-    "testEnvironment": "node",
-    "moduleNameMapper": {
-      "^@oslo-core/(.*)$": "<rootDir>/lib/$1"
-    }
-  },
   "scripts": {
     "build": "npm run build:ts",
     "build:ts": "tsc",
-    "test:unit": "node \"../../node_modules/jest/bin/jest.js\" --group=unit"
+    "test:unit": "node \"../../node_modules/jest/bin/jest.js\" --group=unit --config ../../jest.config.ts ./packages/oslo-core/"
   },
   "bugs": {
     "url": "https://github.com/Informatievlaanderen/OSLO-UML-Transformer/issues"
@@ -57,7 +32,6 @@
   "dependencies": {
     "crypto-js": "^4.1.1",
     "inversify": "^6.0.1",
-    "module-alias": "^2.2.3",
     "n3": "^1.16.2",
     "node-fetch": "^2.6.7",
     "rdf-data-factory": "^1.1.1",
@@ -75,5 +49,5 @@
     "@types/streamify-string": "^1.0.0",
     "@types/tmp": "^0.2.3"
   },
-  "gitHead": "ec9638c5a9156c5506a668205b2288c14d0f840d"
+  "gitHead": "5c9d2777bb0afe94b70438c65bf648f6a4a6f315"
 }