@reactables/forms 0.4.4-alpha.0 → 0.4.6-alpha.0

package/dist/Models/Controls.d.ts

@@ -39,4 +39,5 @@ export interface Form<T> {
     root?: FormControl<T>;
     [key: string]: FormControl<unknown>;
 }
+export declare const DEFAULT_HUB2_FIELDS: Hub2Fields;
 export {};

package/dist/Reducers/Hub1/index.d.ts

@@ -4,6 +4,4 @@ export { markControlAsUntouched } from './markControlAsUntouched';
 export { removeControl } from './removeControl';
 export { resetControl } from './resetControl';
 export { syncValidate } from './syncValidate';
-export { updateDirty } from './updateDirty';
 export { updateValues } from './updateValues';
-export { buildHub1Reducer } from './buildHub1Reducer';

package/dist/Reducers/Hub2/formChange.d.ts

@@ -1,4 +1,3 @@
 import { Reducer } from '@reactables/core';
-import { Form, Hub2Fields } from '../../Models/Controls';
-export declare const DEFAULT_HUB2_FIELDS: Hub2Fields;
+import { Form } from '../../Models/Controls';
 export declare const formChange: Reducer<Form<unknown>>;

package/dist/Reducers/Hub2/mergeRemoveControl.d.ts

@@ -0,0 +1,6 @@
+import { Form, BaseForm, FormControl } from '../../Models/Controls';
+import { ControlRef } from '../../Models/ControlRef';
+export declare const mergeRemoveControl: <T>(state: Form<T>, form: BaseForm<T>, controlRef: ControlRef) => {
+    [x: string]: FormControl<unknown>;
+    root?: FormControl<T>;
+};

package/dist/Reducers/Hub2/mergeTouchUpdated.d.ts

@@ -0,0 +1,6 @@
+import { Form, BaseForm, FormControl } from '../../Models/Controls';
+import { ControlRef } from '../../Models/ControlRef';
+export declare const mergeTouchUpdated: <T>(state: Form<T>, form: BaseForm<T>, controlRef: ControlRef) => {
+    [x: string]: FormControl<unknown>;
+    root?: FormControl<T>;
+};

package/dist/Reducers/Hub2/mergeValueUpdated.d.ts

@@ -1,3 +1,6 @@
-import { Form, BaseForm } from '../../Models/Controls';
+import { Form, BaseForm, FormControl } from '../../Models/Controls';
 import { ControlRef } from '../../Models/ControlRef';
-export declare const mergeValueUpdated: <T>(state: Form<T>, form: BaseForm<T>, controlRef: ControlRef) => Form<T>;
+export declare const mergeValueUpdated: <T>(state: Form<T>, form: BaseForm<T>, controlRef: ControlRef) => {
+    [x: string]: FormControl<unknown>;
+    root?: FormControl<T>;
+};

package/dist/index.js

@@ -11,8 +11,17 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
 
+var DEFAULT_HUB2_FIELDS = {
+    asyncValidatorErrors: {},
+    asyncValidateInProgress: {},
+    pending: false,
+    valid: null,
+    errors: null
+};
+
 var Controls = /*#__PURE__*/Object.freeze({
-  __proto__: null
+  __proto__: null,
+  DEFAULT_HUB2_FIELDS: DEFAULT_HUB2_FIELDS
 });
 
 var required = function (value) {
@@ -346,7 +355,8 @@ var isChildRef = function (controlRef, parentRef) {
 var UPDATE_DESCENDANT_VALUES = 'UPDATE_DESCENDANT_VALUES';
 var updateDescendants = function (form, _a) {
     var _b = _a.payload, controlRef = _b.controlRef, value = _b.value;
-    var result = Object.entries(form).reduce(function (acc, _a) {
+    var descendants = getDescendantControls(controlRef, form, true).map(function (control) { return [getFormKey(control.controlRef), control]; });
+    var result = descendants.reduce(function (acc, _a) {
         var _b;
         var key = _a[0], control = _a[1];
         if (isChildRef(control.controlRef, controlRef)) {
@@ -435,14 +445,16 @@ var removeControl = function (_a, action) {
         return { form: form, action: action };
     var parentRef = controlRef.slice(0, -1);
     var parentIsFormArray = Array.isArray(getControl(parentRef, form).config.controls);
+    var descendantkeys = getDescendantControls(controlRef, form).map(function (_a) {
+        var controlRef = _a.controlRef;
+        return getFormKey(controlRef);
+    });
+    var controlsRemoved = __assign({}, form);
+    descendantkeys.forEach(function (key) {
+        delete controlsRemoved[key];
+    });
     // Remove control and all descendants
-    var controlRemoved = Object.entries(form)
-        .filter(function (_a) {
-        _a[0]; var control = _a[1];
-        return !(control.controlRef.length > parentRef.length &&
-            controlRef.every(function (key, index) { return key === control.controlRef[index]; }));
-    })
-        .reduce(function (acc, _a) {
+    var controlRemoved = Object.entries(controlsRemoved).reduce(function (acc, _a) {
         var _b, _c;
         var key = _a[0], control = _a[1];
         // May need to reindex array items of removed control
@@ -551,7 +563,7 @@ var updateAncestorPristineValues = function (form, _a) {
                 return __assign(__assign({}, acc), (_b = {}, _b[controlRef.at(-1)] = pristineValue, _b));
             }, {});
         }
-        var newParentControl = __assign(__assign({}, form[parentKey]), { pristineValue: newValue });
+        var newParentControl = __assign(__assign({}, form[parentKey]), { pristineValue: newValue, dirty: isEqual__default["default"](form[parentKey].value, newValue) });
         return updateAncestorPristineValues(__assign(__assign({}, form), (_b = {}, _b[parentKey] = newParentControl, _b)), {
             type: UPDATE_ANCESTOR_PRISTINE_VALUES,
             payload: parentRef
@@ -560,46 +572,32 @@ var updateAncestorPristineValues = function (form, _a) {
     return form;
 };
 
-var updateDirty = function (form) {
-    return Object.entries(form).reduce(function (acc, _a) {
-        var _b;
-        var key = _a[0], control = _a[1];
-        return __assign(__assign({}, acc), (_b = {}, _b[key] = __assign(__assign({}, control), { dirty: !isEqual__default["default"](control.value, control.pristineValue) }), _b));
-    }, {});
-};
-
 var markControlAsPristine = function (_a, action) {
     var form = _a.form;
     var controlRef = action.payload;
-    var descendants = getDescendantControls(controlRef, form);
-    var result = Object.entries(form).reduce(function (acc, _a) {
-        var _b;
-        var key = _a[0], control = _a[1];
-        var isDescendant = descendants.includes(control);
-        return __assign(__assign({}, acc), (_b = {}, _b[key] = isDescendant
-            ? __assign(__assign({}, control), { pristineValue: control.value, dirty: false }) : control, _b));
+    var descendants = getDescendantControls(controlRef, form).reduce(function (acc, control) {
+        var _a;
+        return (__assign(__assign({}, acc), (_a = {}, _a[getFormKey(control.controlRef)] = __assign(__assign({}, control), { dirty: false, pristineValue: control.value }), _a)));
     }, {});
+    var result = __assign(__assign({}, form), descendants);
     if (controlRef.length) {
         result = updateAncestorPristineValues(result, {
             type: UPDATE_ANCESTOR_PRISTINE_VALUES,
             payload: controlRef
         });
     }
-    return { form: updateDirty(result), action: action };
+    return { form: result, action: action };
 };
 
 var markControlAsTouched = function (_a, action) {
     var form = _a.form;
     var _b = action.payload, controlRef = _b.controlRef, markAll = _b.markAll;
-    var controls = markAll
-        ? getControlBranch(controlRef, form)
-        : getAncestorControls(controlRef, form);
+    var controls = (markAll ? getControlBranch(controlRef, form) : getAncestorControls(controlRef, form)).reduce(function (acc, control) {
+        var _a;
+        return (__assign(__assign({}, acc), (_a = {}, _a[getFormKey(control.controlRef)] = __assign(__assign({}, control), { touched: true }), _a)));
+    }, {});
     return {
-        form: Object.entries(form).reduce(function (acc, _a) {
-            var _b;
-            var key = _a[0], control = _a[1];
-            return (__assign(__assign({}, acc), (_b = {}, _b[key] = __assign(__assign({}, control), { touched: controls.includes(control) ? true : control.touched }), _b)));
-        }, {}),
+        form: __assign(__assign({}, form), controls),
         action: action
     };
 };
@@ -608,12 +606,11 @@ var markControlAsUntouched = function (_a, action) {
     var _b;
     var form = _a.form;
     var controlRef = action.payload;
-    var descendants = getDescendantControls(controlRef, form);
-    var result = Object.entries(form).reduce(function (acc, _a) {
-        var _b;
-        var key = _a[0], control = _a[1];
-        return (__assign(__assign({}, acc), (_b = {}, _b[key] = __assign(__assign({}, control), { touched: descendants.includes(control) ? false : control.touched }), _b)));
+    var result = getDescendantControls(controlRef, form).reduce(function (acc, control) {
+        var _a;
+        return (__assign(__assign({}, acc), (_a = {}, _a[getFormKey(control.controlRef)] = __assign(__assign({}, control), { touched: false }), _a)));
     }, {});
+    result = __assign(__assign({}, form), result);
     // Update ancestors
     var currentRef = controlRef;
     var key;
@@ -651,54 +648,53 @@ var resetControl = function (_a, action) {
 
 var asyncValidation = function (form, _a) {
     var controlRef = _a.payload.controlRef;
-    var ancestors = getAncestorControls(controlRef, form);
-    var result = Object.entries(form).reduce(function (acc, _a) {
-        var _b, _c;
-        var key = _a[0], control = _a[1];
-        if (ancestors.includes(control)) {
-            var isChangedControl = getFormKey(control.controlRef) === getFormKey(controlRef);
-            return __assign(__assign({}, acc), (_b = {}, _b[key] = __assign(__assign({}, control), { pending: true, asyncValidateInProgress: isChangedControl
-                    ? __assign({}, control.config.asyncValidators.reduce(function (acc, _, index) {
-                        var _a;
-                        return (__assign(__assign({}, acc), (_a = {}, _a[index] = true, _a)));
-                    }, {})) : control.asyncValidateInProgress }), _b));
-        }
-        return __assign(__assign({}, acc), (_c = {}, _c[key] = control, _c));
+    var updatedSelfAndAncestors = getAncestorControls(controlRef, form).reduce(function (acc, control) {
+        var _a;
+        var isChangedControl = getFormKey(control.controlRef) === getFormKey(controlRef);
+        return __assign(__assign({}, acc), (_a = {}, _a[getFormKey(control.controlRef)] = __assign(__assign({}, control), { pending: true, asyncValidateInProgress: isChangedControl
+                ? __assign({}, control.config.asyncValidators.reduce(function (acc, _, index) {
+                    var _a;
+                    return (__assign(__assign({}, acc), (_a = {}, _a[index] = true, _a)));
+                }, {})) : control.asyncValidateInProgress }), _a));
     }, {});
-    return result;
+    return __assign(__assign({}, form), updatedSelfAndAncestors);
 };
 
-var hasErrors$1 = function (errors) {
+var hasErrors$3 = function (errors) {
     return Object.values(errors).some(function (hasError) { return hasError; });
 };
-// TODO: update merge errors to not do the entire form but just a subset of it
-// TODO: separation of concern to update validity of control and ancestors
-var mergeErrors = function (form) {
-    var errorsMerged = Object.entries(form)
+var mergeBranchErrors = function (form, controlRef) {
+    var controlBranch = getControlBranch(controlRef, form).reduce(function (acc, ctrl) {
+        var _a;
+        return __assign(__assign({}, acc), (_a = {}, _a[getFormKey(ctrl.controlRef)] = ctrl, _a));
+    }, {});
+    var errorsMerged = Object.entries(controlBranch)
         .reverse()
         .reduce(function (acc, _a) {
         var _b;
         var key = _a[0], control = _a[1];
         var errors = __assign(__assign({}, control.validatorErrors), control.asyncValidatorErrors);
-        var selfValid = !hasErrors$1(errors);
+        var selfValid = !hasErrors$3(errors);
         var childrenValid = true;
         if (Array.isArray(control.config.controls)) {
             // If control is a FormArray
-            childrenValid = control.value.every(function (item, index) { return acc[getFormKey(control.controlRef.concat(index))].valid; });
+            childrenValid = control.value.every(function (item, index) {
+                var formKey = getFormKey(control.controlRef.concat(index));
+                var valid = acc[formKey] === undefined ? form[formKey].valid : acc[formKey].valid;
+                return valid;
+            });
         }
         else if (control.config.controls) {
             // If control is a FormGroup
-            childrenValid = Object.keys(control.value).every(function (childKey) { return acc[getFormKey(control.controlRef.concat(childKey))].valid; });
+            childrenValid = Object.keys(control.value).every(function (childKey) {
+                var formKey = getFormKey(control.controlRef.concat(childKey));
+                var valid = acc[formKey] === undefined ? form[formKey].valid : acc[formKey].valid;
+                return valid;
+            });
         }
         return __assign(__assign({}, acc), (_b = {}, _b[key] = __assign(__assign({}, control), { errors: errors, valid: selfValid && childrenValid }), _b));
     }, {});
-    var restoredOrder = Object.keys(errorsMerged)
-        .reverse()
-        .reduce(function (acc, key) {
-        acc[key] = errorsMerged[key];
-        return acc;
-    }, {});
-    return restoredOrder;
+    return __assign(__assign({}, form), errorsMerged);
 };
 
 var isControlValidating = function (control) {
@@ -727,30 +723,60 @@ var asyncValidationResponseSuccess = function (form, _a) {
         }
         return __assign(__assign({}, acc), (_c = {}, _c[key] = control, _c));
     }, {});
-    return mergeErrors(ancestorsUpdated);
+    return mergeBranchErrors(ancestorsUpdated, control.controlRef);
 };
 
-var hasErrors = function (errors) {
+var hasErrors$2 = function (errors) {
     return Object.values(errors).some(function (hasError) { return hasError; });
 };
-var mergeBranchErrors = function (form, controlRef) {
-    var controlBranch = getControlBranch(controlRef, form).reduce(function (acc, ctrl) {
-        var _a;
-        return __assign(__assign({}, acc), (_a = {}, _a[getFormKey(ctrl.controlRef)] = ctrl, _a));
-    }, {});
-    var errorsMerged = Object.entries(controlBranch)
+// TODO: update merge errors to not do the entire form but just a subset of it
+// TODO: separation of concern to update validity of control and ancestors
+var mergeErrors = function (form) {
+    var errorsMerged = Object.entries(form)
         .reverse()
         .reduce(function (acc, _a) {
         var _b;
         var key = _a[0], control = _a[1];
         var errors = __assign(__assign({}, control.validatorErrors), control.asyncValidatorErrors);
-        var selfValid = !hasErrors(errors);
+        var selfValid = !hasErrors$2(errors);
+        var childrenValid = true;
+        if (Array.isArray(control.config.controls)) {
+            // If control is a FormArray
+            childrenValid = control.value.every(function (item, index) { return acc[getFormKey(control.controlRef.concat(index))].valid; });
+        }
+        else if (control.config.controls) {
+            // If control is a FormGroup
+            childrenValid = Object.keys(control.value).every(function (childKey) { return acc[getFormKey(control.controlRef.concat(childKey))].valid; });
+        }
+        return __assign(__assign({}, acc), (_b = {}, _b[key] = __assign(__assign({}, control), { errors: errors, valid: selfValid && childrenValid }), _b));
+    }, {});
+    var restoredOrder = Object.keys(errorsMerged)
+        .reverse()
+        .reduce(function (acc, key) {
+        acc[key] = errorsMerged[key];
+        return acc;
+    }, {});
+    return restoredOrder;
+};
+
+var hasErrors$1 = function (errors) {
+    return Object.values(errors).some(function (hasError) { return hasError; });
+};
+var mergeValueUpdated = function (state, form, controlRef) {
+    var controlBranch = getControlBranch(controlRef, form)
+        .reverse()
+        .reduce(function (acc, control) {
+        var _a;
+        var key = getFormKey(control.controlRef);
+        var existingControl = state[key] || structuredClone(DEFAULT_HUB2_FIELDS);
+        var errors = __assign(__assign({}, control.validatorErrors), existingControl.asyncValidatorErrors);
+        var selfValid = !hasErrors$1(errors);
         var childrenValid = true;
         if (Array.isArray(control.config.controls)) {
             // If control is a FormArray
             childrenValid = control.value.every(function (item, index) {
                 var formKey = getFormKey(control.controlRef.concat(index));
-                var valid = acc[formKey] === undefined ? form[formKey].valid : acc[formKey].valid;
+                var valid = acc[formKey] === undefined ? state[formKey].valid : acc[formKey].valid;
                 return valid;
             });
         }
@@ -758,31 +784,66 @@ var mergeBranchErrors = function (form, controlRef) {
             // If control is a FormGroup
             childrenValid = Object.keys(control.value).every(function (childKey) {
                 var formKey = getFormKey(control.controlRef.concat(childKey));
-                var valid = acc[formKey] === undefined ? form[formKey].valid : acc[formKey].valid;
+                var valid = acc[formKey] === undefined ? state[formKey].valid : acc[formKey].valid;
                 return valid;
             });
         }
-        return __assign(__assign({}, acc), (_b = {}, _b[key] = __assign(__assign({}, control), { errors: errors, valid: selfValid && childrenValid }), _b));
+        return __assign(__assign({}, acc), (_a = {}, _a[key] = __assign(__assign(__assign({}, existingControl), control), { errors: errors, valid: selfValid && childrenValid }), _a));
     }, {});
-    return __assign(__assign({}, form), errorsMerged);
+    return __assign(__assign({}, state), controlBranch);
 };
 
-var mergeValueUpdated = function (state, form, controlRef) {
+var hasErrors = function (errors) {
+    return Object.values(errors).some(function (hasError) { return hasError; });
+};
+var mergeRemoveControl = function (state, form, controlRef) {
+    var parentRef = controlRef.slice(0, -1);
+    var existingBranch = getControlBranch(parentRef, state);
+    var descendants = existingBranch.filter(function (control) { return control.controlRef.length < parentRef.length; });
+    var controlBranch = getControlBranch(parentRef, form)
+        .reverse()
+        .reduce(function (acc, baseControl) {
+        var _a;
+        var key = getFormKey(baseControl.controlRef);
+        var existingControl = existingBranch.find(function (control) { return baseControl.key === control.key; }) ||
+            structuredClone(DEFAULT_HUB2_FIELDS);
+        var errors = __assign(__assign({}, baseControl.validatorErrors), existingControl.asyncValidatorErrors);
+        var selfValid = !hasErrors(errors);
+        var childrenValid = true;
+        if (Array.isArray(baseControl.config.controls)) {
+            // If control is a FormArray
+            childrenValid = baseControl.value.every(function (item, index) {
+                var formKey = getFormKey(baseControl.controlRef.concat(index));
+                var valid = acc[formKey] === undefined ? state[formKey].valid : acc[formKey].valid;
+                return valid;
+            });
+        }
+        else if (baseControl.config.controls) {
+            // If control is a FormGroup
+            childrenValid = Object.keys(baseControl.value).every(function (childKey) {
+                var formKey = getFormKey(baseControl.controlRef.concat(childKey));
+                var valid = acc[formKey] === undefined ? state[formKey].valid : acc[formKey].valid;
+                return valid;
+            });
+        }
+        return __assign(__assign({}, acc), (_a = {}, _a[key] = __assign(__assign(__assign({}, existingControl), baseControl), { errors: errors, valid: selfValid && childrenValid }), _a));
+    }, {});
+    var removedControls = __assign({}, state);
+    descendants.forEach(function (control) {
+        delete removedControls[getFormKey(control.controlRef)];
+    });
+    return __assign(__assign({}, removedControls), controlBranch);
+};
+
+var mergeTouchUpdated = function (state, form, controlRef) {
     var controlBranch = getControlBranch(controlRef, form).reduce(function (acc, control) {
         var _a;
         var key = getFormKey(control.controlRef);
         return __assign(__assign({}, acc), (_a = {}, _a[key] = __assign(__assign({}, state[key]), control), _a));
     }, {});
-    return mergeBranchErrors(__assign(__assign({}, state), controlBranch), controlRef);
+    return __assign(__assign({}, state), controlBranch);
 };
 
-var DEFAULT_HUB2_FIELDS = {
-    asyncValidatorErrors: {},
-    asyncValidateInProgress: {},
-    pending: false,
-    valid: null,
-    errors: null
-};
 var formChange = function (state, _a) {
     if (state === void 0) { state = null; }
     var _b = _a.payload, form = _b.form, action = _b.action;
@@ -794,15 +855,22 @@ var formChange = function (state, _a) {
         }, {}));
     }
     switch (action === null || action === void 0 ? void 0 : action.type) {
+        case 'addControl':
         case 'updateValues':
             return mergeValueUpdated(state, form, action.payload.controlRef);
+        case 'resetControl':
+        case 'removeControl':
+            return mergeRemoveControl(state, form, action.payload);
+        case 'markControlAsPristine':
+        case 'markControlAsUntouched':
+            return mergeTouchUpdated(state, form, action.payload);
+        case 'markControlAsTouched':
+            return mergeTouchUpdated(state, form, action.payload.controlRef);
         default:
             return mergeErrors(Object.entries(form).reduce(function (acc, _a) {
                 var _b;
                 var dictKey = _a[0], baseControl = _a[1];
-                var existingControl = (action === null || action === void 0 ? void 0 : action.type) === 'removeControl'
-                    ? state && Object.values(state).find(function (control) { return baseControl.key === control.key; })
-                    : state && state[dictKey];
+                var existingControl = state && state[dictKey];
                 return __assign(__assign({}, acc), (_b = {}, _b[dictKey] = __assign(__assign({}, (existingControl
                     ? existingControl
                     : structuredClone(DEFAULT_HUB2_FIELDS))), baseControl), _b));
@@ -865,17 +933,12 @@ var RxForm = {
 };
 
 var getArrayItems = function (controlRef, form) {
-    if (!Array.isArray(getControl(controlRef, form).config.controls)) {
+    var control = getControl(controlRef, form);
+    if (!Array.isArray(control.config.controls)) {
         throw "".concat(controlRef.join('.'), " is not a Form Array control");
     }
-    return Object.values(form)
-        .filter(function (control) {
-        var isItem = controlRef.every(function (key, index) { return key === control.controlRef[index]; }) &&
-            control.controlRef.length === controlRef.length + 1 &&
-            typeof control.controlRef[controlRef.length] === 'number';
-        return isItem;
-    })
-        .sort(function (a, b) { return +a.controlRef.slice(-1) - +b.controlRef.slice(-1); });
+    var result = control.value.map(function (_, index) { return form[getFormKey(controlRef.concat(index))]; });
+    return result;
 };
 
 exports.ControlModels = Controls;

package/package.json

@@ -14,12 +14,12 @@
   "author": "David Lai",
   "license": "ISC",
   "dependencies": {
-    "@reactables/core": "^0.4.4-alpha.0",
+    "@reactables/core": "^0.4.6-alpha.0",
     "lodash.clonedeep": "^4.5.0",
     "lodash.isequal": "^4.5.0"
   },
   "peerDependencies": {
     "rxjs": "^6.0.0 || ^7.0.0"
   },
-  "version": "0.4.4-alpha.0"
+  "version": "0.4.6-alpha.0"
 }

package/dist/Reducers/Hub1/updateDirty.d.ts

@@ -1,2 +0,0 @@
-import { BaseForm } from '../../Models/Controls';
-export declare const updateDirty: <T>(form: BaseForm<T>) => BaseForm<T>;

package/dist/Reducers/Hub1/updateDirty.test.d.ts

@@ -1 +0,0 @@
-export {};