Refactor/refactor validation for emailAdress and website

packages/content/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nmshd/content",
-    "version": "2.9.0",
+    "version": "2.9.1",
     "description": "The content library defines data structures that can be transmitted using the transport library.",
     "homepage": "https://enmeshed.eu",
     "repository": {

packages/content/src/attributes/types/strings/AbstractEMailAddress.ts

@@ -7,16 +7,20 @@ export abstract class AbstractEMailAddress extends AbstractString {
     @serialize()
     @validate({
         min: 3,
-        max: 100,
-        regExp: new RegExp("^[A-Z0-9._%+-]+@[A-Z0-9.-]+.[A-Z]{2,}$", "i")
+        max: 254,
+        regExp: new RegExp(
+            "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:[.][a-z0-9!#$%&'*+/=?^_`{|}~-]+){0,}@(?:[a-z0-9\u00c4\u00e4\u00d6\u00f6\u00dc\u00fc\u00df](?:[a-z\u00c4\u00e4\u00d6\u00f6\u00dc\u00fc\u00df0-9-]{0,61}[a-z\u00c4\u00e4\u00d6\u00f6\u00dc\u00fc\u00df0-9]){0,1}[.])+[a-z\u00c4\u00e4\u00d6\u00f6\u00dc\u00fc\u00df0-9](?:[a-z\u00c4\u00e4\u00d6\u00f6\u00dc\u00fc\u00df0-9-]{0,61}[a-z\u00c4\u00e4\u00d6\u00f6\u00dc\u00fc\u00df0-9])$",
+            "i"
+        )
     })
     public override value: string;
 
     public static override get valueHints(): ValueHints {
         return super.valueHints.copyWith({
             min: 3,
             max: 100,
-            pattern: "/^[A-Z0-9._%+-]+@[A-Z0-9.-]+.[A-Z]{2,}$/i"
+            pattern:
+                "^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:[.][a-z0-9!#$%&'*+/=?^_`{|}~-]+){0,}@(?:[a-z0-9\u00c4\u00e4\u00d6\u00f6\u00dc\u00fc\u00df](?:[a-z\u00c4\u00e4\u00d6\u00f6\u00dc\u00fc\u00df0-9-]{0,61}[a-z\u00c4\u00e4\u00d6\u00f6\u00dc\u00fc\u00df0-9]){0,1}[.])+[a-z\u00c4\u00e4\u00d6\u00f6\u00dc\u00fc\u00df0-9](?:[a-z\u00c4\u00e4\u00d6\u00f6\u00dc\u00fc\u00df0-9-]{0,61}[a-z\u00c4\u00e4\u00d6\u00f6\u00dc\u00fc\u00df0-9])$/i"
         });
     }
 

packages/content/src/attributes/types/strings/AbstractURL.ts

@@ -9,7 +9,7 @@ export abstract class AbstractURL extends AbstractString {
         max: 1024,
         regExp: new RegExp(
             // eslint-disable-next-line no-useless-escape
-            /((([A-Za-z]{3,9}:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+|(?:www.|[-;:&=\+\$,\w]+@)[A-Za-z0-9.-]+)((?:\/[\+~%\/.\w-_]*)?\??(?:[-\+=&;%@.\w_]*)#?(?:[\w]*))?)/
+            /^(?:|[A-Za-z]{3,9}:(?:\/\/)?|[:](?:\/\/)?|(?:\/\/))(?:(www[.])(?:[a-z0-9\u00c4\u00e4\u00d6\u00f6\u00dc\u00fc\u00df](?:[A-Za-z\u00c4\u00e4\u00d6\u00f6\u00dc\u00fc\u00df0-9-]{0,61}[A-Za-z\u00c4\u00e4\u00d6\u00f6\u00dc\u00fc\u00df0-9]){0,1}[.])|((?!www.)(?:[a-z0-9\u00c4\u00e4\u00d6\u00f6\u00dc\u00fc\u00df](?:[A-Za-z\u00c4\u00e4\u00d6\u00f6\u00dc\u00fc\u00df0-9-]{0,61}[A-Za-z\u00c4\u00e4\u00d6\u00f6\u00dc\u00fc\u00df0-9]){0,1}[.])))[A-Za-z\u00c4\u00e4\u00d6\u00f6\u00dc\u00fc\u00df0-9](?:[A-Za-z\u00c4\u00e4\u00d6\u00f6\u00dc\u00fc\u00df0-9-]{0,61}[A-Za-z\u00c4\u00e4\u00d6\u00f6\u00dc\u00fc\u00df0-9])(\:[0-9]+){0,}(?:[/][\w\u00c4\u00e4\u00d6\u00f6\u00dc\u00fc\u00df\-_?#@!\$&'\(\)\*\+,;=]{0,}){0,}$/
         )
     })
     public override value: string;
@@ -19,7 +19,7 @@ export abstract class AbstractURL extends AbstractString {
             min: 3,
             max: 1024,
             pattern:
-                "/((([A-Za-z]{3,9}:(?:\\/\\/)?)(?:[-;:&=\\+\\$,\\w]+@)?[A-Za-z0-9.-]+|(?:www.|[-;:&=\\+\\$,\\w]+@)[A-Za-z0-9.-]+)((?:\\/[\\+~%\\/.\\w\\-_]*)?\\??(?:[-\\+=&;%@.\\w_]*)#?(?:[\\w]*))?)/"
+                "/^(?:|[A-Za-z]{3,9}:(?://)?|[:](?://)?|(?://))(?:(www[.])(?:[a-z0-9\u00c4\u00e4\u00d6\u00f6\u00dc\u00fc\u00df](?:[A-Za-z\u00c4\u00e4\u00d6\u00f6\u00dc\u00fc\u00df0-9-]{0,61}[A-Za-z\u00c4\u00e4\u00d6\u00f6\u00dc\u00fc\u00df0-9]){0,1}[.])|((?!www.)(?:[a-z0-9\u00c4\u00e4\u00d6\u00f6\u00dc\u00fc\u00df](?:[A-Za-z\u00c4\u00e4\u00d6\u00f6\u00dc\u00fc\u00df0-9-]{0,61}[A-Za-z\u00c4\u00e4\u00d6\u00f6\u00dc\u00fc\u00df0-9]){0,1}[.])))[A-Za-z\u00c4\u00e4\u00d6\u00f6\u00dc\u00fc\u00df0-9](?:[A-Za-z\u00c4\u00e4\u00d6\u00f6\u00dc\u00fc\u00df0-9-]{0,61}[A-Za-z\u00c4\u00e4\u00d6\u00f6\u00dc\u00fc\u00df0-9])(:[0-9]+){0,}(?:[/][w\u00c4\u00e4\u00d6\u00f6\u00dc\u00fc\u00df-_?#@!$&'()*+,;=]{0,}){0,}$/"
         });
     }
 

packages/content/test/attributes/EmailAddress.test.ts

@@ -0,0 +1,59 @@
+import { ParsingError } from "@js-soft/ts-serval";
+import { EMailAddress } from "../../src";
+
+describe("creation of RepositoryAttributes of Attribute Value Type EMailAddress", function () {
+    test("can create a RepositoryAttribute of Attribute Value Type EMailAddress", function () {
+        const validEMailAdress = EMailAddress.from({
+            value: "peter123@inwind.it"
+        });
+        expect(validEMailAdress.value.toString()).toBe("peter123@inwind.it");
+    });
+    test("can create a RepositoryAttribute of Attribute Value Type EMailAddress with the German 'ä' in its domain", function () {
+        const validEMailAdress = EMailAddress.from({
+            value: "peter123@inwänd.it"
+        });
+        expect(validEMailAdress.value.toString()).toBe("peter123@inwänd.it");
+    });
+    test("returns an error when trying to create an Attribute Value Type EMailAddress with a blank in the value for EMailAddress", function () {
+        const invalidEMailAdressCall = () => {
+            EMailAddress.from({
+                value: "Hugo Becker@gmx.de"
+            });
+        };
+        expect(invalidEMailAdressCall).toThrow(
+            new ParsingError(
+                "EMailAddress",
+                "value",
+                "Value does not match regular expression /^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:[.][a-z0-9!#$%&'*+/=?^_`{|}~-]+){0,}@(?:[a-z0-9ÄäÖöÜüß](?:[a-zÄäÖöÜüß0-9-]{0,61}[a-zÄäÖöÜüß0-9]){0,1}[.])+[a-zÄäÖöÜüß0-9](?:[a-zÄäÖöÜüß0-9-]{0,61}[a-zÄäÖöÜüß0-9])$/i"
+            )
+        );
+    });
+    test("returns an error when trying to create an Attribute Value Type EMailAddress without the right ending in the value for EMailAddress", function () {
+        const invalidEMailAdressCall = () => {
+            EMailAddress.from({
+                value: "Becker@gmx"
+            });
+        };
+        expect(invalidEMailAdressCall).toThrow(
+            new ParsingError(
+                "EMailAddress",
+                "value",
+                "Value does not match regular expression /^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:[.][a-z0-9!#$%&'*+/=?^_`{|}~-]+){0,}@(?:[a-z0-9ÄäÖöÜüß](?:[a-zÄäÖöÜüß0-9-]{0,61}[a-zÄäÖöÜüß0-9]){0,1}[.])+[a-zÄäÖöÜüß0-9](?:[a-zÄäÖöÜüß0-9-]{0,61}[a-zÄäÖöÜüß0-9])$/i"
+            )
+        );
+    });
+    test("returns an error when trying to create an Attribute Value Type EMailAddress with a - before the . in the value for EMailAddress", function () {
+        const invalidEMailAdressCall = () => {
+            EMailAddress.from({
+                value: "Becker@gmx-.de"
+            });
+        };
+        expect(invalidEMailAdressCall).toThrow(
+            new ParsingError(
+                "EMailAddress",
+                "value",
+                "Value does not match regular expression /^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:[.][a-z0-9!#$%&'*+/=?^_`{|}~-]+){0,}@(?:[a-z0-9ÄäÖöÜüß](?:[a-zÄäÖöÜüß0-9-]{0,61}[a-zÄäÖöÜüß0-9]){0,1}[.])+[a-zÄäÖöÜüß0-9](?:[a-zÄäÖöÜüß0-9-]{0,61}[a-zÄäÖöÜüß0-9])$/i"
+            )
+        );
+    });
+});

packages/content/test/attributes/Website.test.ts

@@ -0,0 +1,79 @@
+import { ParsingError } from "@js-soft/ts-serval";
+import { Website } from "../../src";
+
+describe("creation of RepositoryAttributes of Attribute Value Type Website", function () {
+    test("can create a RepositoryAttribute of Attribute Value Type Website with the beginning www.", function () {
+        const validWebsite = Website.from({
+            value: "www.inwind.it"
+        });
+        expect(validWebsite.value.toString()).toBe("www.inwind.it");
+    });
+    test("can create a RepositoryAttribute of Attribute Value Type Website", function () {
+        const validWebsite = Website.from({
+            value: "https://inwind.it"
+        });
+        expect(validWebsite.value.toString()).toBe("https://inwind.it");
+    });
+    test("can create a RepositoryAttribute of Attribute Value Type Website with the German 'ä' in its domain", function () {
+        const validWebsite = Website.from({
+            value: "https://inwänd.it"
+        });
+        expect(validWebsite.value.toString()).toBe("https://inwänd.it");
+    });
+    test("can create a RepositoryAttribute of Attribute Value Type Website without www.", function () {
+        const validWebsite = Website.from({
+            value: "//google.it"
+        });
+        expect(validWebsite.value.toString()).toBe("//google.it");
+    });
+    test("can create a RepositoryAttribute of Attribute Value Type Website with a enhanced path", function () {
+        const validWebsite = Website.from({
+            value: "https://enmeshed.de/blog/meilenstein-enmeshed-als-komponente-ablage-in-mein-bildungsraum-geht-in-die-testphase-der-beta-version/"
+        });
+        expect(validWebsite.value.toString()).toBe(
+            "https://enmeshed.de/blog/meilenstein-enmeshed-als-komponente-ablage-in-mein-bildungsraum-geht-in-die-testphase-der-beta-version/"
+        );
+    });
+    test("returns an error when trying to create an Attribute Value Type Website wich contains more than only the address of the website", function () {
+        const invalidWebsiteCall = () => {
+            Website.from({
+                value: "Hugo https://inwind.it"
+            });
+        };
+        expect(invalidWebsiteCall).toThrow(
+            new ParsingError(
+                "Website",
+                "value",
+                "Value does not match regular expression /^(?:|[A-Za-z]{3,9}:(?:\\/\\/)?|[:](?:\\/\\/)?|(?:\\/\\/))(?:(www[.])(?:[a-z0-9\\u00c4\\u00e4\\u00d6\\u00f6\\u00dc\\u00fc\\u00df](?:[A-Za-z\\u00c4\\u00e4\\u00d6\\u00f6\\u00dc\\u00fc\\u00df0-9-]{0,61}[A-Za-z\\u00c4\\u00e4\\u00d6\\u00f6\\u00dc\\u00fc\\u00df0-9]){0,1}[.])|((?!www.)(?:[a-z0-9\\u00c4\\u00e4\\u00d6\\u00f6\\u00dc\\u00fc\\u00df](?:[A-Za-z\\u00c4\\u00e4\\u00d6\\u00f6\\u00dc\\u00fc\\u00df0-9-]{0,61}[A-Za-z\\u00c4\\u00e4\\u00d6\\u00f6\\u00dc\\u00fc\\u00df0-9]){0,1}[.])))[A-Za-z\\u00c4\\u00e4\\u00d6\\u00f6\\u00dc\\u00fc\\u00df0-9](?:[A-Za-z\\u00c4\\u00e4\\u00d6\\u00f6\\u00dc\\u00fc\\u00df0-9-]{0,61}[A-Za-z\\u00c4\\u00e4\\u00d6\\u00f6\\u00dc\\u00fc\\u00df0-9])(\\:[0-9]+){0,}(?:[/][\\w\\u00c4\\u00e4\\u00d6\\u00f6\\u00dc\\u00fc\\u00df\\-_?#@!\\$&'\\(\\)\\*\\+,;=]{0,}){0,}$/"
+            )
+        );
+    });
+    test("returns an error when trying to create an Attribute Value Type Website without the right ending when it starts with www.", function () {
+        const invalidWebsiteCall = () => {
+            Website.from({
+                value: "www.google"
+            });
+        };
+        expect(invalidWebsiteCall).toThrow(
+            new ParsingError(
+                "Website",
+                "value",
+                "Value does not match regular expression /^(?:|[A-Za-z]{3,9}:(?:\\/\\/)?|[:](?:\\/\\/)?|(?:\\/\\/))(?:(www[.])(?:[a-z0-9\\u00c4\\u00e4\\u00d6\\u00f6\\u00dc\\u00fc\\u00df](?:[A-Za-z\\u00c4\\u00e4\\u00d6\\u00f6\\u00dc\\u00fc\\u00df0-9-]{0,61}[A-Za-z\\u00c4\\u00e4\\u00d6\\u00f6\\u00dc\\u00fc\\u00df0-9]){0,1}[.])|((?!www.)(?:[a-z0-9\\u00c4\\u00e4\\u00d6\\u00f6\\u00dc\\u00fc\\u00df](?:[A-Za-z\\u00c4\\u00e4\\u00d6\\u00f6\\u00dc\\u00fc\\u00df0-9-]{0,61}[A-Za-z\\u00c4\\u00e4\\u00d6\\u00f6\\u00dc\\u00fc\\u00df0-9]){0,1}[.])))[A-Za-z\\u00c4\\u00e4\\u00d6\\u00f6\\u00dc\\u00fc\\u00df0-9](?:[A-Za-z\\u00c4\\u00e4\\u00d6\\u00f6\\u00dc\\u00fc\\u00df0-9-]{0,61}[A-Za-z\\u00c4\\u00e4\\u00d6\\u00f6\\u00dc\\u00fc\\u00df0-9])(\\:[0-9]+){0,}(?:[/][\\w\\u00c4\\u00e4\\u00d6\\u00f6\\u00dc\\u00fc\\u00df\\-_?#@!\\$&'\\(\\)\\*\\+,;=]{0,}){0,}$/"
+            )
+        );
+    });
+    test("returns an error when trying to create an Attribute Value Type Website with a - before the . in the value for Website", function () {
+        const invalidWebsiteCall = () => {
+            Website.from({
+                value: "google-.de"
+            });
+        };
+        expect(invalidWebsiteCall).toThrow(
+            new ParsingError(
+                "Website",
+                "value",
+                "Value does not match regular expression /^(?:|[A-Za-z]{3,9}:(?:\\/\\/)?|[:](?:\\/\\/)?|(?:\\/\\/))(?:(www[.])(?:[a-z0-9\\u00c4\\u00e4\\u00d6\\u00f6\\u00dc\\u00fc\\u00df](?:[A-Za-z\\u00c4\\u00e4\\u00d6\\u00f6\\u00dc\\u00fc\\u00df0-9-]{0,61}[A-Za-z\\u00c4\\u00e4\\u00d6\\u00f6\\u00dc\\u00fc\\u00df0-9]){0,1}[.])|((?!www.)(?:[a-z0-9\\u00c4\\u00e4\\u00d6\\u00f6\\u00dc\\u00fc\\u00df](?:[A-Za-z\\u00c4\\u00e4\\u00d6\\u00f6\\u00dc\\u00fc\\u00df0-9-]{0,61}[A-Za-z\\u00c4\\u00e4\\u00d6\\u00f6\\u00dc\\u00fc\\u00df0-9]){0,1}[.])))[A-Za-z\\u00c4\\u00e4\\u00d6\\u00f6\\u00dc\\u00fc\\u00df0-9](?:[A-Za-z\\u00c4\\u00e4\\u00d6\\u00f6\\u00dc\\u00fc\\u00df0-9-]{0,61}[A-Za-z\\u00c4\\u00e4\\u00d6\\u00f6\\u00dc\\u00fc\\u00df0-9])(\\:[0-9]+){0,}(?:[/][\\w\\u00c4\\u00e4\\u00d6\\u00f6\\u00dc\\u00fc\\u00df\\-_?#@!\\$&'\\(\\)\\*\\+,;=]{0,}){0,}$/"
+            )
+        );
+    });
+});

packages/runtime/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nmshd/runtime",
-    "version": "4.6.0",
+    "version": "4.6.1",
     "description": "The enmeshed client runtime.",
     "homepage": "https://enmeshed.eu",
     "repository": {
@@ -57,7 +57,7 @@
         "@js-soft/ts-serval": "2.0.10",
         "@js-soft/ts-utils": "^2.3.3",
         "@nmshd/consumption": "3.10.0",
-        "@nmshd/content": "2.9.0",
+        "@nmshd/content": "2.9.1",
         "@nmshd/crypto": "2.0.6",
         "@nmshd/transport": "2.5.0",
         "ajv": "^8.13.0",