@aemforms/af-core 0.22.169 → 0.22.171

package/esm/afb-runtime.js

@@ -1037,34 +1037,6 @@ const replaceTemplatePlaceholders = (str, values = []) => {
         return typeof replacement !== 'undefined' ? replacement : match;
     });
 };
-const sanitizeName = (name) => {
-    const nameRegex = /^[A-Za-z0-9_$][A-Za-z0-9_.[\]]*$/;
-    if (name.includes('.')) {
-        const parts = name.split('.');
-        const sanitizedParts = parts.map((part) => {
-            if (part.includes('[')) {
-                const bracketIndex = part.indexOf('[');
-                const namePart = part.substring(0, bracketIndex);
-                const bracketPart = part.substring(bracketIndex);
-                if (!nameRegex.test(namePart)) {
-                    return `"${namePart}"${bracketPart}`;
-                }
-                return part;
-            }
-            else {
-                if (!nameRegex.test(part)) {
-                    return `"${part}"`;
-                }
-                return part;
-            }
-        });
-        return sanitizedParts.join('.');
-    }
-    if (!nameRegex.test(name)) {
-        return `"${name}"`;
-    }
-    return name;
-};
 
 const dateRegex = /^(\d{4})-(\d{1,2})-(\d{1,2})$/;
 const emailRegex = /^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/;
@@ -1490,6 +1462,13 @@ class BaseNode {
     get fragment() {
         return this._fragment;
     }
+    getFragmentRuleNode() {
+        if (this.fragment === '$form') {
+            return this.form.getRuleNode();
+        }
+        const fragmentContainer = this.form.resolveQualifiedName(this.fragment);
+        return fragmentContainer?.getRuleNode() ?? this.form.getRuleNode();
+    }
     setupRuleNode() {
         const self = this;
         this._ruleNode = new Proxy(this.ruleNodeReference(), {
@@ -1984,8 +1963,7 @@ class Scriptable extends BaseNode {
                 let updatedRule = eString;
                 try {
                     if (this.fragment !== '$form') {
-                        const sanitizedFragment = sanitizeName(this.fragment);
-                        updatedRule = eString.replaceAll('$form', sanitizedFragment);
+                        updatedRule = eString.replaceAll('$form', '$fragment');
                     }
                     this._rules[eName] = this.ruleEngine.compileRule(updatedRule, this.lang);
                 }
@@ -2022,8 +2000,7 @@ class Scriptable extends BaseNode {
                     let updatedExpr = x;
                     try {
                         if (this.fragment !== '$form') {
-                            const sanitizedFragment = sanitizeName(this.fragment);
-                            updatedExpr = x.replaceAll('$form', sanitizedFragment);
+                            updatedExpr = x.replaceAll('$form', '$fragment');
                         }
                         return this.ruleEngine.compileRule(updatedExpr, this.lang);
                     }
@@ -2153,7 +2130,8 @@ class Scriptable extends BaseNode {
             'form': this.form,
             '$form': this.form.getRuleNode(),
             '$field': this.getRuleNode(),
-            'field': this
+            'field': this,
+            '$fragment': this.getFragmentRuleNode()
         };
         const node = this.ruleEngine.compileRule(expr, this.lang);
         return this.ruleEngine.execute(node, this.getExpressionScope(), ruleContext, false, expr);
@@ -2169,6 +2147,7 @@ class Scriptable extends BaseNode {
             '$form': this.form.getRuleNode(),
             '$field': this.getRuleNode(),
             'field': this,
+            '$fragment': this.getFragmentRuleNode(),
             '$event': {
                 type: action.type,
                 payload: action.payload,
@@ -3206,6 +3185,7 @@ class FunctionRuntimeImpl {
                             form: interpreter.globals.$form,
                             field: interpreter.globals.$field,
                             event: interpreter.globals.$event,
+                            $fragment: interpreter.globals.$fragment,
                             functions: {
                                 setProperty: (target, payload) => {
                                     const eventName = 'custom:setProperty';
@@ -4403,7 +4383,8 @@ class RuleEngine {
     _globalNames = [
         '$form',
         '$field',
-        '$event'
+        '$event',
+        '$fragment'
     ];
     customFunctions;
     debugInfo = [];

package/esm/types/src/BaseNode.d.ts

@@ -33,6 +33,7 @@ export declare abstract class BaseNode<T extends BaseJson> implements BaseModel
         mode?: 'create' | 'restore';
     });
     get fragment(): string;
+    protected getFragmentRuleNode(): any;
     abstract value: Primitives;
     abstract reset(): any;
     protected setupRuleNode(): void;

package/lib/BaseNode.d.ts

@@ -33,6 +33,7 @@ export declare abstract class BaseNode<T extends BaseJson> implements BaseModel
         mode?: 'create' | 'restore';
     });
     get fragment(): string;
+    protected getFragmentRuleNode(): any;
     abstract value: Primitives;
     abstract reset(): any;
     protected setupRuleNode(): void;

package/lib/BaseNode.js

@@ -149,6 +149,14 @@ class BaseNode {
     get fragment() {
         return this._fragment;
     }
+    getFragmentRuleNode() {
+        var _a;
+        if (this.fragment === '$form') {
+            return this.form.getRuleNode();
+        }
+        const fragmentContainer = this.form.resolveQualifiedName(this.fragment);
+        return (_a = fragmentContainer === null || fragmentContainer === void 0 ? void 0 : fragmentContainer.getRuleNode()) !== null && _a !== void 0 ? _a : this.form.getRuleNode();
+    }
     setupRuleNode() {
         const self = this;
         this._ruleNode = new Proxy(this.ruleNodeReference(), {

package/lib/Scriptable.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const BaseNode_1 = require("./BaseNode");
-const FormUtils_1 = require("./utils/FormUtils");
 const Events_1 = require("./controller/Events");
 class Scriptable extends BaseNode_1.BaseNode {
     constructor() {
@@ -19,8 +18,7 @@ class Scriptable extends BaseNode_1.BaseNode {
                 let updatedRule = eString;
                 try {
                     if (this.fragment !== '$form') {
-                        const sanitizedFragment = (0, FormUtils_1.sanitizeName)(this.fragment);
-                        updatedRule = eString.replaceAll('$form', sanitizedFragment);
+                        updatedRule = eString.replaceAll('$form', '$fragment');
                     }
                     this._rules[eName] = this.ruleEngine.compileRule(updatedRule, this.lang);
                 }
@@ -58,8 +56,7 @@ class Scriptable extends BaseNode_1.BaseNode {
                     let updatedExpr = x;
                     try {
                         if (this.fragment !== '$form') {
-                            const sanitizedFragment = (0, FormUtils_1.sanitizeName)(this.fragment);
-                            updatedExpr = x.replaceAll('$form', sanitizedFragment);
+                            updatedExpr = x.replaceAll('$form', '$fragment');
                         }
                         return this.ruleEngine.compileRule(updatedExpr, this.lang);
                     }
@@ -189,7 +186,8 @@ class Scriptable extends BaseNode_1.BaseNode {
             'form': this.form,
             '$form': this.form.getRuleNode(),
             '$field': this.getRuleNode(),
-            'field': this
+            'field': this,
+            '$fragment': this.getFragmentRuleNode()
         };
         const node = this.ruleEngine.compileRule(expr, this.lang);
         return this.ruleEngine.execute(node, this.getExpressionScope(), ruleContext, false, expr);
@@ -206,6 +204,7 @@ class Scriptable extends BaseNode_1.BaseNode {
             '$form': this.form.getRuleNode(),
             '$field': this.getRuleNode(),
             'field': this,
+            '$fragment': this.getFragmentRuleNode(),
             '$event': {
                 type: action.type,
                 payload: action.payload,

package/lib/rules/FunctionRuntime.js

@@ -265,6 +265,7 @@ class FunctionRuntimeImpl {
                             form: interpreter.globals.$form,
                             field: interpreter.globals.$field,
                             event: interpreter.globals.$event,
+                            $fragment: interpreter.globals.$fragment,
                             functions: {
                                 setProperty: (target, payload) => {
                                     const eventName = 'custom:setProperty';

package/lib/rules/RuleEngine.js

@@ -19,7 +19,8 @@ class RuleEngine {
         this._globalNames = [
             '$form',
             '$field',
-            '$event'
+            '$event',
+            '$fragment'
         ];
         this.debugInfo = [];
         this.dependencyTracking = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aemforms/af-core",
-  "version": "0.22.169",
+  "version": "0.22.171",
   "description": "Core Module for Forms Runtime",
   "author": "Adobe Systems",
   "license": "Adobe Proprietary",
@@ -37,7 +37,7 @@
   },
   "dependencies": {
     "@adobe/json-formula": "0.1.50",
-    "@aemforms/af-formatters": "^0.22.169"
+    "@aemforms/af-formatters": "^0.22.171"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.20.2",