@aemforms/af-core 0.22.144 → 0.22.146

package/esm/afb-runtime.js

@@ -793,7 +793,7 @@ const processItem = (item, excludeUnbound, isAsync) => {
                 ? item.dataRef
                 : (name.length > 0 ? item.name : undefined);
             if (item.value instanceof Array) {
-                if (item.type === 'string[]') {
+                if (item.type === 'string[]' && item?.format === 'data-url') {
                     if (isAsync) {
                         return item.serialize().then(serializedFiles => {
                             ret[item.id] = serializedFiles.map((x) => {
@@ -815,7 +815,7 @@ const processItem = (item, excludeUnbound, isAsync) => {
                 }
             }
             else if (item.value != null) {
-                if (item.type === 'string') {
+                if (item.type === 'string' && item?.format === 'data-url') {
                     if (isAsync) {
                         return item.serialize().then(serializedFile => {
                             ret[item.id] = { ...serializedFile[0], 'dataRef': dataRef };
@@ -1606,7 +1606,14 @@ class BaseNode {
         };
     }
     _addDependent(dependent, propertyName) {
-        if (this._dependents.find(({ node }) => node === dependent) === undefined) {
+        const existingDependency = this._dependents.find(({ node, propertyName: existingProp }) => {
+            let isExistingDependent = node === dependent;
+            if (isExistingDependent && propertyName && propertyName.startsWith('properties.')) {
+                isExistingDependent = existingProp === propertyName;
+            }
+            return isExistingDependent;
+        });
+        if (existingDependency === undefined) {
             const subscription = this.subscribe((change) => {
                 const changes = change.payload.changes;
                 const propsToLook = [...dynamicProps, 'items'];
@@ -1694,7 +1701,9 @@ class BaseNode {
             }
             notifyChildren.call(this, changeAction);
             if (validationConstraintsList.includes(prop)) {
-                this.validate();
+                if (this.hasValueBeenSet === undefined || this.hasValueBeenSet) {
+                    this.validate();
+                }
             }
             return changeAction.payload.changes;
         }
@@ -1747,10 +1756,16 @@ class BaseNode {
                 if (key !== '') {
                     const create = this.defaultDataModel(key);
                     if (create !== undefined) {
-                        _data = contextualDataModel.$getDataNode(key);
-                        if (_data === undefined) {
-                            _data = create;
-                            contextualDataModel.$addDataNode(key, _data);
+                        if (typeof contextualDataModel.$getDataNode === 'function') {
+                            _data = contextualDataModel.$getDataNode(key);
+                            if (_data === undefined) {
+                                _data = create;
+                                contextualDataModel.$addDataNode(key, _data);
+                            }
+                        }
+                        else {
+                            console.error(`$getDataNode method is undefined for "${name}" with dataModel type "${contextualDataModel.$type}"`);
+                            _data = undefined;
                         }
                     }
                 }
@@ -2525,7 +2540,7 @@ class Container extends Scriptable {
                 activeChild.activeChild = null;
                 activeChild = temp;
             }
-            const change = propertyChange('activeChild', c, this._activeChild);
+            const change = propertyChange('activeChild', c?.getState(), this._activeChild?.getState());
             this._activeChild = c;
             if (this.parent && c !== null) {
                 this.parent.activeChild = this;
@@ -3546,7 +3561,7 @@ class FunctionRuntimeImpl {
                         return '';
                     }
                     if (interpreter.globals.form?.properties?.queryParams?.[param]) {
-                        return interpreter.globals.form.properties.queryParams[param];
+                        return interpreter.globals.form.properties.queryParams[param.toLowerCase()];
                     }
                     try {
                         const urlParams = new URLSearchParams(window?.location?.search || '');
@@ -4248,6 +4263,11 @@ __decorate([
 
 const validTypes = ['string', 'number', 'integer', 'boolean', 'file', 'string[]', 'number[]', 'integer[]', 'boolean[]', 'file[]', 'array', 'object'];
 class Field extends Scriptable {
+    _ruleNodeReference = [];
+    _hasValueBeenSet = false;
+    get hasValueBeenSet() {
+        return this._hasValueBeenSet;
+    }
     constructor(params, _options) {
         super(params, _options);
         if (_options.mode !== 'restore') {
@@ -4261,7 +4281,6 @@ class Field extends Scriptable {
             }
         }
     }
-    _ruleNodeReference = [];
     _initialize() {
         super._initialize();
         this.setupRuleNode();
@@ -4376,7 +4395,12 @@ class Field extends Scriptable {
         }
         const props = ['minimum', 'maximum', 'exclusiveMinimum', 'exclusiveMaximum'];
         if (this._jsonModel.type !== 'string') {
-            this.unset('format', 'pattern', 'minLength', 'maxLength');
+            if (this._jsonModel.fieldType === 'file-input') {
+                this.unset('pattern', 'minLength', 'maxLength');
+            }
+            else {
+                this.unset('format', 'pattern', 'minLength', 'maxLength');
+            }
         }
         else if (this._jsonModel.fieldType === 'date-input') {
             this._jsonModel.format = 'date';
@@ -4565,6 +4589,7 @@ class Field extends Scriptable {
         const typeRes = Constraints.type(this.getInternalType() || 'string', val);
         const changes = this._setProperty('value', typeRes.value, false);
         if (changes.length > 0) {
+            this._hasValueBeenSet = true;
             this._updateRuleNodeReference(typeRes.value);
             if (typeof dataNode !== 'undefined') {
                 dataNode.setValue(this.getDataNodeValue(this._jsonModel.value), this._jsonModel.value, this);
@@ -4777,9 +4802,6 @@ class Field extends Scriptable {
                     case 'date-input':
                         this._jsonModel.format = 'date';
                         break;
-                    case 'file-input':
-                        this._jsonModel.format = 'data-url';
-                        break;
                     case 'date-time':
                         this._jsonModel.format = 'date-time';
                         break;

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

@@ -3,12 +3,14 @@ import Scriptable from './Scriptable';
 import DataValue from './data/DataValue';
 declare class Field extends Scriptable<FieldJson> implements FieldModel {
     #private;
+    private _ruleNodeReference;
+    protected _hasValueBeenSet: boolean;
+    protected get hasValueBeenSet(): boolean;
     constructor(params: FieldJson, _options: {
         form: FormModel;
         parent: ContainerModel;
         mode?: 'create' | 'restore';
     });
-    private _ruleNodeReference;
     _initialize(): any;
     ruleNodeReference(): any;
     protected _getDefaults(): {

package/lib/BaseNode.js

@@ -304,7 +304,14 @@ class BaseNode {
         };
     }
     _addDependent(dependent, propertyName) {
-        if (this._dependents.find(({ node }) => node === dependent) === undefined) {
+        const existingDependency = this._dependents.find(({ node, propertyName: existingProp }) => {
+            let isExistingDependent = node === dependent;
+            if (isExistingDependent && propertyName && propertyName.startsWith('properties.')) {
+                isExistingDependent = existingProp === propertyName;
+            }
+            return isExistingDependent;
+        });
+        if (existingDependency === undefined) {
             const subscription = this.subscribe((change) => {
                 const changes = change.payload.changes;
                 const propsToLook = [...exports.dynamicProps, 'items'];
@@ -392,7 +399,9 @@ class BaseNode {
             }
             notifyChildren.call(this, changeAction);
             if (ValidationUtils_1.validationConstraintsList.includes(prop)) {
-                this.validate();
+                if (this.hasValueBeenSet === undefined || this.hasValueBeenSet) {
+                    this.validate();
+                }
             }
             return changeAction.payload.changes;
         }
@@ -445,10 +454,16 @@ class BaseNode {
                 if (key !== '') {
                     const create = this.defaultDataModel(key);
                     if (create !== undefined) {
-                        _data = contextualDataModel.$getDataNode(key);
-                        if (_data === undefined) {
-                            _data = create;
-                            contextualDataModel.$addDataNode(key, _data);
+                        if (typeof contextualDataModel.$getDataNode === 'function') {
+                            _data = contextualDataModel.$getDataNode(key);
+                            if (_data === undefined) {
+                                _data = create;
+                                contextualDataModel.$addDataNode(key, _data);
+                            }
+                        }
+                        else {
+                            console.error(`$getDataNode method is undefined for "${name}" with dataModel type "${contextualDataModel.$type}"`);
+                            _data = undefined;
                         }
                     }
                 }

package/lib/Container.js

@@ -422,6 +422,7 @@ class Container extends Scriptable_1.default {
         return this._activeChild;
     }
     set activeChild(c) {
+        var _a;
         if (c !== this._activeChild) {
             let activeChild = this._activeChild;
             while (activeChild instanceof Container) {
@@ -429,7 +430,7 @@ class Container extends Scriptable_1.default {
                 activeChild.activeChild = null;
                 activeChild = temp;
             }
-            const change = (0, Events_1.propertyChange)('activeChild', c, this._activeChild);
+            const change = (0, Events_1.propertyChange)('activeChild', c === null || c === void 0 ? void 0 : c.getState(), (_a = this._activeChild) === null || _a === void 0 ? void 0 : _a.getState());
             this._activeChild = c;
             if (this.parent && c !== null) {
                 this.parent.activeChild = this;

package/lib/Field.d.ts

@@ -3,12 +3,14 @@ import Scriptable from './Scriptable';
 import DataValue from './data/DataValue';
 declare class Field extends Scriptable<FieldJson> implements FieldModel {
     #private;
+    private _ruleNodeReference;
+    protected _hasValueBeenSet: boolean;
+    protected get hasValueBeenSet(): boolean;
     constructor(params: FieldJson, _options: {
         form: FormModel;
         parent: ContainerModel;
         mode?: 'create' | 'restore';
     });
-    private _ruleNodeReference;
     _initialize(): any;
     ruleNodeReference(): any;
     protected _getDefaults(): {

package/lib/Field.js

@@ -31,6 +31,7 @@ class Field extends Scriptable_1.default {
         super(params, _options);
         _Field_instances.add(this);
         this._ruleNodeReference = [];
+        this._hasValueBeenSet = false;
         if (_options.mode !== 'restore') {
             this._applyDefaults();
             this.queueEvent(new Events_1.Initialize());
@@ -42,6 +43,9 @@ class Field extends Scriptable_1.default {
             }
         }
     }
+    get hasValueBeenSet() {
+        return this._hasValueBeenSet;
+    }
     _initialize() {
         super._initialize();
         this.setupRuleNode();
@@ -158,7 +162,12 @@ class Field extends Scriptable_1.default {
         }
         const props = ['minimum', 'maximum', 'exclusiveMinimum', 'exclusiveMaximum'];
         if (this._jsonModel.type !== 'string') {
-            this.unset('format', 'pattern', 'minLength', 'maxLength');
+            if (this._jsonModel.fieldType === 'file-input') {
+                this.unset('pattern', 'minLength', 'maxLength');
+            }
+            else {
+                this.unset('format', 'pattern', 'minLength', 'maxLength');
+            }
         }
         else if (this._jsonModel.fieldType === 'date-input') {
             this._jsonModel.format = 'date';
@@ -347,6 +356,7 @@ class Field extends Scriptable_1.default {
         const typeRes = Constraints.type(this.getInternalType() || 'string', val);
         const changes = this._setProperty('value', typeRes.value, false);
         if (changes.length > 0) {
+            this._hasValueBeenSet = true;
             this._updateRuleNodeReference(typeRes.value);
             if (typeof dataNode !== 'undefined') {
                 dataNode.setValue(this.getDataNodeValue(this._jsonModel.value), this._jsonModel.value, this);
@@ -559,9 +569,6 @@ class Field extends Scriptable_1.default {
                     case 'date-input':
                         this._jsonModel.format = 'date';
                         break;
-                    case 'file-input':
-                        this._jsonModel.format = 'data-url';
-                        break;
                     case 'date-time':
                         this._jsonModel.format = 'date-time';
                         break;

package/lib/rules/FunctionRuntime.js

@@ -741,7 +741,7 @@ class FunctionRuntimeImpl {
                         return '';
                     }
                     if ((_c = (_b = (_a = interpreter.globals.form) === null || _a === void 0 ? void 0 : _a.properties) === null || _b === void 0 ? void 0 : _b.queryParams) === null || _c === void 0 ? void 0 : _c[param]) {
-                        return interpreter.globals.form.properties.queryParams[param];
+                        return interpreter.globals.form.properties.queryParams[param.toLowerCase()];
                     }
                     try {
                         const urlParams = new URLSearchParams(((_d = window === null || window === void 0 ? void 0 : window.location) === null || _d === void 0 ? void 0 : _d.search) || '');

package/lib/utils/FormUtils.js

@@ -51,7 +51,7 @@ const processItem = (item, excludeUnbound, isAsync) => {
                 ? item.dataRef
                 : (name.length > 0 ? item.name : undefined);
             if (item.value instanceof Array) {
-                if (item.type === 'string[]') {
+                if (item.type === 'string[]' && (item === null || item === void 0 ? void 0 : item.format) === 'data-url') {
                     if (isAsync) {
                         return item.serialize().then(serializedFiles => {
                             ret[item.id] = serializedFiles.map((x) => {
@@ -73,7 +73,7 @@ const processItem = (item, excludeUnbound, isAsync) => {
                 }
             }
             else if (item.value != null) {
-                if (item.type === 'string') {
+                if (item.type === 'string' && (item === null || item === void 0 ? void 0 : item.format) === 'data-url') {
                     if (isAsync) {
                         return item.serialize().then(serializedFile => {
                             ret[item.id] = Object.assign(Object.assign({}, serializedFile[0]), { 'dataRef': dataRef });

package/package.json

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