@reactables/forms 0.4.5-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/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

@@ -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 mergeRemoveControl: <T>(state: Form<T>, form: BaseForm<T>, controlRef: ControlRef) => Form<T>;
+export declare const mergeRemoveControl: <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) {
@@ -651,7 +660,7 @@ var asyncValidation = function (form, _a) {
     return __assign(__assign({}, form), updatedSelfAndAncestors);
 };
 
-var hasErrors$1 = function (errors) {
+var hasErrors$3 = function (errors) {
     return Object.values(errors).some(function (hasError) { return hasError; });
 };
 var mergeBranchErrors = function (form, controlRef) {
@@ -665,7 +674,7 @@ var mergeBranchErrors = function (form, controlRef) {
         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
@@ -717,7 +726,7 @@ var asyncValidationResponseSuccess = function (form, _a) {
     return mergeBranchErrors(ancestorsUpdated, control.controlRef);
 };
 
-var hasErrors = function (errors) {
+var hasErrors$2 = 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
@@ -729,7 +738,7 @@ var mergeErrors = function (form) {
         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
@@ -750,29 +759,80 @@ var mergeErrors = function (form) {
     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).reduce(function (acc, control) {
+    var controlBranch = getControlBranch(controlRef, form)
+        .reverse()
+        .reduce(function (acc, control) {
         var _a;
         var key = getFormKey(control.controlRef);
-        return __assign(__assign({}, acc), (_a = {}, _a[key] = __assign(__assign({}, state[key]), control), _a));
+        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 ? state[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) {
+                var formKey = getFormKey(control.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), control), { errors: errors, valid: selfValid && childrenValid }), _a));
     }, {});
-    return mergeBranchErrors(__assign(__assign({}, state), controlBranch), controlRef);
+    return __assign(__assign({}, state), controlBranch);
 };
 
+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 controlBranch = getControlBranch(parentRef, form).reduce(function (acc, baseControl) {
+    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 = getControlBranch(parentRef, state).find(function (control) { return baseControl.key === control.key; });
-        return __assign(__assign({}, acc), (_a = {}, _a[key] = __assign(__assign({}, existingControl), baseControl), _a));
+        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);
-    var descendants = getDescendantControls(parentRef, state);
     descendants.forEach(function (control) {
         delete removedControls[getFormKey(control.controlRef)];
     });
-    return mergeBranchErrors(__assign(__assign({}, removedControls), controlBranch), parentRef);
+    return __assign(__assign({}, removedControls), controlBranch);
 };
 
 var mergeTouchUpdated = function (state, form, controlRef) {
@@ -784,13 +844,6 @@ var mergeTouchUpdated = function (state, form, 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;
@@ -802,8 +855,8 @@ var formChange = function (state, _a) {
         }, {}));
     }
     switch (action === null || action === void 0 ? void 0 : action.type) {
-        case 'updateValues':
         case 'addControl':
+        case 'updateValues':
             return mergeValueUpdated(state, form, action.payload.controlRef);
         case 'resetControl':
         case 'removeControl':
@@ -817,9 +870,7 @@ var formChange = function (state, _a) {
             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));

package/package.json

@@ -14,12 +14,12 @@
   "author": "David Lai",
   "license": "ISC",
   "dependencies": {
-    "@reactables/core": "^0.4.5-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.5-alpha.0"
+  "version": "0.4.6-alpha.0"
 }