@reactables/forms 0.4.5-alpha.0 → 0.5.0-alpha.0

package/dist/Models/Controls.d.ts

@@ -22,6 +22,7 @@ interface AsyncFields {
 interface ValidatedFields {
     valid: boolean;
     errors: FormErrors;
+    childrenValid: boolean;
 }
 export interface Hub2Fields extends AsyncFields, ValidatedFields {
 }
@@ -39,4 +40,5 @@ export interface Form<T> {
     root?: FormControl<T>;
     [key: string]: FormControl<unknown>;
 }
+export declare const DEFAULT_HUB2_FIELDS: Hub2Fields;
 export {};

package/dist/Models/Payloads.d.ts

@@ -9,6 +9,10 @@ export interface AddControl {
     config: AbstractControlConfig;
     controlRef: ControlRef;
 }
+export interface PushControl {
+    config: AbstractControlConfig;
+    controlRef: ControlRef;
+}
 export interface ControlAsyncValidationResponse {
     key: string;
     validatorIndex: number;

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

@@ -0,0 +1,4 @@
+import { Action } from '@reactables/core';
+import { BaseFormState } from '../../Models/Controls';
+import { AddControl } from '../../Models/Payloads';
+export declare const pushControl: <T>(state: BaseFormState<T>, action: Action<AddControl>) => BaseFormState<T>;

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/mergePushControl.d.ts

@@ -0,0 +1,5 @@
+import { Form, BaseForm } from '../../Models/Controls';
+import { ControlRef } from '../../Models/ControlRef';
+export declare const mergePushControl: <T>(state: Form<T>, form: BaseForm<T>, controlRef: ControlRef) => {
+    root?: import("../../Models/Controls").FormControl<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/RxForm/RxForm.d.ts

@@ -1,5 +1,5 @@
 import { Reactable, EffectsAndSources } from '@reactables/core';
-import { ControlChange, AddControl, MarkTouched } from '../Models/Payloads';
+import { ControlChange, AddControl, MarkTouched, PushControl } from '../Models/Payloads';
 import { ControlRef } from '../Models';
 import { FormControlConfig, FormArrayConfig, FormGroupConfig, AbstractControlConfig } from '../Models/Configs';
 import { ValidatorFn, ValidatorAsyncFn } from '../Models/Validators';
@@ -8,6 +8,7 @@ type FbControl<T> = [T, (ValidatorFn | ValidatorFn[])?, (ValidatorAsyncFn | Vali
 export type RxFormActions = {
     updateValues: <T>(payload: ControlChange<T>) => void;
     addControl: (payload: AddControl) => void;
+    pushControl: (payload: PushControl) => void;
     removeControl: (payload: ControlRef) => void;
     markControlAsPristine: (payload: ControlRef) => void;
     markControlAsTouched: (payload: MarkTouched) => void;

package/dist/index.js

@@ -11,8 +11,18 @@ 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,
+    childrenValid: null,
+    errors: null
+};
+
 var Controls = /*#__PURE__*/Object.freeze({
-  __proto__: null
+  __proto__: null,
+  DEFAULT_HUB2_FIELDS: DEFAULT_HUB2_FIELDS
 });
 
 var required = function (value) {
@@ -122,16 +132,9 @@ var generateKey = function (length) {
     return result;
 };
 
-var syncValidate = function (form) {
-    // First check each control for its own validation
-    var validated = Object.entries(form).reduce(function (acc, _a) {
-        var _b;
-        var _c;
-        var key = _a[0], control = _a[1];
-        var validatorErrors = ((_c = control.config.validators) === null || _c === void 0 ? void 0 : _c.reduce(function (acc, validator) { return (__assign(__assign({}, acc), validator(control.value))); }, {})) || {};
-        return __assign(__assign({}, acc), (_b = {}, _b[key] = __assign(__assign({}, control), { validatorErrors: validatorErrors }), _b));
-    }, {});
-    return validated;
+var getErrors = function (control, value) {
+    var _a;
+    return ((_a = control.config.validators) === null || _a === void 0 ? void 0 : _a.reduce(function (acc, validator) { return (__assign(__assign({}, acc), validator(value))); }, {})) || {};
 };
 
 var buildState = function (config, form, controlRef) {
@@ -149,7 +152,7 @@ var buildState = function (config, form, controlRef) {
         config: config,
         key: generateKey(5)
     };
-    var newForm = __assign(__assign({}, form), (_a = {}, _a[getFormKey(controlRef)] = control, _a));
+    var newForm = __assign(__assign({}, form), (_a = {}, _a[getFormKey(controlRef)] = __assign(__assign({}, control), { validatorErrors: getErrors(control, value) }), _a));
     var controls = config.controls;
     // Adding controls for Form Group
     if (controls && !(controls instanceof Array)) {
@@ -168,7 +171,7 @@ var buildFormState = function (config, form, controlRef) {
     if (form === void 0) { form = { root: null }; }
     if (controlRef === void 0) { controlRef = []; }
     return {
-        form: syncValidate(buildState(config, form, controlRef)),
+        form: buildState(config, form, controlRef),
         action: null
     };
 };
@@ -277,6 +280,7 @@ var buildHub2Source = function (rx) {
             case 'updateValues':
                 controlsToCheck = getControlBranch(action.payload.controlRef, newForm);
                 break;
+            case 'pushControl':
             case 'addControl':
                 var changedControl = getControl(action.payload.controlRef, newForm);
                 if (Array.isArray(changedControl.config.controls)) {
@@ -304,11 +308,6 @@ var buildHub2Source = function (rx) {
     return sourceForHub2$;
 };
 
-var getErrors = function (control, value) {
-    var _a;
-    return ((_a = control.config.validators) === null || _a === void 0 ? void 0 : _a.reduce(function (acc, validator) { return (__assign(__assign({}, acc), validator(value))); }, {})) || {};
-};
-
 var UPDATE_ANCESTOR_VALUES = 'UPDATE_ANCESTOR_VALUES';
 var updateAncestorValues = function (form, _a) {
     var _b, _c;
@@ -527,6 +526,28 @@ var addControl = function (state, action) {
     return { form: ancestorsUpdated, action: action };
 };
 
+var pushControl = function (state, action) {
+    var newControlRef;
+    var _a = action.payload, config = _a.config, controlRef = _a.controlRef;
+    var existingControl = getControl(controlRef, state.form);
+    if (!existingControl)
+        throw 'You are attempting to push to a control that does not exist';
+    // If controlRef exists we are adding control to a Form Array
+    if (Array.isArray(existingControl.config.controls)) {
+        newControlRef = controlRef.concat(existingControl.value.length);
+    }
+    else {
+        throw 'You are attempting to push to a control that is not a Form Array';
+    }
+    var newForm = buildState(config, state.form, newControlRef);
+    var newValue = getControl(newControlRef, newForm).value;
+    var ancestorsUpdated = updateAncestorValuesAddControl(newForm, {
+        type: UPDATE_ANCESTOR_VALUES_ADD_CONTROL,
+        payload: { controlRef: newControlRef, value: newValue }
+    });
+    return { form: ancestorsUpdated, action: action };
+};
+
 // Same implementation as updateAncestor values except updating pristine values
 var UPDATE_ANCESTOR_PRISTINE_VALUES = 'UPDATE_ANCESTOR_PRISTINE_VALUES';
 var updateAncestorPristineValues = function (form, _a) {
@@ -651,7 +672,7 @@ var asyncValidation = function (form, _a) {
     return __assign(__assign({}, form), updatedSelfAndAncestors);
 };
 
-var hasErrors$1 = function (errors) {
+var hasErrors$4 = function (errors) {
     return Object.values(errors).some(function (hasError) { return hasError; });
 };
 var mergeBranchErrors = function (form, controlRef) {
@@ -665,7 +686,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$4(errors);
         var childrenValid = true;
         if (Array.isArray(control.config.controls)) {
             // If control is a FormArray
@@ -683,7 +704,7 @@ var mergeBranchErrors = function (form, controlRef) {
                 return valid;
             });
         }
-        return __assign(__assign({}, acc), (_b = {}, _b[key] = __assign(__assign({}, control), { errors: errors, valid: selfValid && childrenValid }), _b));
+        return __assign(__assign({}, acc), (_b = {}, _b[key] = __assign(__assign({}, control), { errors: errors, valid: selfValid && childrenValid, childrenValid: childrenValid }), _b));
     }, {});
     return __assign(__assign({}, form), errorsMerged);
 };
@@ -717,7 +738,7 @@ var asyncValidationResponseSuccess = function (form, _a) {
     return mergeBranchErrors(ancestorsUpdated, control.controlRef);
 };
 
-var hasErrors = 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
@@ -729,7 +750,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$3(errors);
         var childrenValid = true;
         if (Array.isArray(control.config.controls)) {
             // If control is a FormArray
@@ -739,7 +760,7 @@ var mergeErrors = function (form) {
             // 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));
+        return __assign(__assign({}, acc), (_b = {}, _b[key] = __assign(__assign({}, control), { errors: errors, valid: selfValid && childrenValid, childrenValid: childrenValid }), _b));
     }, {});
     var restoredOrder = Object.keys(errorsMerged)
         .reverse()
@@ -750,29 +771,80 @@ var mergeErrors = function (form) {
     return restoredOrder;
 };
 
+var hasErrors$2 = 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$2(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, childrenValid: childrenValid }), _a));
     }, {});
-    return mergeBranchErrors(__assign(__assign({}, state), controlBranch), controlRef);
+    return __assign(__assign({}, state), controlBranch);
 };
 
+var hasErrors$1 = 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$1(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, childrenValid: 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 +856,46 @@ var mergeTouchUpdated = function (state, form, controlRef) {
     return __assign(__assign({}, state), controlBranch);
 };
 
-var DEFAULT_HUB2_FIELDS = {
-    asyncValidatorErrors: {},
-    asyncValidateInProgress: {},
-    pending: false,
-    valid: null,
-    errors: null
+var hasErrors = function (errors) {
+    return Object.values(errors).some(function (hasError) { return hasError; });
 };
+var mergePushControl = function (state, form, controlRef) {
+    var baseFormArray = getControl(controlRef, form);
+    //If Form Array
+    // use the added control  (last index)
+    // merge descendants with default stuff
+    var newItemIndex = baseFormArray.value.length - 1;
+    var descendants = getDescendantControls(controlRef.concat(newItemIndex), form);
+    var mergedDescendants = mergeErrors(descendants.reduce(function (acc, control) {
+        var _a;
+        var formKey = getFormKey(control.controlRef);
+        return __assign(__assign({}, acc), (_a = {}, _a[formKey] = __assign(__assign({}, control), structuredClone(DEFAULT_HUB2_FIELDS)), _a));
+    }, {}));
+    var ancestors = getAncestorControls(controlRef, state)
+        .reverse()
+        .reduce(function (acc, control, index, arr) {
+        var _a, _b;
+        var formKey = getFormKey(control.controlRef);
+        var errors = __assign(__assign({}, form[formKey].validatorErrors), control.asyncValidatorErrors);
+        if (!control.childrenValid)
+            // If the ancestor control's children were not valid, pushing an item won't change its valid status
+            return __assign(__assign({}, acc), (_a = {}, _a[formKey] = __assign(__assign(__assign({}, control), form[formKey]), { errors: errors }), _a));
+        var selfValid = !hasErrors(errors);
+        var childrenValid = true;
+        if (index === 0) {
+            childrenValid =
+                control.childrenValid &&
+                    mergedDescendants[getFormKey(controlRef.concat(newItemIndex))].valid;
+        }
+        else {
+            childrenValid = control.childrenValid && arr[index - 1].valid;
+        }
+        return __assign(__assign({}, acc), (_b = {}, _b[formKey] = __assign(__assign(__assign({}, control), form[formKey]), { errors: errors, valid: selfValid && childrenValid, childrenValid: childrenValid }), _b));
+    }, {});
+    var controlBranchUpdated = __assign(__assign({}, ancestors), mergedDescendants);
+    return __assign(__assign({}, state), controlBranchUpdated);
+};
+
 var formChange = function (state, _a) {
     if (state === void 0) { state = null; }
     var _b = _a.payload, form = _b.form, action = _b.action;
@@ -802,8 +907,10 @@ var formChange = function (state, _a) {
         }, {}));
     }
     switch (action === null || action === void 0 ? void 0 : action.type) {
-        case 'updateValues':
+        case 'pushControl':
+            return mergePushControl(state, form, action.payload.controlRef);
         case 'addControl':
+        case 'updateValues':
             return mergeValueUpdated(state, form, action.payload.controlRef);
         case 'resetControl':
         case 'removeControl':
@@ -817,9 +924,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));
@@ -849,6 +954,7 @@ var build = function (config, options) {
             updateValues: updateValues,
             removeControl: removeControl,
             addControl: addControl,
+            pushControl: pushControl,
             markControlAsPristine: markControlAsPristine,
             markControlAsTouched: markControlAsTouched,
             markControlAsUntouched: markControlAsUntouched,

package/package.json

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

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

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

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

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