Merge branch 'aas-core' into development

.vscode/launch.json

@@ -105,7 +105,7 @@
                 "run-script",
                 "test",
                 "-w",
-                "common"
+                "aas-core"
             ]
         },
         {
@@ -118,7 +118,7 @@
                 "run-script",
                 "test",
                 "-w",
-                "common",
+                "aas-core",
                 "--testPathPattern",
                 "${fileBasename}"
             ]

.vscode/settings.json

@@ -43,8 +43,8 @@
     "jest.debugMode": true,
     "jest.virtualFolders": [
         {
-            "name": "common",
-            "rootPath": "./projects/common",
+            "name": "aas-core",
+            "rootPath": "./projects/aas-core",
             "runMode": "on-demand",
             "jestCommandLine": "node --experimental-vm-modules --no-warnings ../../node_modules/jest/bin/jest.js"
         },

Dockerfile

@@ -14,8 +14,8 @@ COPY package.json package.json
 COPY projects/aas-server/package.json projects/aas-server/package.json
 COPY --from=build /usr/src/app/projects/aas-server/dist/ /usr/src/app/
 COPY --from=build /usr/src/app/projects/aas-server/app-info.json /usr/src/app/app-info.json
-COPY --from=build /usr/src/app/projects/common/dist/ /usr/src/app/node_modules/common/dist/
-COPY --from=build /usr/src/app/projects/common/package.json /usr/src/app/node_modules/common/package.json
+COPY --from=build /usr/src/app/projects/aas-core/dist/ /usr/src/app/node_modules/common/dist/
+COPY --from=build /usr/src/app/projects/aas-core/package.json /usr/src/app/node_modules/common/package.json
 COPY --from=build /usr/src/app/projects/aas-portal/dist/browser/ /usr/src/app/wwwroot/
 RUN npm install -w=aas-server --omit=dev
 COPY projects/aas-server/src/assets assets/

Dockerfile.aas-server

@@ -14,8 +14,8 @@ COPY package.json package.json
 COPY projects/aas-server/package.json projects/aas-server/package.json
 COPY --from=build /usr/src/app/projects/aas-server/dist/ /usr/src/app/
 COPY --from=build /usr/src/app/projects/aas-server/app-info.json /usr/src/app/app-info.json
-COPY --from=build /usr/src/app/projects/common/dist/ /usr/src/app/node_modules/common/dist/
-COPY --from=build /usr/src/app/projects/common/package.json /usr/src/app/node_modules/common/package.json
+COPY --from=build /usr/src/app/projects/aas-core/dist/ /usr/src/app/node_modules/common/dist/
+COPY --from=build /usr/src/app/projects/aas-core/package.json /usr/src/app/node_modules/common/package.json
 RUN npm install -w=aas-server --omit=dev
 COPY projects/aas-server/src/assets assets/
 ENV NODE_LOG=./log/debug.log

copyright-header.ts

@@ -37,7 +37,7 @@ checkFilesAsync([
     './projects/aas-portal/src',
     './projects/aas-server/src',
     './projects/aas-lib/src',
-    './projects/common/src',
+    './projects/aas-core/src',
 ]);
 
 async function checkFilesAsync(dirs: string[]): Promise<void> {

coverage-summary.ts

@@ -11,55 +11,55 @@ import { readFileSync } from 'fs';
 main();
 
 function main() {
-    const commonSummary = read('./reports/common/coverage-summary.json');
+    const aasCoreSummary = read('./reports/aas-core/coverage-summary.json');
     const aasServerSummary = read('./reports/aas-server/coverage-summary.json');
     const aasLibSummary = read('./reports/aas-lib/coverage-summary.json');
     const aasPortalSummary = read('./reports/aas-portal/coverage-summary.json');
 
     const statementsTotal =
-        commonSummary.total.statements.total +
+        aasCoreSummary.total.statements.total +
         aasServerSummary.total.statements.total +
         aasLibSummary.total.statements.total +
         aasPortalSummary.total.statements.total;
 
     const statementsCovered =
-        commonSummary.total.statements.covered +
+        aasCoreSummary.total.statements.covered +
         aasServerSummary.total.statements.covered +
         aasLibSummary.total.statements.covered +
         aasPortalSummary.total.statements.covered;
 
     const branchesTotal =
-        commonSummary.total.branches.total +
+        aasCoreSummary.total.branches.total +
         aasServerSummary.total.branches.total +
         aasLibSummary.total.branches.total +
         aasPortalSummary.total.branches.total;
 
     const branchesCovered =
-        commonSummary.total.branches.covered +
+        aasCoreSummary.total.branches.covered +
         aasServerSummary.total.branches.covered +
         aasLibSummary.total.branches.covered +
         aasPortalSummary.total.branches.covered;
 
     const functionsTotal =
-        commonSummary.total.functions.total +
+        aasCoreSummary.total.functions.total +
         aasServerSummary.total.functions.total +
         aasLibSummary.total.functions.total +
         aasPortalSummary.total.functions.total;
 
     const functionsCovered =
-        commonSummary.total.functions.covered +
+        aasCoreSummary.total.functions.covered +
         aasServerSummary.total.functions.covered +
         aasLibSummary.total.functions.covered +
         aasPortalSummary.total.functions.covered;
 
     const total =
-        commonSummary.total.lines.total +
+        aasCoreSummary.total.lines.total +
         aasServerSummary.total.lines.total +
         aasLibSummary.total.lines.total +
         aasPortalSummary.total.lines.total;
 
     const covered =
-        commonSummary.total.lines.covered +
+        aasCoreSummary.total.lines.covered +
         aasServerSummary.total.lines.covered +
         aasLibSummary.total.lines.covered +
         aasPortalSummary.total.lines.covered;

package.json

@@ -15,12 +15,12 @@
         "tsc": "npm run tsc -ws",
         "build": "npm run build -ws",
         "build:debug": "npm run build:debug -ws",
-        "lib:build": "npm run build -w common -w aas-lib",
-        "lib:build:debug": "npm run build:debug -w common -w aas-lib",
-        "aas-portal:build": "npm run build -w common -w aas-lib -w aas-portal",
-        "aas-portal:build:debug": "npm run build:build -w common -w aas-lib -w aas-portal",
-        "aas-server:build": "npm run build -w common -w aas-server",
-        "aas-server:build:debug": "npm run build:debug -w common -w aas-server",
+        "lib:build": "npm run build -w aas-core -w aas-lib",
+        "lib:build:debug": "npm run build:debug -w aas-core -w aas-lib",
+        "aas-portal:build": "npm run build -w aas-core -w aas-lib -w aas-portal",
+        "aas-portal:build:debug": "npm run build:build -w aas-core -w aas-lib -w aas-portal",
+        "aas-server:build": "npm run build -w aas-core -w aas-server",
+        "aas-server:build:debug": "npm run build:debug -w aas-core -w aas-server",
         "serve": "npm run build && node --env-file projects/aas-server/.env projects/aas-server/dist/aas-server.js"
     },
     "repository": {
@@ -32,7 +32,7 @@
     "license": "Apache-2.0",
     "workspaces": [
         "projects/fhg-jest",
-        "projects/common",
+        "projects/aas-core",
         "projects/aas-server",
         "projects/aas-lib",
         "projects/aas-portal"

projects/common/esbuild.dev.js → projects/aas-core/esbuild.dev.js

@@ -10,7 +10,7 @@ import * as esbuild from 'esbuild';
 
 await esbuild.build({
     entryPoints: ['./src/lib/index.ts'],
-    outfile: './dist/common.js',
+    outfile: './dist/aas-core.js',
     bundle: true,
     platform: 'neutral',
     format: 'esm',

projects/common/esbuild.prod.js → projects/aas-core/esbuild.prod.js

@@ -10,12 +10,12 @@ import * as esbuild from 'esbuild';
 
 await esbuild.build({
     entryPoints: ['./src/lib/index.ts'],
-    outfile: './dist/common.js',
+    outfile: './dist/aas-core.js',
     bundle: true,
     platform: 'neutral',
     format: 'esm',
     target: 'es2022',
     tsconfig: 'tsconfig.lib.json',
     minify: true,
-    external: ['lodash-es']
-});
+    external: ['lodash-es'],
+});

projects/common/jest.config.ts → projects/aas-core/jest.config.ts

@@ -4,7 +4,7 @@ const config: Config = {
     clearMocks: true,
     collectCoverage: true,
     collectCoverageFrom: ['<rootDir>/src/lib/**/*.ts'],
-    coverageDirectory: '<rootDir>/../../reports/common',
+    coverageDirectory: '<rootDir>/../../reports/aas-core',
     coverageReporters: ['html', 'json-summary', 'cobertura'],
     extensionsToTreatAsEsm: ['.ts'],
     moduleNameMapper: {

projects/common/package.json → projects/aas-core/package.json

@@ -1,9 +1,9 @@
 {
-    "name": "common",
+    "name": "aas-core",
     "version": "3.0.0",
     "description": "Common types and utilities for the Web-AAS project",
     "module": "./dist/lib/index.js",
-    "main": "./dist/common.js",
+    "main": "./dist/aas-core.js",
     "types": "./dist/types/index.d.ts",
     "author": "Fraunhofer IOSB-INA",
     "license": "Apache-2.0",

projects/aas-lib/src/lib/aas-table/aas-table-row.ts

@@ -6,7 +6,7 @@
  *
  *****************************************************************************/
 
-import { AASDocument } from 'common';
+import { AASDocument } from 'aas-core';
 import { Tree, TreeNode } from '../tree';
 
 export class AASTableRow extends TreeNode<AASDocument> {

projects/aas-lib/src/lib/aas-table/aas-table.component.ts

@@ -20,7 +20,7 @@ import {
 import { Router } from '@angular/router';
 import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
-import { AASDocument } from 'common';
+import { AASDocument } from 'aas-core';
 
 import { AASTableRow } from './aas-table-row';
 import { ClipboardService } from '../clipboard.service';

projects/aas-lib/src/lib/aas-table/aas-table.filter.ts

@@ -22,7 +22,7 @@ import {
     parseDate,
     toBoolean,
     flat,
-} from 'common';
+} from 'aas-core';
 
 export type ElementValueType = 'string' | 'boolean' | 'number' | 'Date' | 'bigint';
 

projects/aas-lib/src/lib/aas-table/aas-table.store.ts

@@ -8,7 +8,7 @@
 
 import { Injectable, signal, untracked } from '@angular/core';
 import findLastIndex from 'lodash-es/findLastIndex';
-import { AASDocument } from 'common';
+import { AASDocument } from 'aas-core';
 import { ViewMode } from '../types/view-mode';
 import { AASTableRow, AASTableTree } from './aas-table-row';
 

projects/aas-lib/src/lib/aas-tree/aas-tree-api.service.ts

@@ -8,7 +8,7 @@
 
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
-import { aas, AASDocument, AuthResult } from 'common';
+import { aas, AASDocument, AuthResult } from 'aas-core';
 import { encodeBase64Url } from '../convert';
 
 /** The client side AAS provider service. */

projects/aas-lib/src/lib/aas-tree/aas-tree-row.ts

@@ -22,7 +22,7 @@ import {
     selectReferable,
     toBoolean,
     toLocale,
-} from 'common';
+} from 'aas-core';
 
 import { resolveSemanticId, supportedSubmodelTemplates } from '../submodel-template/submodel-template';
 import { Tree, TreeNode } from '../tree';

projects/aas-lib/src/lib/aas-tree/aas-tree-search.ts

@@ -17,7 +17,7 @@ import {
     getModelTypeFromAbbreviation,
     parseDate,
     parseNumber,
-} from 'common';
+} from 'aas-core';
 
 import { normalize } from '../convert';
 import { AASTreeRow } from './aas-tree-row';

projects/aas-lib/src/lib/aas-tree/aas-tree.component.ts

@@ -27,7 +27,7 @@ import {
     mimeTypeToExtension,
     selectReferable,
     stringFormat,
-} from 'common';
+} from 'aas-core';
 
 import { AASTreeRow } from './aas-tree-row';
 import { OnlineState } from '../types/online-state';

projects/aas-lib/src/lib/aas-tree/aas-tree.store.ts

@@ -8,7 +8,7 @@
 
 import { Injectable, computed, signal } from '@angular/core';
 import { AASTree, AASTreeRow } from './aas-tree-row';
-import { AASDocument, aas } from 'common';
+import { AASDocument, aas } from 'aas-core';
 import { TranslateService } from '@ngx-translate/core';
 import { NotifyService } from '../notify/notify.service';
 

projects/aas-lib/src/lib/aas-tree/operation-call-form/operation-call-form.component.ts

@@ -26,7 +26,7 @@ import {
     toInvariant,
     convertToString,
     toBoolean,
-} from 'common';
+} from 'aas-core';
 
 export interface VariableItem {
     submodelElement: aas.SubmodelElement;

projects/aas-lib/src/lib/auth/auth-api.service.ts

@@ -9,7 +9,7 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
-import { Credentials, UserProfile, Cookie, AuthResult } from 'common';
+import { Credentials, UserProfile, Cookie, AuthResult } from 'aas-core';
 import { encodeBase64Url } from '../convert';
 
 @Injectable({

projects/aas-lib/src/lib/auth/auth.service.ts

@@ -20,7 +20,7 @@ import {
     UserRole,
     JWTPayload,
     toBoolean,
-} from 'common';
+} from 'aas-core';
 
 import { NotifyService } from '../notify/notify.service';
 import { ERRORS } from '../types/errors';

projects/aas-lib/src/lib/auth/login-form/login-form.component.ts

@@ -10,7 +10,7 @@ import { ChangeDetectionStrategy, Component, signal } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { NgbActiveModal, NgbToast } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
-import { Credentials, isValidEMail, isValidPassword, stringFormat } from 'common';
+import { Credentials, isValidEMail, isValidPassword, stringFormat } from 'aas-core';
 import isEmpty from 'lodash-es/isEmpty';
 
 import { messageToString } from '../../convert';

projects/aas-lib/src/lib/auth/profile-form/profile-form.component.ts

@@ -11,7 +11,7 @@ import { ChangeDetectionStrategy, Component, signal } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { NgbActiveModal, NgbCollapse, NgbToast } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
-import { getUserNameFromEMail, isValidEMail, isValidPassword, stringFormat, UserProfile } from 'common';
+import { getUserNameFromEMail, isValidEMail, isValidPassword, stringFormat, UserProfile } from 'aas-core';
 import { messageToString } from '../../convert';
 import { ERRORS } from '../../types/errors';
 import { AuthApiService } from '../auth-api.service';

projects/aas-lib/src/lib/auth/register-form/register-form.component.ts

@@ -10,7 +10,7 @@ import isEmpty from 'lodash-es/isEmpty';
 import { ChangeDetectionStrategy, Component, signal } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { NgbActiveModal, NgbToast } from '@ng-bootstrap/ng-bootstrap';
-import { isValidEMail, isValidPassword, stringFormat, UserProfile, getUserNameFromEMail } from 'common';
+import { isValidEMail, isValidPassword, stringFormat, UserProfile, getUserNameFromEMail } from 'aas-core';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
 
 import { AuthApiService } from '../auth-api.service';