@aemforms/af-core 0.22.33 → 0.22.35

package/lib/BaseNode.d.ts

@@ -72,6 +72,7 @@ export declare abstract class BaseNode<T extends BaseJson> implements BaseModel
     queueEvent(action: Action): void;
     dispatch(action: Action): void;
     notifyDependents(action: Action): void;
+    protected isEmpty(value?: any): boolean;
     _setProperty<T>(prop: string, newValue: T, notify?: boolean, notifyChildren?: (action: Action) => void): any;
     _bindToDataModel(contextualDataModel: DataGroup): void;
     private _data?;

package/lib/BaseNode.js

@@ -279,6 +279,9 @@ class BaseNode {
             x(new ActionImplWithTarget(action, this));
         });
     }
+    isEmpty(value = this._jsonModel.value) {
+        return value === undefined || value === null || value === '';
+    }
     _setProperty(prop, newValue, notify = true, notifyChildren = (action) => { }) {
         const oldValue = this._jsonModel[prop];
         let isValueSame = false;

package/lib/Field.d.ts

@@ -39,7 +39,6 @@ declare class Field extends Scriptable<FieldJson> implements FieldModel {
     set maximum(m: number | undefined);
     get minimum(): number | undefined;
     set minimum(m: number | undefined);
-    private isEmpty;
     private withCategory;
     get editValue(): any;
     get displayValue(): any;

package/lib/Field.js

@@ -249,9 +249,6 @@ class Field extends Scriptable_1.default {
             this._setProperty('minimum', m);
         }
     }
-    isEmpty() {
-        return this._jsonModel.value === undefined || this._jsonModel.value === null || this._jsonModel.value === '';
-    }
     withCategory(df) {
         if (df) {
             const hasCategory = df === null || df === void 0 ? void 0 : df.match(/^(?:date|num)\|/);
@@ -350,15 +347,13 @@ class Field extends Scriptable_1.default {
     }
     reset() {
         const changes = this.updateDataNodeAndTypedValue(this.default);
-        if (changes.length > 0) {
-            const validationStateChanges = {
-                'valid': undefined,
-                'errorMessage': ''
-            };
-            const updates = this._applyUpdates(['valid', 'errorMessage'], validationStateChanges);
-            const changeAction = new Events_1.Change({ changes: changes.concat(Object.values(updates)) });
-            this.dispatch(changeAction);
-        }
+        const validationStateChanges = {
+            'valid': undefined,
+            'errorMessage': ''
+        };
+        const updates = this._applyUpdates(['valid', 'errorMessage'], validationStateChanges);
+        const changeAction = new Events_1.Change({ changes: changes.concat(Object.values(updates)) });
+        this.dispatch(changeAction);
     }
     _updateRuleNodeReference(value) {
         var _a;

package/lib/Scriptable.js

@@ -69,7 +69,10 @@ class Scriptable extends BaseNode_1.BaseNode {
                 if (node) {
                     const newVal = this.ruleEngine.execute(node, scope, context, true);
                     if (BaseNode_1.editableProperties.indexOf(prop) > -1) {
-                        this[prop] = newVal;
+                        const oldAndNewValueAreEmpty = this.isEmpty() && this.isEmpty(newVal) && prop === 'value';
+                        if (!oldAndNewValueAreEmpty) {
+                            this[prop] = newVal;
+                        }
                     }
                     else {
                         this.form.logger.warn(`${prop} is not a valid editable property.`);

package/lib/rules/FunctionRuntime.js

@@ -28,46 +28,44 @@ const request = (context, uri, httpVerb, payload, success, error, headers) => __
     const requestOptions = {
         method: httpVerb
     };
-    let result;
     let inputPayload;
-    try {
-        if (payload && payload instanceof FileObject_1.FileObject && payload.data instanceof File) {
-            const formData = new FormData();
-            formData.append(payload.name, payload.data);
-            inputPayload = formData;
+    if (payload && payload instanceof FileObject_1.FileObject && payload.data instanceof File) {
+        const formData = new FormData();
+        formData.append(payload.name, payload.data);
+        inputPayload = formData;
+    }
+    else if (payload instanceof FormData) {
+        inputPayload = payload;
+    }
+    else if (payload && typeof payload === 'object' && Object.keys(payload).length > 0) {
+        const headerNames = Object.keys(headers);
+        if (headerNames.length > 0) {
+            requestOptions.headers = Object.assign(Object.assign({}, headers), (headerNames.indexOf('Content-Type') === -1 ? { 'Content-Type': 'application/json' } : {}));
         }
-        else if (payload instanceof FormData) {
-            inputPayload = payload;
+        else {
+            requestOptions.headers = { 'Content-Type': 'application/json' };
         }
-        else if (payload && typeof payload === 'object' && Object.keys(payload).length > 0) {
-            const headerNames = Object.keys(headers);
-            if (headerNames.length > 0) {
-                requestOptions.headers = Object.assign(Object.assign({}, headers), (headerNames.indexOf('Content-Type') === -1 ? { 'Content-Type': 'application/json' } : {}));
-            }
-            else {
-                requestOptions.headers = { 'Content-Type': 'application/json' };
-            }
-            const contentType = ((_a = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers) === null || _a === void 0 ? void 0 : _a['Content-Type']) || 'application/json';
-            if (contentType === 'application/json') {
-                inputPayload = JSON.stringify(payload);
-            }
-            else if (contentType.indexOf('multipart/form-data') > -1) {
-                inputPayload = multipartFormData(payload);
-            }
-            else if (contentType.indexOf('application/x-www-form-urlencoded') > -1) {
-                inputPayload = urlEncoded(payload);
-            }
+        const contentType = ((_a = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.headers) === null || _a === void 0 ? void 0 : _a['Content-Type']) || 'application/json';
+        if (contentType === 'application/json') {
+            inputPayload = JSON.stringify(payload);
         }
-        result = yield (0, Fetch_1.request)(endpoint, inputPayload, requestOptions);
+        else if (contentType.indexOf('multipart/form-data') > -1) {
+            inputPayload = multipartFormData(payload);
+        }
+        else if (contentType.indexOf('application/x-www-form-urlencoded') > -1) {
+            inputPayload = urlEncoded(payload);
+        }
+    }
+    const result = yield (0, Fetch_1.request)(endpoint, inputPayload, requestOptions);
+    if ((result === null || result === void 0 ? void 0 : result.status) >= 200 && (result === null || result === void 0 ? void 0 : result.status) <= 299) {
+        const eName = getCustomEventName(success);
+        context.form.dispatch(new Events_1.CustomEvent(eName, result, true));
     }
-    catch (e) {
+    else {
         context.form.logger.error('Error invoking a rest API');
         const eName = getCustomEventName(error);
         context.form.dispatch(new Events_1.CustomEvent(eName, {}, true));
-        return;
     }
-    const eName = getCustomEventName(success);
-    context.form.dispatch(new Events_1.CustomEvent(eName, result, true));
 });
 exports.request = request;
 const urlEncoded = (data) => {

package/package.json

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