Merge branch 'development' of https://github.com/FraunhoferIOSB/AASPo…

…rtal into development

.vscode/settings.json

@@ -30,6 +30,7 @@
         "Qualifiable",
         "rechtlich",
         "selbstaendige",
+        "Sematics",
         "submodel",
         "tsoa",
         "tsyringe",

angular.json

@@ -36,10 +36,7 @@
                             "node_modules/bootstrap-icons/font/bootstrap-icons.min.css",
                             "projects/aas-portal/src/styles.scss"
                         ],
-                        "scripts": [],
-                        "allowedCommonJsDependencies": [
-                            "lodash-es"
-                        ]
+                        "scripts": []
                     },
                     "configurations": {
                         "production": {

package.json

@@ -1,6 +1,6 @@
 {
     "name": "aas-portal-project",
-    "version": "3.0.0-development.69",
+    "version": "3.0.0-development.70",
     "description": "Web-based visualization and control of asset administration shells.",
     "type": "module",
     "scripts": {

projects/aas-core/src/lib/index.ts

@@ -13,10 +13,12 @@ import {
     Blob,
     Entity,
     Environment,
+    HasSemantics,
     Identifiable,
     MultiLanguageProperty,
     Property,
     Referable,
+    Reference,
     ReferenceElement,
     RelationshipElement,
     Submodel,
@@ -121,6 +123,35 @@ export function equalArray<T>(a: T[], b: T[]): boolean {
     return a.every((_, i) => a[i] === b[i]);
 }
 
+/**
+ * Determines whether the specified value is of type `HasSemantics`.
+ * @param value The current value.
+ * @returns `true` if the specified value is of type `HasSemantics`; otherwise, `false`.
+ */
+export function isReference(value: unknown): value is Reference {
+    if (!value || typeof value !== 'object') {
+        return false;
+    }
+
+    return typeof (value as Reference).type === 'string' && Array.isArray((value as Reference).keys);
+}
+
+/**
+ * Determines whether the specified value is of type `HasSemantics`.
+ * @param value The current value.
+ * @returns `true` if the specified value is of type `HasSemantics`; otherwise, `false`.
+ */
+export function isHasSemantics(value: unknown): value is HasSemantics {
+    if (!value || typeof value !== 'object') {
+        return false;
+    }
+
+    return (
+        isReference((value as HasSemantics).semanticId) ||
+        Array.isArray((value as HasSemantics).supplementalSemanticIds)
+    );
+}
+
 /**
  * Determines whether the specified value represents a submodel element.
  * @param value The current value.

projects/aas-core/src/test/index.spec.ts

@@ -15,8 +15,10 @@ import {
     getEndpointType,
     isAssetAdministrationShell,
     isBlob,
+    isHasSemantics,
     isMultiLanguageProperty,
     isProperty,
+    isReference,
     isReferenceElement,
     isSubmodel,
     isSubmodelElement,
@@ -27,6 +29,7 @@ import {
     isValidPassword,
     stringFormat,
 } from '../lib/index.js';
+import { HasSemantics, Reference } from '../lib/aas.js';
 
 describe('index', () => {
     describe('isSubmodelElement', () => {
@@ -355,4 +358,52 @@ describe('index', () => {
             expect(getEndpointType('file:///endpoints/samples')).toEqual('FileSystem');
         });
     });
+
+    describe('isReference', () => {
+        it('indicates that value is of type reference', () => {
+            const value: Reference = {
+                keys: [],
+                type: 'ExternalReference',
+            };
+
+            expect(isReference(value)).toBeTruthy();
+        });
+
+        it('indicates that "{}" is not of type Reference', () => {
+            expect(isReference({})).toBeFalsy();
+        });
+
+        it('indicates that "undefined" is not of type Reference', () => {
+            expect(isReference(undefined)).toBeFalsy();
+        });
+
+        it('indicates that "null" is not of type Reference', () => {
+            expect(isReference(null)).toBeFalsy();
+        });
+    });
+
+    describe('isHasSemantics', () => {
+        it('indicates that value is of type HasSemantics', () => {
+            const value: HasSemantics = {
+                semanticId: {
+                    keys: [],
+                    type: 'ExternalReference',
+                },
+            };
+
+            expect(isHasSemantics(value)).toBeTruthy();
+        });
+
+        it('indicates that "{}" is not of type HasSemantics', () => {
+            expect(isHasSemantics({})).toBeFalsy();
+        });
+
+        it('indicates that "undefined" is not of type HasSemantics', () => {
+            expect(isHasSemantics(undefined)).toBeFalsy();
+        });
+
+        it('indicates that "null" is not of type HasSemantics', () => {
+            expect(isHasSemantics(null)).toBeFalsy();
+        });
+    });
 });