Updated to strict ttl

Author: georgemoscu

.eslintrc

@@ -1,18 +1,13 @@
 {
-  "root": true,
-  "parser": "@typescript-eslint/parser",
-  "plugins": [
-    "@typescript-eslint"
-  ],
-  "extends": [
-    "eslint:recommended",
-    "plugin:@typescript-eslint/eslint-recommended",
-    "plugin:@typescript-eslint/recommended"
-  ],
-  "rules": {
-    "@typescript-eslint/no-explicit-any": "off",
-    "@typescript-eslint/explicit-module-boundary-types": "off",
-    "@typescript-eslint/no-unused-vars": "off",
-    "@typescript-eslint/no-empty-function": "off"
-  }
+    "root": true,
+    "parser": "@typescript-eslint/parser",
+    "plugins": ["@typescript-eslint"],
+    "extends": ["eslint:recommended", "plugin:@typescript-eslint/eslint-recommended", "plugin:@typescript-eslint/recommended"],
+    "rules": {
+        "@typescript-eslint/no-explicit-any": "off",
+        "@typescript-eslint/explicit-module-boundary-types": "off",
+        "@typescript-eslint/no-unused-vars": "off",
+        "@typescript-eslint/no-empty-function": "off",
+        "@typescript-eslint/no-unsafe-declaration-merging": "off"
+    }
 }

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "cSpell.words": ["Instantiator", "samm"]
+}

package-lock.json

@@ -60,6 +60,7 @@
     "n3": "1.17.2",
     "rxjs": "7.x",
     "tslib": "2.6.2",
+    "typescript-mix": "^3.1.3",
     "util": "0.12.5"
   }
 }

package.json

@@ -12,27 +12,28 @@
  */
 
 import {Type} from '../type';
-import {Base, BaseMetaModelElement} from '../base';
 import {ModelVisitor} from '../../visitor/model-visitor';
+import {NamedElement} from '../named-element';
+import {CharacteristicProps} from '../../shared/props';
 
-export interface Characteristic extends BaseMetaModelElement {
+export interface Characteristic extends NamedElement {
     dataType?: Type;
+    getDatatype(): Type;
 }
 
-export class DefaultCharacteristic extends Base implements Characteristic {
-    constructor(metaModelVersion: string, aspectModelUrn: string, name: string, private _dataType?: Type) {
-        super(metaModelVersion, aspectModelUrn, name);
-    }
+export class DefaultCharacteristic extends NamedElement implements Characteristic {
+    dataType?: Type;
 
-    public set dataType(value: Type | undefined) {
-        this._dataType = value;
+    constructor(props: CharacteristicProps) {
+        super(props);
+        this.dataType = props.dataType;
     }
 
-    public get dataType(): Type | undefined {
-        return this._dataType;
+    getDatatype(): Type {
+        return this.dataType;
     }
 
-    public accept<T, U>(visitor: ModelVisitor<T, U>, context: U): T {
+    accept<T, U>(visitor: ModelVisitor<T, U>, context: U): T {
         return visitor.visitCharacteristic(this, context);
     }
 

src/aspect-meta-model/base.ts

@@ -12,10 +12,10 @@
  */
 
 import {DefaultCharacteristic} from './default-characteristic';
-import {Type} from '../type';
+import {CharacteristicProps} from '../../shared/props';
 
 export class DefaultCode extends DefaultCharacteristic {
-    constructor(metaModelVersion: string, aspectModelUrn: string, name: string, dataType?: Type) {
-        super(metaModelVersion, aspectModelUrn, name, dataType);
+    constructor(props: CharacteristicProps) {
+        super(props);
     }
 }

src/aspect-meta-model/characteristic/default-characteristic.ts

@@ -11,49 +11,47 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
-import {Type} from '../type';
+import {CollectionProps} from '../../shared/props';
 import {Characteristic, DefaultCharacteristic} from './default-characteristic';
 
+export enum CollectionType {
+    COLLECTION,
+    SET,
+    SORTEDSET,
+    LIST,
+}
+
 export interface Collection extends Characteristic {
-    isAllowDuplicates: boolean;
-    isOrdered: boolean;
+    allowDuplicates: boolean;
+    ordered: boolean;
     elementCharacteristic?: Characteristic;
 }
 
 export class DefaultCollection extends DefaultCharacteristic implements Collection {
-    constructor(
-        metaModelVersion: string,
-        aspectModelUrn: string,
-        name: string,
-        private _isAllowDuplicates: boolean,
-        private _isOrdered: boolean,
-        private _elementCharacteristic?: Characteristic,
-        dataType?: Type
-    ) {
-        super(metaModelVersion, aspectModelUrn, name, dataType);
-    }
-
-    public set isAllowDuplicates(value: boolean) {
-        this._isAllowDuplicates = value;
-    }
+    allowDuplicates: boolean;
+    ordered: boolean;
+    elementCharacteristic?: Characteristic;
 
-    public get isAllowDuplicates(): boolean {
-        return this._isAllowDuplicates;
+    constructor(props: CollectionProps) {
+        super(props);
+        this.allowDuplicates = Boolean(props.allowDuplicates);
+        this.ordered = Boolean(props.ordered);
+        this.elementCharacteristic = props.elementCharacteristic;
     }
 
-    public set isOrdered(value: boolean) {
-        this._isOrdered = value;
+    isAllowedDuplicates(): boolean {
+        return this.allowDuplicates;
     }
 
-    public get isOrdered(): boolean {
-        return this._isOrdered;
+    isOrdered(): boolean {
+        return this.ordered;
     }
 
-    public set elementCharacteristic(value: Characteristic | undefined) {
-        this._elementCharacteristic = value;
+    getElementCharacteristic(): Characteristic {
+        return this.elementCharacteristic;
     }
 
-    public get elementCharacteristic(): Characteristic | undefined {
-        return this._elementCharacteristic;
+    getCollectionType(): CollectionType {
+        return CollectionType.COLLECTION;
     }
 }

src/aspect-meta-model/characteristic/default-code.ts

@@ -11,12 +11,12 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
-import {DefaultQuantifiable} from './default-quantifiable';
-import {Type} from '../type';
-import {Unit} from '../default-unit';
+import {DefaultQuantifiable, Quantifiable} from './default-quantifiable';
+import {QuantifiableProps} from '../../shared/props';
 
-export class DefaultDuration extends DefaultQuantifiable {
-    constructor(metaModelVersion: string, aspectModelUrn: string, name: string, dataType?: Type, public unit?: Unit) {
-        super(metaModelVersion, aspectModelUrn, name, dataType);
+export interface Duration extends Quantifiable {}
+export class DefaultDuration extends DefaultQuantifiable implements Quantifiable {
+    constructor(props: QuantifiableProps) {
+        super(props);
     }
 }