@aemforms/af-core 0.22.153 → 0.22.155

package/esm/afb-runtime.js

@@ -1037,6 +1037,13 @@ const replaceTemplatePlaceholders = (str, values = []) => {
         return typeof replacement !== 'undefined' ? replacement : match;
     });
 };
+const sanitizeName = (name) => {
+    const nameRegex = /^[A-Za-z_$][A-Za-z0-9_.]*$/;
+    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-]+)*$/;
@@ -1936,7 +1943,8 @@ class Scriptable extends BaseNode {
                 try {
                     let updatedRule = eString;
                     if (this.fragment !== '$form') {
-                        updatedRule = eString.replaceAll('$form', this.fragment);
+                        const sanitizedFragment = sanitizeName(this.fragment);
+                        updatedRule = eString.replaceAll('$form', sanitizedFragment);
                     }
                     this._rules[eName] = this.ruleEngine.compileRule(updatedRule, this.lang);
                 }
@@ -1961,7 +1969,8 @@ class Scriptable extends BaseNode {
                     try {
                         let updatedExpr = x;
                         if (this.fragment !== '$form') {
-                            updatedExpr = x.replaceAll('$form', this.fragment);
+                            const sanitizedFragment = sanitizeName(this.fragment);
+                            updatedExpr = x.replaceAll('$form', sanitizedFragment);
                         }
                         return this.ruleEngine.compileRule(updatedExpr, this.lang);
                     }
@@ -3257,13 +3266,17 @@ class FunctionRuntimeImpl {
             getData: {
                 _func: (args, data, interpreter) => {
                     interpreter.globals.form.logger.warn('The `getData` function is depricated. Use `exportData` instead.');
-                    return interpreter.globals.form.exportData();
+                    return interpreter.globals.form.withDependencyTrackingControl(true, () => {
+                        return interpreter.globals.form.exportData();
+                    });
                 },
                 _signature: []
             },
             exportData: {
                 _func: (args, data, interpreter) => {
-                    return interpreter.globals.form.exportData();
+                    return interpreter.globals.form.withDependencyTrackingControl(true, () => {
+                        return interpreter.globals.form.exportData();
+                    });
                 },
                 _signature: []
             },

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

@@ -5,7 +5,7 @@ export * from './utils/TranslationUtils';
 export * from './utils/JsonUtils';
 export * from './utils/SchemaUtils';
 export * from './Constant';
-import { getFileSizeInBytes, extractFileInfo, isEmpty, readAttachments } from './utils/FormUtils';
+import { getFileSizeInBytes, extractFileInfo, isEmpty, readAttachments, sanitizeName } from './utils/FormUtils';
 import { BaseNode } from './BaseNode';
 import Checkbox from './Checkbox';
 import CheckboxGroup from './CheckboxGroup';
@@ -22,4 +22,4 @@ import Node from './Node';
 import Scriptable from './Scriptable';
 import Form from './Form';
 import { FunctionRuntime, request } from './rules/FunctionRuntime';
-export { Form, BaseNode, Checkbox, CheckboxGroup, Container, Field, Fieldset, FileObject, FileUpload, FormMetaData, Node, Scriptable, getFileSizeInBytes, extractFileInfo, readAttachments, FunctionRuntime, request, isEmpty, SubmitMetaData, EmailInput, Captcha };
+export { Form, BaseNode, Checkbox, CheckboxGroup, Container, Field, Fieldset, FileObject, FileUpload, FormMetaData, Node, Scriptable, getFileSizeInBytes, extractFileInfo, readAttachments, FunctionRuntime, request, isEmpty, SubmitMetaData, EmailInput, Captcha, sanitizeName };

package/esm/types/src/utils/FormUtils.d.ts

@@ -13,3 +13,4 @@ export declare const dataURItoBlob: (dataURI: string) => {
 } | null;
 export declare const sitesModelToFormModel: (sitesModel: any) => any;
 export declare const replaceTemplatePlaceholders: (str: string, values?: any[]) => string;
+export declare const sanitizeName: (name: string) => string;

package/lib/Scriptable.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const BaseNode_1 = require("./BaseNode");
+const FormUtils_1 = require("./utils/FormUtils");
 class Scriptable extends BaseNode_1.BaseNode {
     constructor() {
         super(...arguments);
@@ -17,7 +18,8 @@ class Scriptable extends BaseNode_1.BaseNode {
                 try {
                     let updatedRule = eString;
                     if (this.fragment !== '$form') {
-                        updatedRule = eString.replaceAll('$form', this.fragment);
+                        const sanitizedFragment = (0, FormUtils_1.sanitizeName)(this.fragment);
+                        updatedRule = eString.replaceAll('$form', sanitizedFragment);
                     }
                     this._rules[eName] = this.ruleEngine.compileRule(updatedRule, this.lang);
                 }
@@ -43,7 +45,8 @@ class Scriptable extends BaseNode_1.BaseNode {
                     try {
                         let updatedExpr = x;
                         if (this.fragment !== '$form') {
-                            updatedExpr = x.replaceAll('$form', this.fragment);
+                            const sanitizedFragment = (0, FormUtils_1.sanitizeName)(this.fragment);
+                            updatedExpr = x.replaceAll('$form', sanitizedFragment);
                         }
                         return this.ruleEngine.compileRule(updatedExpr, this.lang);
                     }

package/lib/index.d.ts

@@ -5,7 +5,7 @@ export * from './utils/TranslationUtils';
 export * from './utils/JsonUtils';
 export * from './utils/SchemaUtils';
 export * from './Constant';
-import { getFileSizeInBytes, extractFileInfo, isEmpty, readAttachments } from './utils/FormUtils';
+import { getFileSizeInBytes, extractFileInfo, isEmpty, readAttachments, sanitizeName } from './utils/FormUtils';
 import { BaseNode } from './BaseNode';
 import Checkbox from './Checkbox';
 import CheckboxGroup from './CheckboxGroup';
@@ -22,4 +22,4 @@ import Node from './Node';
 import Scriptable from './Scriptable';
 import Form from './Form';
 import { FunctionRuntime, request } from './rules/FunctionRuntime';
-export { Form, BaseNode, Checkbox, CheckboxGroup, Container, Field, Fieldset, FileObject, FileUpload, FormMetaData, Node, Scriptable, getFileSizeInBytes, extractFileInfo, readAttachments, FunctionRuntime, request, isEmpty, SubmitMetaData, EmailInput, Captcha };
+export { Form, BaseNode, Checkbox, CheckboxGroup, Container, Field, Fieldset, FileObject, FileUpload, FormMetaData, Node, Scriptable, getFileSizeInBytes, extractFileInfo, readAttachments, FunctionRuntime, request, isEmpty, SubmitMetaData, EmailInput, Captcha, sanitizeName };

package/lib/index.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Captcha = exports.EmailInput = exports.SubmitMetaData = exports.isEmpty = exports.request = exports.FunctionRuntime = exports.readAttachments = exports.extractFileInfo = exports.getFileSizeInBytes = exports.Scriptable = exports.Node = exports.FormMetaData = exports.FileUpload = exports.FileObject = exports.Fieldset = exports.Field = exports.Container = exports.CheckboxGroup = exports.Checkbox = exports.BaseNode = exports.Form = void 0;
+exports.sanitizeName = exports.Captcha = exports.EmailInput = exports.SubmitMetaData = exports.isEmpty = exports.request = exports.FunctionRuntime = exports.readAttachments = exports.extractFileInfo = exports.getFileSizeInBytes = exports.Scriptable = exports.Node = exports.FormMetaData = exports.FileUpload = exports.FileObject = exports.Fieldset = exports.Field = exports.Container = exports.CheckboxGroup = exports.Checkbox = exports.BaseNode = exports.Form = void 0;
 __exportStar(require("./FormInstance"), exports);
 __exportStar(require("./types/index"), exports);
 __exportStar(require("./controller/Events"), exports);
@@ -30,6 +30,7 @@ Object.defineProperty(exports, "getFileSizeInBytes", { enumerable: true, get: fu
 Object.defineProperty(exports, "extractFileInfo", { enumerable: true, get: function () { return FormUtils_1.extractFileInfo; } });
 Object.defineProperty(exports, "isEmpty", { enumerable: true, get: function () { return FormUtils_1.isEmpty; } });
 Object.defineProperty(exports, "readAttachments", { enumerable: true, get: function () { return FormUtils_1.readAttachments; } });
+Object.defineProperty(exports, "sanitizeName", { enumerable: true, get: function () { return FormUtils_1.sanitizeName; } });
 const BaseNode_1 = require("./BaseNode");
 Object.defineProperty(exports, "BaseNode", { enumerable: true, get: function () { return BaseNode_1.BaseNode; } });
 const Checkbox_1 = __importDefault(require("./Checkbox"));

package/lib/rules/FunctionRuntime.js

@@ -408,13 +408,17 @@ class FunctionRuntimeImpl {
             getData: {
                 _func: (args, data, interpreter) => {
                     interpreter.globals.form.logger.warn('The `getData` function is depricated. Use `exportData` instead.');
-                    return interpreter.globals.form.exportData();
+                    return interpreter.globals.form.withDependencyTrackingControl(true, () => {
+                        return interpreter.globals.form.exportData();
+                    });
                 },
                 _signature: []
             },
             exportData: {
                 _func: (args, data, interpreter) => {
-                    return interpreter.globals.form.exportData();
+                    return interpreter.globals.form.withDependencyTrackingControl(true, () => {
+                        return interpreter.globals.form.exportData();
+                    });
                 },
                 _signature: []
             },

package/lib/utils/FormUtils.d.ts

@@ -13,3 +13,4 @@ export declare const dataURItoBlob: (dataURI: string) => {
 } | null;
 export declare const sitesModelToFormModel: (sitesModel: any) => any;
 export declare const replaceTemplatePlaceholders: (str: string, values?: any[]) => string;
+export declare const sanitizeName: (name: string) => string;

package/lib/utils/FormUtils.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.replaceTemplatePlaceholders = exports.sitesModelToFormModel = exports.dataURItoBlob = exports.extractFileInfo = exports.isDataUrl = exports.IdGenerator = exports.getFileSizeInBytes = exports.getAttachments = exports.readAttachments = exports.isEmpty = exports.randomWord = void 0;
+exports.sanitizeName = exports.replaceTemplatePlaceholders = exports.sitesModelToFormModel = exports.dataURItoBlob = exports.extractFileInfo = exports.isDataUrl = exports.IdGenerator = exports.getFileSizeInBytes = exports.getAttachments = exports.readAttachments = exports.isEmpty = exports.randomWord = void 0;
 const JsonUtils_1 = require("./JsonUtils");
 const FileObject_1 = require("../FileObject");
 const chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_'.split('');
@@ -285,3 +285,11 @@ const replaceTemplatePlaceholders = (str, values = []) => {
     });
 };
 exports.replaceTemplatePlaceholders = replaceTemplatePlaceholders;
+const sanitizeName = (name) => {
+    const nameRegex = /^[A-Za-z_$][A-Za-z0-9_.]*$/;
+    if (!nameRegex.test(name)) {
+        return `"${name}"`;
+    }
+    return name;
+};
+exports.sanitizeName = sanitizeName;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aemforms/af-core",
-  "version": "0.22.153",
+  "version": "0.22.155",
   "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.153"
+    "@aemforms/af-formatters": "^0.22.155"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.20.2",