Restrict character sets for attribute values

packages/content/src/attributes/RelationshipAttribute.ts

@@ -2,6 +2,7 @@ import { serialize, type, validate } from "@js-soft/ts-serval";
 import { AbstractAttribute, AbstractAttributeJSON, IAbstractAttribute } from "./AbstractAttribute";
 import { AttributeValues } from "./AttributeValueTypes";
 import { RelationshipAttributeConfidentiality } from "./RelationshipAttributeConfidentiality";
+import { characterSets } from "./constants/CharacterSets";
 
 export interface RelationshipAttributeJSON<TValueJSONInterface extends AttributeValues.Relationship.Json = AttributeValues.Relationship.Json> extends AbstractAttributeJSON {
     "@type": "RelationshipAttribute";
@@ -28,7 +29,7 @@ export class RelationshipAttribute<TValueClass extends AttributeValues.Relations
     public value: TValueClass;
 
     @serialize()
-    @validate({ max: 100 })
+    @validate({ max: 100, regExp: characterSets.din91379DatatypeC })
     public key: string;
 
     @serialize()

packages/content/src/attributes/RelationshipAttributeQuery.ts

@@ -2,6 +2,7 @@ import { ISerializable, Serializable, serialize, type, validate } from "@js-soft
 import { CoreAddress, ICoreAddress } from "@nmshd/core-types";
 import { AbstractAttributeQuery, AbstractAttributeQueryJSON, IAbstractAttributeQuery } from "./AbstractAttributeQuery";
 import { AttributeValues } from "./AttributeValueTypes";
+import { characterSets } from "./constants/CharacterSets";
 import { IValueHints, ValueHints, ValueHintsJSON } from "./hints";
 import { RelationshipAttributeConfidentiality } from "./RelationshipAttributeConfidentiality";
 import { PROPRIETARY_ATTRIBUTE_MAX_DESCRIPTION_LENGTH, PROPRIETARY_ATTRIBUTE_MAX_TITLE_LENGTH } from "./types/proprietary/ProprietaryAttributeValue";
@@ -30,7 +31,7 @@ export interface IRelationshipAttributeCreationHints extends ISerializable {
 @type("RelationshipAttributeCreationHints")
 export class RelationshipAttributeCreationHints extends Serializable implements IRelationshipAttributeCreationHints {
     @serialize()
-    @validate({ max: PROPRIETARY_ATTRIBUTE_MAX_TITLE_LENGTH })
+    @validate({ max: PROPRIETARY_ATTRIBUTE_MAX_TITLE_LENGTH, regExp: characterSets.din91379DatatypeC })
     public title: string;
 
     @serialize()
@@ -40,7 +41,7 @@ export class RelationshipAttributeCreationHints extends Serializable implements
     public valueType: AttributeValues.Relationship.TypeName;
 
     @serialize()
-    @validate({ nullable: true, max: PROPRIETARY_ATTRIBUTE_MAX_DESCRIPTION_LENGTH })
+    @validate({ nullable: true, max: PROPRIETARY_ATTRIBUTE_MAX_DESCRIPTION_LENGTH, regExp: characterSets.din91379DatatypeC })
     public description?: string;
 
     @serialize()
@@ -81,7 +82,7 @@ export interface IRelationshipAttributeQuery extends IAbstractAttributeQuery {
 @type("RelationshipAttributeQuery")
 export class RelationshipAttributeQuery extends AbstractAttributeQuery implements IRelationshipAttributeQuery {
     @serialize()
-    @validate({ max: 100 })
+    @validate({ max: 100, regExp: characterSets.din91379DatatypeC })
     public key: string;
 
     @serialize()

packages/content/src/attributes/ThirdPartyRelationshipAttributeQuery.ts

@@ -1,6 +1,7 @@
 import { serialize, type, validate } from "@js-soft/ts-serval";
 import { CoreAddress, ICoreAddress } from "@nmshd/core-types";
 import { AbstractAttributeQuery, AbstractAttributeQueryJSON, IAbstractAttributeQuery } from "./AbstractAttributeQuery";
+import { characterSets } from "./constants/CharacterSets";
 export interface ThirdPartyRelationshipAttributeQueryJSON extends AbstractAttributeQueryJSON {
     "@type": "ThirdPartyRelationshipAttributeQuery";
     key: string;
@@ -23,7 +24,7 @@ export enum ThirdPartyRelationshipAttributeQueryOwner {
 @type("ThirdPartyRelationshipAttributeQuery")
 export class ThirdPartyRelationshipAttributeQuery extends AbstractAttributeQuery implements IThirdPartyRelationshipAttributeQuery {
     @serialize()
-    @validate({ max: 100 })
+    @validate({ max: 100, regExp: characterSets.din91379DatatypeC })
     public key: string;
 
     @serialize()

packages/content/src/attributes/constants/CharacterSets.ts

@@ -0,0 +1,13 @@
+export const characterSets: Record<string, RegExp> = {
+    // DIN91379 character sets from https://xoev.de/schemata/din/91379/2022-08/din-norm-91379-datatypes.xsd
+    // See the sources in the browser's dev mode, they're not equal to what's initially displayed
+    // data type A for names of natural persons
+    din91379DatatypeA:
+        /^( |'|[,-.]|[A-Z]|[`-z]|~|¨|´|·|[À-Ö]|[Ø-ö]|[ø-ž]|[Ƈ-ƈ]|Ə|Ɨ|[Ơ-ơ]|[Ư-ư]|Ʒ|[Ǎ-ǜ]|[Ǟ-ǟ]|[Ǣ-ǰ]|[Ǵ-ǵ]|[Ǹ-ǿ]|[Ȓ-ȓ]|[Ș-ț]|[Ȟ-ȟ]|[ȧ-ȳ]|ə|ɨ|ʒ|[ʹ-ʺ]|[ʾ-ʿ]|ˈ|ˌ|[Ḃ-ḃ]|[Ḇ-ḇ]|[Ḋ-ḑ]|ḗ|[Ḝ-ḫ]|[ḯ-ḷ]|[Ḻ-ḻ]|[Ṁ-ṉ]|[Ṓ-ṛ]|[Ṟ-ṣ]|[Ṫ-ṯ]|[Ẁ-ẇ]|[Ẍ-ẗ]|ẞ|[Ạ-ỹ]|’|‡|A̋|C(̀|̄|̆|̈|̕|̣|̦|̨̆)|D̂|F(̀|̄)|G̀|H(̄|̦|̱)|J(́|̌)|K(̀|̂|̄|̇|̕|̛|̦|͟H|͟h)|L(̂|̥|̥̄|̦)|M(̀|̂|̆|̐)|N(̂|̄|̆|̦)|P(̀|̄|̕|̣)|R(̆|̥|̥̄)|S(̀|̄|̛̄|̱)|T(̀|̄|̈|̕|̛)|U̇|Z(̀|̄|̆|̈|̧)|a̋|c(̀|̄|̆|̈|̕|̣|̦|̨̆)|d̂|f(̀|̄)|g̀|h(̄|̦)|j́|k(̀|̂|̄|̇|̕|̛|̦|͟h)|l(̂|̥|̥̄|̦)|m(̀|̂|̆|̐)|n(̂|̄|̆|̦)|p(̀|̄|̕|̣)|r(̆|̥|̥̄)|s(̀|̄|̛̄|̱)|t(̀|̄|̕|̛)|u̇|z(̀|̄|̆|̈|̧)|Ç̆|Û̄|ç̆|û̄|ÿ́|Č(̕|̣)|č(̕|̣)|ē̍|Ī́|ī́|ō̍|Ž(̦|̧)|ž(̦|̧)|Ḳ̄|ḳ̄|Ṣ̄|ṣ̄|Ṭ̄|ṭ̄|Ạ̈|ạ̈|Ọ̈|ọ̈|Ụ(̄|̈)|ụ(̄|̈))*$/,
+    // data type B for all names
+    din91379DatatypeB:
+        /^([ -~]|[¡-£]|¥|[§-¬]|[®-·]|[¹-»]|[¿-ž]|[Ƈ-ƈ]|Ə|Ɨ|[Ơ-ơ]|[Ư-ư]|Ʒ|[Ǎ-ǜ]|[Ǟ-ǟ]|[Ǣ-ǰ]|[Ǵ-ǵ]|[Ǹ-ǿ]|[Ȓ-ȓ]|[Ș-ț]|[Ȟ-ȟ]|[ȧ-ȳ]|ə|ɨ|ʒ|[ʹ-ʺ]|[ʾ-ʿ]|ˈ|ˌ|[Ḃ-ḃ]|[Ḇ-ḇ]|[Ḋ-ḑ]|ḗ|[Ḝ-ḫ]|[ḯ-ḷ]|[Ḻ-ḻ]|[Ṁ-ṉ]|[Ṓ-ṛ]|[Ṟ-ṣ]|[Ṫ-ṯ]|[Ẁ-ẇ]|[Ẍ-ẗ]|ẞ|[Ạ-ỹ]|’|‡|€|A̋|C(̀|̄|̆|̈|̕|̣|̦|̨̆)|D̂|F(̀|̄)|G̀|H(̄|̦|̱)|J(́|̌)|K(̀|̂|̄|̇|̕|̛|̦|͟H|͟h)|L(̂|̥|̥̄|̦)|M(̀|̂|̆|̐)|N(̂|̄|̆|̦)|P(̀|̄|̕|̣)|R(̆|̥|̥̄)|S(̀|̄|̛̄|̱)|T(̀|̄|̈|̕|̛)|U̇|Z(̀|̄|̆|̈|̧)|a̋|c(̀|̄|̆|̈|̕|̣|̦|̨̆)|d̂|f(̀|̄)|g̀|h(̄|̦)|j́|k(̀|̂|̄|̇|̕|̛|̦|͟h)|l(̂|̥|̥̄|̦)|m(̀|̂|̆|̐)|n(̂|̄|̆|̦)|p(̀|̄|̕|̣)|r(̆|̥|̥̄)|s(̀|̄|̛̄|̱)|t(̀|̄|̕|̛)|u̇|z(̀|̄|̆|̈|̧)|Ç̆|Û̄|ç̆|û̄|ÿ́|Č(̕|̣)|č(̕|̣)|ē̍|Ī́|ī́|ō̍|Ž(̦|̧)|ž(̦|̧)|Ḳ̄|ḳ̄|Ṣ̄|ṣ̄|Ṭ̄|ṭ̄|Ạ̈|ạ̈|Ọ̈|ọ̈|Ụ(̄|̈)|ụ(̄|̈))*$/,
+    // data type C for every mandatory character in the norm
+    din91379DatatypeC:
+        /^([\u0009-\u000A]|\u000D|[ -~]|[ -¬]|[®-ž]|[Ƈ-ƈ]|Ə|Ɨ|[Ơ-ơ]|[Ư-ư]|Ʒ|[Ǎ-ǜ]|[Ǟ-ǟ]|[Ǣ-ǰ]|[Ǵ-ǵ]|[Ǹ-ǿ]|[Ȓ-ȓ]|[Ș-ț]|[Ȟ-ȟ]|[ȧ-ȳ]|ə|ɨ|ʒ|[ʹ-ʺ]|[ʾ-ʿ]|ˈ|ˌ|[Ḃ-ḃ]|[Ḇ-ḇ]|[Ḋ-ḑ]|ḗ|[Ḝ-ḫ]|[ḯ-ḷ]|[Ḻ-ḻ]|[Ṁ-ṉ]|[Ṓ-ṛ]|[Ṟ-ṣ]|[Ṫ-ṯ]|[Ẁ-ẇ]|[Ẍ-ẗ]|ẞ|[Ạ-ỹ]|’|‡|€|A̋|C(̀|̄|̆|̈|̕|̣|̦|̨̆)|D̂|F(̀|̄)|G̀|H(̄|̦|̱)|J(́|̌)|K(̀|̂|̄|̇|̕|̛|̦|͟H|͟h)|L(̂|̥|̥̄|̦)|M(̀|̂|̆|̐)|N(̂|̄|̆|̦)|P(̀|̄|̕|̣)|R(̆|̥|̥̄)|S(̀|̄|̛̄|̱)|T(̀|̄|̈|̕|̛)|U̇|Z(̀|̄|̆|̈|̧)|a̋|c(̀|̄|̆|̈|̕|̣|̦|̨̆)|d̂|f(̀|̄)|g̀|h(̄|̦)|j́|k(̀|̂|̄|̇|̕|̛|̦|͟h)|l(̂|̥|̥̄|̦)|m(̀|̂|̆|̐)|n(̂|̄|̆|̦)|p(̀|̄|̕|̣)|r(̆|̥|̥̄)|s(̀|̄|̛̄|̱)|t(̀|̄|̕|̛)|u̇|z(̀|̄|̆|̈|̧)|Ç̆|Û̄|ç̆|û̄|ÿ́|Č(̕|̣)|č(̕|̣)|ē̍|Ī́|ī́|ō̍|Ž(̦|̧)|ž(̦|̧)|Ḳ̄|ḳ̄|Ṣ̄|ṣ̄|Ṭ̄|ṭ̄|Ạ̈|ạ̈|Ọ̈|ọ̈|Ụ(̄|̈)|ụ(̄|̈))*$/
+};

packages/content/src/attributes/hints/ValueHints.ts

@@ -1,5 +1,6 @@
 import { ISerializable, PrimitiveType, Serializable, serialize, type, validate } from "@js-soft/ts-serval";
 import { ContentJSON } from "../../ContentJSON";
+import { characterSets } from "../constants/CharacterSets";
 import { IValueHintsValue, ValueHintsValue, ValueHintsValueJSON } from "./ValueHintsValue";
 
 export interface ValueHintsJSON extends ContentJSON {
@@ -48,7 +49,7 @@ function serializePropertyHints(hints: ValueHints | ValueHintsOverride, json: Va
 @type("ValueHints")
 export class ValueHints extends Serializable implements IValueHints {
     @serialize()
-    @validate({ nullable: true, max: 500 })
+    @validate({ nullable: true, max: 500, regExp: characterSets.din91379DatatypeC })
     public editHelp?: string;
 
     @serialize()
@@ -67,7 +68,7 @@ export class ValueHints extends Serializable implements IValueHints {
     @validate({ nullable: true })
     public values?: ValueHintsValue[];
 
-    @validate({ nullable: true, allowedTypes: [PrimitiveType.Number, PrimitiveType.String, PrimitiveType.Boolean] })
+    @validate({ nullable: true, allowedTypes: [PrimitiveType.Number, PrimitiveType.String, PrimitiveType.Boolean], customValidator: validateDefaultValue })
     @serialize()
     public defaultValue?: number | string | boolean;
 
@@ -104,7 +105,7 @@ export class ValueHints extends Serializable implements IValueHints {
 @type("ValueHintsOverride")
 export class ValueHintsOverride extends Serializable implements IValueHintsOverride {
     @serialize()
-    @validate({ nullable: true, max: 500 })
+    @validate({ nullable: true, max: 500, regExp: characterSets.din91379DatatypeC })
     public editHelp?: string;
 
     @serialize()
@@ -124,7 +125,7 @@ export class ValueHintsOverride extends Serializable implements IValueHintsOverr
     public values?: ValueHintsValue[];
 
     @serialize()
-    @validate({ nullable: true, allowedTypes: [PrimitiveType.Number, PrimitiveType.String, PrimitiveType.Boolean] })
+    @validate({ nullable: true, allowedTypes: [PrimitiveType.Number, PrimitiveType.String, PrimitiveType.Boolean], customValidator: validateDefaultValue })
     public defaultValue?: boolean | number | string;
 
     @serialize()
@@ -147,3 +148,11 @@ export class ValueHintsOverride extends Serializable implements IValueHintsOverr
         return json;
     }
 }
+
+function validateDefaultValue(defaultValue: string | number | boolean) {
+    if (typeof defaultValue === "string" && !characterSets.din91379DatatypeC.test(defaultValue)) {
+        return "Value does not match regular expression /^([\\u0009-\\u000A]|\\u000D|[ -~]|[ -¬]|[®-ž]|[Ƈ-ƈ]|Ə|Ɨ|[Ơ-ơ]|[Ư-ư]|Ʒ|[Ǎ-ǜ]|[Ǟ-ǟ]|[Ǣ-ǰ]|[Ǵ-ǵ]|[Ǹ-ǿ]|[Ȓ-ȓ]|[Ș-ț]|[Ȟ-ȟ]|[ȧ-ȳ]|ə|ɨ|ʒ|[ʹ-ʺ]|[ʾ-ʿ]|ˈ|ˌ|[Ḃ-ḃ]|[Ḇ-ḇ]|[Ḋ-ḑ]|ḗ|[Ḝ-ḫ]|[ḯ-ḷ]|[Ḻ-ḻ]|[Ṁ-ṉ]|[Ṓ-ṛ]|[Ṟ-ṣ]|[Ṫ-ṯ]|[Ẁ-ẇ]|[Ẍ-ẗ]|ẞ|[Ạ-ỹ]|’|‡|€|A̋|C(̀|̄|̆|̈|̕|̣|̦|̨̆)|D̂|F(̀|̄)|G̀|H(̄|̦|̱)|J(́|̌)|K(̀|̂|̄|̇|̕|̛|̦|͟H|͟h)|L(̂|̥|̥̄|̦)|M(̀|̂|̆|̐)|N(̂|̄|̆|̦)|P(̀|̄|̕|̣)|R(̆|̥|̥̄)|S(̀|̄|̛̄|̱)|T(̀|̄|̈|̕|̛)|U̇|Z(̀|̄|̆|̈|̧)|a̋|c(̀|̄|̆|̈|̕|̣|̦|̨̆)|d̂|f(̀|̄)|g̀|h(̄|̦)|j́|k(̀|̂|̄|̇|̕|̛|̦|͟h)|l(̂|̥|̥̄|̦)|m(̀|̂|̆|̐)|n(̂|̄|̆|̦)|p(̀|̄|̕|̣)|r(̆|̥|̥̄)|s(̀|̄|̛̄|̱)|t(̀|̄|̕|̛)|u̇|z(̀|̄|̆|̈|̧)|Ç̆|Û̄|ç̆|û̄|ÿ́|Č(̕|̣)|č(̕|̣)|ē̍|Ī́|ī́|ō̍|Ž(̦|̧)|ž(̦|̧)|Ḳ̄|ḳ̄|Ṣ̄|ṣ̄|Ṭ̄|ṭ̄|Ạ̈|ạ̈|Ọ̈|ọ̈|Ụ(̄|̈)|ụ(̄|̈))*$/";
+    }
+
+    return undefined;
+}

packages/content/src/attributes/hints/ValueHintsValue.ts

@@ -1,4 +1,5 @@
 import { ISerializable, PrimitiveType, Serializable, serialize, type, validate } from "@js-soft/ts-serval";
+import { characterSets } from "../constants/CharacterSets";
 
 export interface ValueHintsValueJSON {
     key: string | number | boolean;
@@ -13,7 +14,7 @@ export interface IValueHintsValue extends ISerializable {
 @type("ValueHintsValue")
 export class ValueHintsValue extends Serializable implements IValueHintsValue {
     @serialize()
-    @validate({ max: 100 })
+    @validate({ max: 100, regExp: characterSets.din91379DatatypeC })
     public displayName: string;
 
     @validate({
@@ -28,8 +29,11 @@ export class ValueHintsValue extends Serializable implements IValueHintsValue {
     }
 
     private static validateKey(key: string | number | boolean) {
-        if (typeof key === "string" && key.length > 100) {
-            return "The maximum length of a key is 200 characters.";
+        if (typeof key === "string") {
+            if (key.length > 100) return "The maximum length of a key is 100 characters.";
+            if (!characterSets.din91379DatatypeC.test(key)) {
+                return "Value does not match regular expression /^([\\u0009-\\u000A]|\\u000D|[ -~]|[ -¬]|[®-ž]|[Ƈ-ƈ]|Ə|Ɨ|[Ơ-ơ]|[Ư-ư]|Ʒ|[Ǎ-ǜ]|[Ǟ-ǟ]|[Ǣ-ǰ]|[Ǵ-ǵ]|[Ǹ-ǿ]|[Ȓ-ȓ]|[Ș-ț]|[Ȟ-ȟ]|[ȧ-ȳ]|ə|ɨ|ʒ|[ʹ-ʺ]|[ʾ-ʿ]|ˈ|ˌ|[Ḃ-ḃ]|[Ḇ-ḇ]|[Ḋ-ḑ]|ḗ|[Ḝ-ḫ]|[ḯ-ḷ]|[Ḻ-ḻ]|[Ṁ-ṉ]|[Ṓ-ṛ]|[Ṟ-ṣ]|[Ṫ-ṯ]|[Ẁ-ẇ]|[Ẍ-ẗ]|ẞ|[Ạ-ỹ]|’|‡|€|A̋|C(̀|̄|̆|̈|̕|̣|̦|̨̆)|D̂|F(̀|̄)|G̀|H(̄|̦|̱)|J(́|̌)|K(̀|̂|̄|̇|̕|̛|̦|͟H|͟h)|L(̂|̥|̥̄|̦)|M(̀|̂|̆|̐)|N(̂|̄|̆|̦)|P(̀|̄|̕|̣)|R(̆|̥|̥̄)|S(̀|̄|̛̄|̱)|T(̀|̄|̈|̕|̛)|U̇|Z(̀|̄|̆|̈|̧)|a̋|c(̀|̄|̆|̈|̕|̣|̦|̨̆)|d̂|f(̀|̄)|g̀|h(̄|̦)|j́|k(̀|̂|̄|̇|̕|̛|̦|͟h)|l(̂|̥|̥̄|̦)|m(̀|̂|̆|̐)|n(̂|̄|̆|̦)|p(̀|̄|̕|̣)|r(̆|̥|̥̄)|s(̀|̄|̛̄|̱)|t(̀|̄|̕|̛)|u̇|z(̀|̄|̆|̈|̧)|Ç̆|Û̄|ç̆|û̄|ÿ́|Č(̕|̣)|č(̕|̣)|ē̍|Ī́|ī́|ō̍|Ž(̦|̧)|ž(̦|̧)|Ḳ̄|ḳ̄|Ṣ̄|ṣ̄|Ṭ̄|ṭ̄|Ạ̈|ạ̈|Ọ̈|ọ̈|Ụ(̄|̈)|ụ(̄|̈))*$/";
+            }
         }
 
         return undefined;

packages/content/src/attributes/types/AbstractString.ts

@@ -1,5 +1,6 @@
 import { serialize, validate } from "@js-soft/ts-serval";
 import { AbstractAttributeValue, AbstractAttributeValueJSON, IAbstractAttributeValue } from "../AbstractAttributeValue";
+import { characterSets } from "../constants/CharacterSets";
 import { RenderHints, RenderHintsEditType, RenderHintsTechnicalType, ValueHints } from "../hints";
 
 export interface AbstractStringJSON extends AbstractAttributeValueJSON {
@@ -12,7 +13,7 @@ export interface IAbstractString extends IAbstractAttributeValue {
 
 export class AbstractString extends AbstractAttributeValue implements IAbstractString {
     @serialize()
-    @validate({ max: 100 })
+    @validate({ max: 100, regExp: characterSets.din91379DatatypeC })
     public value: string;
 
     public static override preFrom(value: any): any {
@@ -26,7 +27,8 @@ export class AbstractString extends AbstractAttributeValue implements IAbstractS
 
     public static get valueHints(): ValueHints {
         return ValueHints.from({
-            max: 100
+            max: 100,
+            pattern: characterSets.din91379DatatypeC.toString().slice(1, -1).replaceAll("/", "\\/")
         });
     }
 

packages/content/src/attributes/types/address/AbstractAddress.ts

@@ -1,6 +1,7 @@
 import { serialize, validate } from "@js-soft/ts-serval";
 import { nameof } from "ts-simple-nameof";
 import { AbstractComplexValue, AbstractComplexValueJSON, IAbstractComplexValue } from "../../AbstractComplexValue";
+import { characterSets } from "../../constants/CharacterSets";
 import { RenderHints, RenderHintsEditType, RenderHintsTechnicalType, ValueHints } from "../../hints";
 
 export interface AbstractAddressJSON extends AbstractComplexValueJSON {
@@ -13,13 +14,15 @@ export interface IAbstractAddress extends IAbstractComplexValue {
 
 export abstract class AbstractAddress extends AbstractComplexValue implements IAbstractAddress {
     @serialize()
-    @validate({ max: 100 })
+    @validate({ max: 100, regExp: characterSets.din91379DatatypeB })
     public recipient: string;
 
     public static get valueHints(): ValueHints {
         return ValueHints.from({
             propertyHints: {
-                [nameof<AbstractAddress>((a) => a.recipient)]: ValueHints.from({})
+                [nameof<AbstractAddress>((a) => a.recipient)]: ValueHints.from({
+                    pattern: characterSets.din91379DatatypeB.toString().slice(1, -1).replaceAll("/", "\\/")
+                })
             }
         });
     }

packages/content/src/attributes/types/address/City.ts

@@ -1,5 +1,6 @@
 import { type } from "@js-soft/ts-serval";
-import { AbstractString, AbstractStringJSON, IAbstractString } from "../AbstractString";
+import { AbstractStringJSON, IAbstractString } from "../AbstractString";
+import { AbstractName } from "../strings/AbstractName";
 
 export interface CityJSON extends AbstractStringJSON {
     "@type": "City";
@@ -8,7 +9,7 @@ export interface CityJSON extends AbstractStringJSON {
 export interface ICity extends IAbstractString {}
 
 @type("City")
-export class City extends AbstractString implements ICity {
+export class City extends AbstractName implements ICity {
     public static from(value: ICity | Omit<CityJSON, "@type"> | string): City {
         return this.fromAny(value);
     }

packages/content/src/attributes/types/address/DeliveryBoxAddress.ts

@@ -2,6 +2,7 @@ import { serialize, type, validate } from "@js-soft/ts-serval";
 import { nameof } from "ts-simple-nameof";
 import { AbstractAttributeValue } from "../../AbstractAttributeValue";
 import { COUNTRIES_ALPHA2_TO_ENGLISH_NAME } from "../../constants";
+import { characterSets } from "../../constants/CharacterSets";
 import { RenderHints, RenderHintsEditType, RenderHintsTechnicalType, ValueHints } from "../../hints";
 import { IPhoneNumber, PhoneNumber } from "../communication";
 import { AbstractAddress, AbstractAddressJSON, IAbstractAddress } from "./AbstractAddress";
@@ -34,11 +35,11 @@ export interface IDeliveryBoxAddress extends IAbstractAddress {
 @type("DeliveryBoxAddress")
 export class DeliveryBoxAddress extends AbstractAddress implements IDeliveryBoxAddress {
     @serialize()
-    @validate({ max: 100 })
+    @validate({ max: 100, regExp: characterSets.din91379DatatypeB })
     public userId: string;
 
     @serialize()
-    @validate({ max: 100 })
+    @validate({ max: 100, regExp: characterSets.din91379DatatypeB })
     public deliveryBoxId: string;
 
     @serialize({ customGenerator: AbstractAttributeValue.valueGenerator })
@@ -64,8 +65,8 @@ export class DeliveryBoxAddress extends AbstractAddress implements IDeliveryBoxA
     public static override get valueHints(): ValueHints {
         return super.valueHints.copyWith({
             propertyHints: {
-                [nameof<DeliveryBoxAddress>((d) => d.userId)]: ValueHints.from({}),
-                [nameof<DeliveryBoxAddress>((d) => d.deliveryBoxId)]: ValueHints.from({}),
+                [nameof<DeliveryBoxAddress>((d) => d.userId)]: ValueHints.from({ pattern: characterSets.din91379DatatypeB.toString().slice(1, -1).replaceAll("/", "\\/") }),
+                [nameof<DeliveryBoxAddress>((d) => d.deliveryBoxId)]: ValueHints.from({ pattern: characterSets.din91379DatatypeB.toString().slice(1, -1).replaceAll("/", "\\/") }),
                 [nameof<DeliveryBoxAddress>((d) => d.zipCode)]: ZipCode.valueHints,
                 [nameof<DeliveryBoxAddress>((d) => d.city)]: City.valueHints,
                 [nameof<DeliveryBoxAddress>((d) => d.country)]: Country.valueHints,

packages/content/src/attributes/types/address/HouseNumber.ts

@@ -1,5 +1,6 @@
 import { type } from "@js-soft/ts-serval";
-import { AbstractString, AbstractStringJSON, IAbstractString } from "../AbstractString";
+import { AbstractStringJSON, IAbstractString } from "../AbstractString";
+import { AbstractName } from "../strings/AbstractName";
 
 export interface HouseNumberJSON extends AbstractStringJSON {
     "@type": "HouseNumber";
@@ -8,7 +9,7 @@ export interface HouseNumberJSON extends AbstractStringJSON {
 export interface IHouseNumber extends IAbstractString {}
 
 @type("HouseNumber")
-export class HouseNumber extends AbstractString implements IHouseNumber {
+export class HouseNumber extends AbstractName implements IHouseNumber {
     public static from(value: IHouseNumber | Omit<HouseNumberJSON, "@type"> | string): HouseNumber {
         return this.fromAny(value);
     }