fix/escape regExp correctly (#53)

* fix: escape regExp correctly * chore: versionBump * refactor: fix prettier issue * chore: update package-lock
nmshd · Mar 5, 2024 · 657d043 · 657d043
1 parent af56e7c
commit 657d043
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/content/package.json b/packages/content/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@nmshd/content",
-    "version": "2.8.8",
+    "version": "2.8.9",
     "description": "The content library defines data structures that can be transmitted using the transport library.",
     "homepage": "https://enmeshed.eu",
     "repository": {

diff --git a/packages/content/src/attributes/types/strings/AbstractURL.ts b/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]*))?)$/i
+            /((([A-Za-z]{3,9}:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+|(?:www.|[-;:&=\+\$,\w]+@)[A-Za-z0-9.-]+)((?:\/[\+~%\/.\w-_]*)?\??(?:[-\+=&;%@.\w_]*)#?(?:[\w]*))?)/
         )
     })
     public override value: string;
@@ -18,7 +18,8 @@ export abstract class AbstractURL extends AbstractString {
         return super.valueHints.copyWith({
             min: 3,
             max: 1024,
-            pattern: "/^((([A-Za-z]{3,9}:(?://)?)(?:[-;:&=+$,w]+@)?[A-Za-z0-9.-]+|(?:www.|[-;:&=+$,w]+@)[A-Za-z0-9.-]+)((?:/[+~%/.w-_]*)???(?:[-+=&;%@.w_]*)#?(?:[.!/\\w]*))?)$/i"
+            pattern:
+                "/((([A-Za-z]{3,9}:(?:\\/\\/)?)(?:[-;:&=\\+\\$,\\w]+@)?[A-Za-z0-9.-]+|(?:www.|[-;:&=\\+\\$,\\w]+@)[A-Za-z0-9.-]+)((?:\\/[\\+~%\\/.\\w\\-_]*)?\\??(?:[-\\+=&;%@.\\w_]*)#?(?:[\\w]*))?)/"
         });
     }
 

diff --git a/packages/runtime/package.json b/packages/runtime/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@nmshd/runtime",
-    "version": "4.3.2",
+    "version": "4.3.3",
     "description": "The enmeshed client runtime.",
     "homepage": "https://enmeshed.eu",
     "repository": {
@@ -66,7 +66,7 @@
         "@js-soft/ts-serval": "2.0.10",
         "@js-soft/ts-utils": "^2.3.3",
         "@nmshd/consumption": "3.9.5",
-        "@nmshd/content": "2.8.8",
+        "@nmshd/content": "2.8.9",
         "@nmshd/crypto": "2.0.6",
         "@nmshd/transport": "2.3.4",
         "ajv": "^8.12.0",