Modified loaders to work with new infrastructure

georgemoscu · George Moscu · commit dc218b07fe53 · 2024-08-02T15:23:12.000+03:00
diff --git a/babel.config.js b/babel.config.js
@@ -13,4 +13,8 @@
 
 module.exports = {
     presets: [['@babel/preset-env', {targets: {node: 'current'}}], '@babel/preset-typescript'],
+    plugins: [
+        ['@babel/plugin-proposal-decorators', {legacy: true}],
+        ['@babel/plugin-proposal-class-properties', {loose: true}],
+    ],
 };
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -32,14 +32,17 @@
   },
   "devDependencies": {
     "@babel/core": "^7.22.9",
+    "@babel/plugin-proposal-class-properties": "^7.18.6",
+    "@babel/plugin-proposal-decorators": "^7.24.7",
     "@babel/preset-env": "^7.22.9",
     "@babel/preset-typescript": "^7.22.5",
     "@types/jest": "^29.5.3",
     "@types/n3": "1.16.4",
     "@types/node": "^20.4.2",
     "@typescript-eslint/eslint-plugin": "^6.1.0",
     "@typescript-eslint/parser": "^6.1.0",
-    "babel-jest": "^29.6.2",
+    "babel-core": "^6.26.3",
+    "babel-jest": "^29.7.0",
     "copyfiles": "2.4.1",
     "create-ts-index": "1.14.0",
     "eslint": "^8.45.0",
@@ -48,6 +51,7 @@
     "npm-snapshot": "1.1.1",
     "nyc": "15.1.0",
     "prettier": "^2.8.8",
+    "regenerator-runtime": "^0.14.1",
     "rimraf": "5.0.5",
     "source-map-support": "0.5.21",
     "ts-loader": "9.5.0",
diff --git a/src/aspect-meta-model/characteristic/default-list.ts b/src/aspect-meta-model/characteristic/default-list.ts
@@ -21,7 +21,7 @@ export class DefaultList extends DefaultCollection {
         this.ordered = true;
     }
 
-    getCollectionType(): CollectionType {
+    override getCollectionType(): CollectionType {
         return CollectionType.LIST;
     }
 }
diff --git a/src/aspect-meta-model/characteristic/default-scalar.ts b/src/aspect-meta-model/characteristic/default-scalar.ts
@@ -23,7 +23,7 @@ export class DefaultScalar extends Type {
         this.scalar = true;
     }
 
-    public isScalar(): boolean {
+    override isScalar(): boolean {
         return true;
     }
 
diff --git a/src/aspect-meta-model/characteristic/default-set.ts b/src/aspect-meta-model/characteristic/default-set.ts
@@ -21,7 +21,7 @@ export class DefaultSet extends DefaultCollection {
         this.ordered = false;
     }
 
-    getCollectionType(): CollectionType {
+    override getCollectionType(): CollectionType {
         return CollectionType.SET;
     }
 }
diff --git a/src/aspect-meta-model/characteristic/default-sorted-set.ts b/src/aspect-meta-model/characteristic/default-sorted-set.ts
@@ -21,7 +21,7 @@ export class DefaultSortedSet extends DefaultCollection {
         this.ordered = true;
     }
 
-    getCollectionType(): CollectionType {
+    override getCollectionType(): CollectionType {
         return CollectionType.SORTEDSET;
     }
 }
diff --git a/src/aspect-meta-model/characteristic/default-trait.ts b/src/aspect-meta-model/characteristic/default-trait.ts
@@ -42,11 +42,11 @@ export class DefaultTrait extends DefaultCharacteristic implements Trait {
         return this.constraints;
     }
 
-    getDatatype(): Type {
+    override getDatatype(): Type {
         return this.baseCharacteristic?.getDatatype();
     }
 
-    accept<T, U>(visitor: ModelVisitor<T, U>, context: U): T {
+    override accept<T, U>(visitor: ModelVisitor<T, U>, context: U): T {
         return visitor.visitCharacteristic(this, context);
     }
 }
diff --git a/src/aspect-meta-model/complex-type.ts b/src/aspect-meta-model/complex-type.ts
@@ -19,7 +19,7 @@ import {EntityProps} from '../shared/props';
 
 export interface ComplexType extends Type, StructureElement {}
 export abstract class ComplexType extends StructureElement implements ComplexType {
-    @use(Type) _: ComplexType;
+    @use(Type) declare _: ComplexType;
 
     isAbstractEntity_: boolean = false;
     extends_: ComplexType = null;
@@ -32,7 +32,7 @@ export abstract class ComplexType extends StructureElement implements ComplexTyp
         this.extendingElements = props.extendingElements || [];
     }
 
-    isComplexType() {
+    override isComplexType() {
         return true;
     }
 
diff --git a/src/aspect-meta-model/default-entity-instance.ts b/src/aspect-meta-model/default-entity-instance.ts
@@ -36,7 +36,7 @@ export class DefaultEntityInstance extends NamedElement implements EntityInstanc
     constructor(props: EntityInstanceProps) {
         super(props);
         this.type = props.type;
-        this.assertions = props.assertions;
+        this.assertions = props.assertions || new Map();
     }
 
     getType(): Entity {
diff --git a/src/aspect-meta-model/default-property.ts b/src/aspect-meta-model/default-property.ts
@@ -37,15 +37,13 @@ export class DefaultProperty extends NamedElement implements Property {
 
     constructor(props: PropertyProps) {
         super(props);
-        if (!props) return null;
-
         this.characteristic = props.characteristic || null;
         this.exampleValue = props.exampleValue || null;
         this._extends = props.extends_;
-        this.notInPayload = props.notInPayload;
-        this.optional = props.optional;
+        this.notInPayload = Boolean(props.notInPayload);
+        this.optional = Boolean(props.optional);
         this.payloadName = props.payloadName;
-        this.isAbstract = props.isAbstract;
+        this.isAbstract = Boolean(props.isAbstract);
     }
 
     getCharacteristic(): Characteristic {
diff --git a/src/aspect-meta-model/named-element.ts b/src/aspect-meta-model/named-element.ts
@@ -30,11 +30,11 @@ export abstract class NamedElement extends ModelElement {
         super(props);
         this.aspectModelUrn = props.aspectModelUrn;
         this.name = props.name;
-        this.syntheticName = props.hasSyntheticName;
+        this.syntheticName = Boolean(props.hasSyntheticName);
         this.see = props.see || [];
         this.descriptions = props.descriptions || new Map();
         this.preferredNames = props.preferredNames || new Map();
-        this.anonymous = props.isAnonymous;
+        this.anonymous = Boolean(props.isAnonymous);
     }
 
     get namespace(): string {
diff --git a/src/aspect-meta-model/scalar-value.ts b/src/aspect-meta-model/scalar-value.ts
@@ -20,13 +20,14 @@ export class ScalarValue extends Value {
         super(props as NamedElementProps);
         this.value = props.value;
         this.type = props.type;
+        this.metaModelVersion = this.type?.getMetaModelVersion();
     }
 
-    getValue() {
+    override getValue() {
         return this.value;
     }
 
-    getMetaModelVersion(): string {
+    override getMetaModelVersion(): string {
         return this.type.getMetaModelVersion();
     }
 
diff --git a/src/aspect-meta-model/type.ts b/src/aspect-meta-model/type.ts
@@ -22,8 +22,8 @@ export abstract class Type extends ModelElement {
     constructor(props: ScalarProps) {
         super(props);
         this.urn = props.urn;
-        this.scalar = props.scalar;
-        this.complexType = props.complexType;
+        this.scalar = Boolean(props.scalar);
+        this.complexType = Boolean(props.complexType);
     }
 
     getUrn(): string {
diff --git a/src/aspect-model-loader.ts b/src/aspect-model-loader.ts
@@ -13,14 +13,16 @@
 
 import {Observable, Subject} from 'rxjs';
 import {Aspect} from './aspect-meta-model';
-import {CacheStrategy, ModelElementCache} from './shared/model-element-cache.service';
 import {RdfLoader} from './shared/rdf-loader';
 import {RdfModel} from './shared/rdf-model';
 import {BaseModelLoader} from './base-model-loader';
 import {RdfModelUtil} from './shared/rdf-model-util';
 import {createAspect} from './instantiator/aspect-instantiator';
 
 export class AspectModelLoader extends BaseModelLoader {
+    constructor() {
+        super();
+    }
     /**
      * Load and instantiate an Aspect Model based on an RDF/Turtle. Related imports are not resolved.
      *
@@ -44,7 +46,6 @@ export class AspectModelLoader extends BaseModelLoader {
      * @return Observable<Aspect> Aspect including all information from the given RDF
      */
     public load(modelAspectUrn: string, ...rdfContent: string[]): Observable<Aspect> {
-        this.cacheService.reset();
         const subject = new Subject<Aspect>();
         new RdfLoader().loadModel(rdfContent).subscribe({
             next: (rdfModel: RdfModel) => {
diff --git a/src/base-model-loader.ts b/src/base-model-loader.ts
@@ -13,16 +13,20 @@
 
 import {DefaultProperty} from './aspect-meta-model';
 import {NamedElement} from './aspect-meta-model/named-element';
-import {CacheStrategy, FilterPredicate} from './shared/model-element-cache.service';
+import {CacheStrategy, FilterPredicate, initElementCache} from './shared/model-element-cache.service';
 
 export abstract class BaseModelLoader {
+    protected cacheService: CacheStrategy;
+
     /**
      * Creates a AspectModelLoader instance.
      *
      * @param cacheService cache strategy to cache created elements to ensure uniqueness and a fast lookup of it.
      *                     The default cache strategy ignores inline defined elements.
      */
-    protected constructor(protected cacheService: CacheStrategy) {}
+    protected constructor() {
+        this.cacheService = initElementCache();
+    }
 
     /**
      * Find a specific model element, and returns it or undefined.
diff --git a/src/instantiator/characteristic/enumeration-characteristic-instantiator.ts b/src/instantiator/characteristic/enumeration-characteristic-instantiator.ts
@@ -89,9 +89,23 @@ export function resolveEntityInstance(quad: Quad): DefaultEntityInstance {
             descriptions,
         });
 
+        console.log(entityInstanceQuads);
         entityInstanceQuads.forEach(quad => {
-            const predicateKey = CharacteristicInstantiatorUtil.getPredicateKey(quad);
-            entityInstance.assertions.set(predicateKey, new ScalarValue({value: resolveQuadObject(quad), type: entity}));
+            if (
+                rdfModel.store.getQuads(quad.predicate, null, null, null).length ||
+                rdfModel.store.getQuads(null, rdfModel.samm.property(), quad.predicate, null).length
+            ) {
+                // multiple language quads -> push into an array
+                const predicateKey = CharacteristicInstantiatorUtil.getPredicateKey(quad);
+                if (entityInstance.assertions.has(predicateKey)) {
+                    const value = entityInstance.assertions.get(predicateKey);
+                    value.value = Array.isArray(value.value)
+                        ? [...value.value, resolveQuadObject(quad)]
+                        : [value.value, resolveQuadObject(quad)];
+                } else {
+                    entityInstance.assertions.set(predicateKey, new ScalarValue({value: resolveQuadObject(quad), type: entity}));
+                }
+            }
         });
 
         return entityInstance;
diff --git a/src/instantiator/characteristic/index.ts b/src/instantiator/characteristic/index.ts
@@ -111,14 +111,13 @@ export function detectAndCreateCharacteristic(quad: Quad): Characteristic {
         ? rdfModel.resolveBlankNodes(quad.object.value)
         : rdfModel.store.getQuads(quad.object, null, null, null);
     const elementDefinitionQuad = characteristicQuads.find(q => rdfModel.samm.RdfType().equals(q.predicate));
-
     if (!elementDefinitionQuad) {
         return null;
     }
 
     for (const processor of processors) {
         if (processor.shouldProcess(elementDefinitionQuad.object as NamedNode)) {
-            return processor.process(elementDefinitionQuad);
+            return processor.process(quad);
         }
     }
 
diff --git a/src/instantiator/characteristic/predefined-characteristic-instantiator.ts b/src/instantiator/characteristic/predefined-characteristic-instantiator.ts
@@ -16,6 +16,7 @@ import {DefaultCharacteristic} from '../../aspect-meta-model/characteristic/defa
 import {getRdfModel} from '../../shared/rdf-model';
 
 const predefinedCharacteristicCreators = {};
+let initialized = false;
 function initPredefinedCharacteristicCreatorsList() {
     const {sammC} = getRdfModel();
     predefinedCharacteristicCreators[`${sammC.getNamespace()}Timestamp`] = createTimestampCharacteristic;
@@ -27,6 +28,7 @@ function initPredefinedCharacteristicCreatorsList() {
     predefinedCharacteristicCreators[`${sammC.getNamespace()}UnitReference`] = createUnitReferenceCharacteristic;
     predefinedCharacteristicCreators[`${sammC.getNamespace()}ResourcePath`] = createResourcePathCharacteristic;
     predefinedCharacteristicCreators[`${sammC.getNamespace()}MimeType`] = createMimeTypeCharacteristic;
+    initialized = true;
 }
 
 export function createTextCharacteristic(): Characteristic {
@@ -225,11 +227,13 @@ export function createMimeTypeCharacteristic(): Characteristic {
 }
 
 export function createPredefinedCharacteristic(aspectModelUrn: string) {
+    if (!initialized) {
+        initPredefinedCharacteristicCreatorsList();
+    }
+
     return predefinedCharacteristicCreators[aspectModelUrn]?.();
 }
 
 export function getSupportedCharacteristicNames(): Array<string> {
     return Object.keys(predefinedCharacteristicCreators);
 }
-
-initPredefinedCharacteristicCreatorsList();
diff --git a/src/instantiator/constraint/index.ts b/src/instantiator/constraint/index.ts
@@ -11,7 +11,7 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
-import {NamedNode, Quad} from 'n3';
+import {NamedNode, Quad, Util} from 'n3';
 import {Constraint} from '../../aspect-meta-model';
 import {getRdfModel} from '../../shared/rdf-model';
 import {createEncodingConstraint} from './encoding-constraint-instantiator';
@@ -21,11 +21,12 @@ import {createLengthConstraint} from './length-constraint-instantiator';
 import {createLocaleConstraint} from './locale-constraint-instantiator';
 import {createRangeConstraint} from './range-constraint-instantiator';
 import {createRegularExpressionConstraint} from './regular-expression-constraint-instantiator';
+import {createDefaultConstraint} from './constraint-instantiator';
 
 const processors = [
     // Constraint
     {
-        process: (quad: Quad) => createEncodingConstraint(quad),
+        process: (quad: Quad) => createDefaultConstraint(quad),
         shouldProcess: (namedNode: NamedNode) => getRdfModel().samm.Constraint().equals(namedNode),
     },
     // EncodingConstraint
@@ -68,8 +69,17 @@ const processors = [
 export function detectAndCreateConstraint(quad: Quad): Constraint {
     if (!quad || !quad?.object) return null;
 
+    const rdfModel = getRdfModel();
+    const constraintQuads = Util.isBlankNode(quad.object)
+        ? rdfModel.resolveBlankNodes(quad.object.value)
+        : rdfModel.store.getQuads(quad.object, null, null, null);
+    const elementDefinitionQuad = constraintQuads.find(q => rdfModel.samm.RdfType().equals(q.predicate));
+    if (!elementDefinitionQuad) {
+        return null;
+    }
+
     for (const processor of processors) {
-        if (processor.shouldProcess(quad.object as NamedNode)) {
+        if (processor.shouldProcess(elementDefinitionQuad.object as NamedNode)) {
             return processor.process(quad);
         }
     }
diff --git a/src/instantiator/entity-instantiator.ts b/src/instantiator/entity-instantiator.ts
@@ -30,7 +30,7 @@ export function createEntity(quads: Quad[], isAbstract = false, extending?: Comp
     const subject = quads?.[0].subject as NamedNode;
     const cachedEntity = elementsCache.get<DefaultEntity>(subject.value);
     if (cachedEntity) {
-        if (!cachedEntity.extendingElements.find(el => el.aspectModelUrn === extending.aspectModelUrn)) {
+        if (extending && !cachedEntity.extendingElements.find(el => el.aspectModelUrn === extending.aspectModelUrn)) {
             cachedEntity.extendingElements.push(extending);
         }
         return cachedEntity;
diff --git a/src/instantiator/meta-model-element-instantiator.ts b/src/instantiator/meta-model-element-instantiator.ts
diff --git a/src/instantiator/property-instantiator.ts b/src/instantiator/property-instantiator.ts
diff --git a/src/namespace-loader.ts b/src/namespace-loader.ts
diff --git a/src/shared/model-element-cache.service.ts b/src/shared/model-element-cache.service.ts
diff --git a/src/shared/rdf-loader.ts b/src/shared/rdf-loader.ts
diff --git a/src/shared/rdf-model.ts b/src/shared/rdf-model.ts
diff --git a/src/shared/units.ts b/src/shared/units.ts
diff --git a/test/namespace.spec.ts b/test/namespace.spec.ts

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ export class DefaultList extends DefaultCollection {`
`21`	`21`	`this.ordered = true;`
`22`	`22`	`}`
`23`	`23`
`24`		`- getCollectionType(): CollectionType {`
	`24`	`+ override getCollectionType(): CollectionType {`
`25`	`25`	`return CollectionType.LIST;`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ export class DefaultScalar extends Type {`
`23`	`23`	`this.scalar = true;`
`24`	`24`	`}`
`25`	`25`
`26`		`- public isScalar(): boolean {`
	`26`	`+ override isScalar(): boolean {`
`27`	`27`	`return true;`
`28`	`28`	`}`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ export class DefaultSet extends DefaultCollection {`
`21`	`21`	`this.ordered = false;`
`22`	`22`	`}`
`23`	`23`
`24`		`- getCollectionType(): CollectionType {`
	`24`	`+ override getCollectionType(): CollectionType {`
`25`	`25`	`return CollectionType.SET;`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,11 +42,11 @@ export class DefaultTrait extends DefaultCharacteristic implements Trait {`
`42`	`42`	`return this.constraints;`
`43`	`43`	`}`
`44`	`44`
`45`		`- getDatatype(): Type {`
	`45`	`+ override getDatatype(): Type {`
`46`	`46`	`return this.baseCharacteristic?.getDatatype();`
`47`	`47`	`}`
`48`	`48`
`49`		`- accept<T, U>(visitor: ModelVisitor<T, U>, context: U): T {`
	`49`	`+ override accept<T, U>(visitor: ModelVisitor<T, U>, context: U): T {`
`50`	`50`	`return visitor.visitCharacteristic(this, context);`
`51`	`51`	`}`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ import {EntityProps} from '../shared/props';`
`19`	`19`
`20`	`20`	`export interface ComplexType extends Type, StructureElement {}`
`21`	`21`	`export abstract class ComplexType extends StructureElement implements ComplexType {`
`22`		`- @use(Type) _: ComplexType;`
	`22`	`+ @use(Type) declare _: ComplexType;`
`23`	`23`
`24`	`24`	`isAbstractEntity_: boolean = false;`
`25`	`25`	`extends_: ComplexType = null;`
`@@ -32,7 +32,7 @@ export abstract class ComplexType extends StructureElement implements ComplexTyp`
`32`	`32`	`this.extendingElements = props.extendingElements \|\| [];`
`33`	`33`	`}`
`34`	`34`
`35`		`- isComplexType() {`
	`35`	`+ override isComplexType() {`
`36`	`36`	`return true;`
`37`	`37`	`}`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ export class DefaultEntityInstance extends NamedElement implements EntityInstanc`
`36`	`36`	`constructor(props: EntityInstanceProps) {`
`37`	`37`	`super(props);`
`38`	`38`	`this.type = props.type;`
`39`		`- this.assertions = props.assertions;`
	`39`	`+ this.assertions = props.assertions \|\| new Map();`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`getType(): Entity {`