@ng-forge/dynamic-forms 1.2.0-next.1 → 1.2.0-next.3

package/fesm2022/ng-forge-dynamic-forms-internal.mjs

@@ -295,7 +295,11 @@ function hasTargetProperty(config) {
 }
 
 const FORM_VALUE_ACCESS_PATTERN = /\bformValue\s*(?:\.|\[)/;
-const FORM_VALUE_PATTERN = /\bformValue\s*(?:\.([\w.]+)|\[\s*'([\w.-]+)'\s*\]|\[\s*"([\w.-]+)"\s*\])/g;
+const ID_START = String.raw `[\p{ID_Start}$_]`;
+const ID_PART = String.raw `[\p{ID_Continue}$]`;
+const DOTTED_PATH = String.raw `${ID_START}${ID_PART}*(?:\.${ID_START}${ID_PART}*)*`;
+const BRACKET_KEY = String.raw `[\p{ID_Continue}$.\-]+`;
+const FORM_VALUE_PATTERN = new RegExp(String.raw `\bformValue\s*(?:\.(${DOTTED_PATH})|\[\s*'(${BRACKET_KEY})'\s*\]|\[\s*"(${BRACKET_KEY})"\s*\])`, 'gu');
 function isCrossFieldExpression(expr, context) {
         if (expr === undefined || typeof expr === 'boolean' || isFormStateCondition(expr)) {
         return false;
@@ -576,6 +580,8 @@ class ExpressionParserError extends DynamicFormError {
     }
 }
 
+const IDENTIFIER_START = /[\p{ID_Start}$_]/u;
+const IDENTIFIER_PART = /[\p{ID_Continue}$]/u;
 class Tokenizer {
     position = 0;
     expression;
@@ -608,7 +614,7 @@ class Tokenizer {
                 if (/[0-9]/.test(char)) {
             return this.readNumber();
         }
-                if (/[a-zA-Z_$]/.test(char)) {
+                if (IDENTIFIER_START.test(this.codePointAt(this.position))) {
             return this.readIdentifierOrKeyword();
         }
                 return this.readOperatorOrPunctuation();
@@ -667,12 +673,20 @@ class Tokenizer {
     readIdentifierOrKeyword() {
         const start = this.position;
         let value = '';
-        while (this.position < this.expression.length && /[a-zA-Z0-9_$]/.test(this.expression[this.position])) {
-            value += this.expression[this.position];
-            this.position++;
+        while (this.position < this.expression.length) {
+            const char = this.codePointAt(this.position);
+            if (!IDENTIFIER_PART.test(char)) {
+                break;
+            }
+            value += char;
+            this.position += char.length;
         }
                 const type = this.getKeywordType(value);
         return { type, value, position: start };
+    }
+        codePointAt(position) {
+        const codePoint = this.expression.codePointAt(position);
+        return codePoint === undefined ? '' : String.fromCodePoint(codePoint);
     }
     getKeywordType(value) {
         switch (value) {
@@ -3545,14 +3559,13 @@ function setupInitializationTracking(options) {
     }), shareReplay({ bufferSize: 1, refCount: false }));
 }
 
+const PLACEHOLDER_PATTERN = /\{\{([^{}]*)\}\}/g;
 function interpolateParams(message, error) {
-    let result = message;
     const params = extractErrorParams(error);
-    Object.entries(params).forEach(([key, value]) => {
-        const placeholder = new RegExp(`{{\\s*${key}\\s*}}`, 'g');
-        result = result.replace(placeholder, safeToString(value));
+                return message.replace(PLACEHOLDER_PATTERN, (placeholder, rawKey) => {
+        const key = rawKey.trim();
+        return Object.hasOwn(params, key) ? safeToString(params[key]) : placeholder;
     });
-    return result;
 }
 function safeToString(value) {
     if (value === null || value === undefined) {