@reactables/forms 2.0.0-beta.9 → 2.0.0

package/dist/Helpers/addAsyncValidationEffects.d.ts

@@ -1,9 +1,11 @@
-import { Action, Effect } from '@reactables/core';
+import { Effect } from '@reactables/core';
 import { BaseControl } from '../Models/Controls';
-import { ControlAsyncValidationResponse } from '../Models/Payloads';
 import { RxFormProviders } from '../RxForm/RxForm';
-import { ControlRef } from '../Models';
-type ControlScopedEffect<T> = Effect<BaseControl<T>, ControlAsyncValidationResponse | ControlRef>;
+type ControlScopedEffect<T> = Effect;
 export declare const getScopedEffectsForControl: <T>(formControl: BaseControl<T>, providers: RxFormProviders) => ControlScopedEffect<T>[];
-export declare const getAsyncValidationEffects: (formControls: BaseControl<unknown>[]) => Action<BaseControl<unknown>>[];
+export declare const getAsyncValidationEffects: (formControls: BaseControl<unknown>[]) => {
+    type: string;
+    scopedEffects?: import("@reactables/core").ScopedEffects;
+    payload: BaseControl<unknown>;
+}[];
 export {};

package/dist/Helpers/buildFormState.d.ts

@@ -2,5 +2,5 @@ import { AbstractControlConfig } from '../Models/Configs';
 import { BaseForm, BaseFormState } from '../Models/Controls';
 import { ControlRef } from '../Models/ControlRef';
 import { RxFormProviders } from '../RxForm/RxForm';
-export declare const buildState: <T>(config: AbstractControlConfig, form: BaseForm<T>, controlRef: ControlRef, providers: RxFormProviders) => BaseForm<T>;
-export declare const buildFormState: <T>(config: AbstractControlConfig, form: BaseForm<T>, controlRef: ControlRef, providers: RxFormProviders) => BaseFormState<T>;
+export declare const buildState: <T>(config: AbstractControlConfig, controlRef: ControlRef | undefined, providers: RxFormProviders, form?: BaseForm<T>) => BaseForm<T>;
+export declare const buildFormState: <T>(config: AbstractControlConfig, controlRef: ControlRef | undefined, providers: RxFormProviders, form?: BaseForm<T>) => BaseFormState<T>;

package/dist/Helpers/buildHub2Source.d.ts

@@ -1,4 +1,4 @@
 import { Observable } from 'rxjs';
 import { Action } from '@reactables/core';
 import { BaseFormState } from '../Models/Controls';
-export declare const buildHub2Source: <T>(hub1State$: Observable<BaseFormState<T>>, initialBaseState: BaseFormState<T>) => Observable<Action<T>>;
+export declare const buildHub2Source: (hub1State$: Observable<BaseFormState<any>>, initialBaseState: BaseFormState<any>) => Observable<Action<any>>;

package/dist/Models/Controls.d.ts

@@ -19,9 +19,9 @@ interface AsyncFields {
     pending?: boolean;
 }
 interface ValidatedFields {
-    valid: boolean;
+    valid: boolean | null;
     errors: FormErrors;
-    childrenValid: boolean;
+    childrenValid: boolean | null;
 }
 export interface Hub2Fields extends AsyncFields, ValidatedFields {
 }
@@ -36,13 +36,14 @@ export interface BaseFormState<T> {
         [key: string]: BaseControl<unknown>;
     };
 }
-export interface BaseForm<T> {
-    root?: BaseControl<T>;
+export type BaseForm<T> = {
+    root: BaseControl<T>;
     [key: string]: BaseControl<unknown>;
-}
-export interface Form<T> {
-    root?: FormControl<T>;
+};
+export type Form<T> = {
+    root: FormControl<T>;
+} & {
     [key: string]: FormControl<unknown>;
-}
+};
 export declare const DEFAULT_HUB2_FIELDS: Hub2Fields;
 export {};

package/dist/Models/Validators.d.ts

@@ -1,5 +1,5 @@
 import { Observable } from 'rxjs';
 import { BaseControl } from './Controls';
 import { FormErrors } from './FormErrors';
-export type ValidatorFn = (value: unknown) => FormErrors;
+export type ValidatorFn = (value: any) => FormErrors;
 export type ValidatorAsyncFn = <T>(control$: Observable<BaseControl<T>>) => Observable<Observable<FormErrors>>;

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

@@ -1,4 +1,4 @@
 import { Action } from '@reactables/core';
 import { Form } from '../../Models/Controls';
 import { ControlRef } from '../../Models';
-export declare const asyncValidation: <T>(form: Form<T>, { payload: controlRef }: Action<ControlRef>) => Form<T>;
+export declare const asyncValidation: (form: Form<any> | null, { payload: controlRef }: Action<ControlRef>) => Form<any>;

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

@@ -1,4 +1,4 @@
 import { Action } from '@reactables/core';
 import { Form } from '../../Models/Controls';
 import { ControlAsyncValidationResponse } from '../../Models/Payloads';
-export declare const asyncValidationResponse: <T>(form: Form<T>, { payload: { key, validatorIndex, errors } }: Action<ControlAsyncValidationResponse>) => Form<T>;
+export declare const asyncValidationResponse: (form: Form<any> | null, { payload: { key, validatorIndex, errors } }: Action<ControlAsyncValidationResponse>) => Form<any>;

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

@@ -1,3 +1,3 @@
-import { Reducer } from '@reactables/core';
-import { Form } from '../../Models/Controls';
-export declare const formChange: Reducer<Form<unknown>>;
+import { Action } from '@reactables/core';
+import { BaseFormState, Form } from '../../Models/Controls';
+export declare const formChange: (state: (Form<any> | null) | undefined, { payload }: Action<BaseFormState<any>>) => Form<any>;

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

@@ -1,5 +1,5 @@
 import { Form, FormControl, BaseFormState } from '../../Models/Controls';
 export declare const mergeControls: <T>(state: Form<T>, { form, _changedControls, _removedControls }: BaseFormState<unknown>) => {
     [x: string]: FormControl<unknown>;
-    root?: FormControl<unknown>;
+    root: FormControl<unknown>;
 };

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

@@ -2,5 +2,5 @@ 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<unknown>;
+    root: FormControl<unknown>;
 };

package/dist/RxForm/RxForm.d.ts

@@ -29,27 +29,27 @@ export interface FormReducers {
     markControlAsUntouched: <T>(state: BaseFormState<T>, payload: ControlRef) => BaseFormState<T>;
     resetControl: <T>(state: BaseFormState<T>, payload: ControlRef) => BaseFormState<T>;
 }
-export type CustomReducerFunc<FormValue = unknown, Payload = unknown> = (reducers: FormReducers, state: BaseFormState<FormValue>, action: Action<Payload>) => BaseFormState<unknown>;
-export type CustomReducer<FormValue = unknown, Payload = unknown> = CustomReducerFunc<FormValue, Payload> | {
-    reducer: CustomReducerFunc<FormValue, Payload>;
-    effects?: Effect<unknown, unknown>[] | ((payload?: unknown) => ScopedEffects<unknown>);
+export type CustomReducerFunc<FormValue = unknown> = (reducers: FormReducers, state: BaseFormState<FormValue>, action: any) => BaseFormState<unknown>;
+export type CustomReducer<FormValue = unknown> = CustomReducerFunc<FormValue> | {
+    reducer: CustomReducerFunc<FormValue>;
+    effects?: Effect[] | ((payload?: unknown) => ScopedEffects);
 };
-export type ActionCreatorTypeFromCustomReducer<T> = T extends (reducers: FormReducers, state: BaseFormState<unknown>) => BaseFormState<unknown> ? () => void : T extends CustomReducerFunc<unknown, infer P> ? (payload: P) => void : T extends {
-    reducer: (reducers: FormReducers, state: BaseFormState<unknown>) => BaseFormState<unknown>;
+export type ActionCreatorTypeFromCustomReducer<T> = T extends (formReducers: FormReducers, state: any) => unknown ? () => void : T extends (formReducers: FormReducers, state: any, action: Action<infer P>) => unknown ? (payload: P) => void : T extends {
+    reducer: (formReducers: FormReducers, state: any) => unknown;
 } ? () => void : T extends {
-    reducer: CustomReducerFunc<unknown, infer P>;
+    reducer: (formReducers: FormReducers, state: any, action: Action<infer P>) => unknown;
 } ? (payload: P) => void : never;
-export interface RxFormOptions<T extends Record<string, CustomReducer> = Record<string, CustomReducer>> {
+export interface RxFormOptions<T extends Record<string, CustomReducer<any>> = Record<string, CustomReducer<any>>> {
     reducers?: T;
     providers?: RxFormProviders;
     name?: string;
     debug?: boolean;
-    sources?: Observable<Action<unknown>>[];
+    sources?: Observable<Action<any>>[];
 }
 type NormalizerFunction<T> = (value: T) => T;
 export interface RxFormProviders {
     normalizers?: {
-        [key: string]: NormalizerFunction<unknown>;
+        [key: string]: NormalizerFunction<any>;
     };
     validators?: {
         [key: string]: ValidatorFn;
@@ -58,7 +58,7 @@ export interface RxFormProviders {
         [key: string]: ValidatorAsyncFn;
     };
 }
-export declare const build: <FormValue, CustomReducers extends Record<string, CustomReducer<FormValue, unknown>> = Record<string, CustomReducer<FormValue, unknown>>>(config: AbstractControlConfig, options?: RxFormOptions<CustomReducers>) => Reactable<Form<FormValue>, { [K in keyof CustomReducers]: ActionCreatorTypeFromCustomReducer<CustomReducers[K]>; } & {
+export declare const build: <FormValue, CustomReducers extends Record<string, CustomReducer<FormValue>> = Record<string, CustomReducer<FormValue>>>(config: AbstractControlConfig, options?: RxFormOptions<CustomReducers>) => Reactable<Form<FormValue>, { [K in keyof CustomReducers]: ActionCreatorTypeFromCustomReducer<CustomReducers[K]>; } & {
     updateValues: <T>(payload: UpdateValuesPayload<T>) => void;
     addControl: (payload: AddControlPayload) => void;
     pushControl: (payload: PushControlPayload) => void;
@@ -68,9 +68,9 @@ export declare const build: <FormValue, CustomReducers extends Record<string, Cu
     markControlAsUntouched: (payload: ControlRef) => void;
     resetControl: (payload: ControlRef) => void;
 } & ActionMap & DestroyAction, CustomReducerActionTypes<CustomReducers> & FormActionTypes & {
-    destroy: 'destroy';
+    destroy: "destroy";
 }>;
-export declare const load: <FormValue, CustomReducers extends Record<string, CustomReducer<FormValue, unknown>> = Record<string, CustomReducer<FormValue, unknown>>>(state: Form<FormValue>, options?: RxFormOptions<CustomReducers>) => Reactable<Form<FormValue>, { [K in keyof CustomReducers]: ActionCreatorTypeFromCustomReducer<CustomReducers[K]>; } & {
+export declare const load: <FormValue, CustomReducers extends Record<string, CustomReducer<FormValue>> = Record<string, CustomReducer<FormValue>>>(state: Form<FormValue>, options?: RxFormOptions<CustomReducers>) => Reactable<Form<FormValue>, { [K in keyof CustomReducers]: ActionCreatorTypeFromCustomReducer<CustomReducers[K]>; } & {
     updateValues: <T>(payload: UpdateValuesPayload<T>) => void;
     addControl: (payload: AddControlPayload) => void;
     pushControl: (payload: PushControlPayload) => void;
@@ -80,7 +80,7 @@ export declare const load: <FormValue, CustomReducers extends Record<string, Cus
     markControlAsUntouched: (payload: ControlRef) => void;
     resetControl: (payload: ControlRef) => void;
 } & ActionMap & DestroyAction, CustomReducerActionTypes<CustomReducers> & FormActionTypes & {
-    destroy: 'destroy';
+    destroy: "destroy";
 }>;
 type CustomReducerActionTypes<T extends Record<string, CustomReducer>> = {
     [K in keyof T as `${K & string}`]: `${K & string}`;

package/dist/Testing/Models/initialState.d.ts

@@ -44,7 +44,7 @@ export declare const initialState: {
                 email: string;
             };
         };
-        controlRef: any[];
+        controlRef: never[];
         validatorErrors: {
             firstNameNotSameAsLast: boolean;
         };

package/dist/index.cjs

@@ -11,7 +11,7 @@ var DEFAULT_HUB2_FIELDS = {
     pending: false,
     valid: null,
     childrenValid: null,
-    errors: null
+    errors: {},
 };
 
 var Controls = /*#__PURE__*/Object.freeze({
@@ -32,7 +32,7 @@ var required = function (value) {
     return { required: false };
 };
 var arrayNotEmpty = function (value) { return ({
-    arrayNotEmpty: !Boolean(value.length)
+    arrayNotEmpty: !Boolean(value.length),
 }); };
 var email = function (value) {
     return value && !/^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$/g.test(value) ? { email: true } : { email: false };
@@ -149,16 +149,15 @@ var getErrors = function (control, value, _a) {
     var _b;
     var validators = _a.validators;
     return ((_b = control.config.validators) === null || _b === void 0 ? void 0 : _b.reduce(function (acc, validator) {
-        if (!validators[validator]) {
+        if (!(validators === null || validators === void 0 ? void 0 : validators[validator])) {
             throw "You have not provided a validator for \"".concat(validator, "\"");
         }
         return __assign(__assign({}, acc), validators[validator](value));
     }, {})) || {};
 };
 
-var buildState = function (config, form, controlRef, providers) {
+var buildState = function (config, controlRef, providers, form) {
     var _a;
-    if (form === void 0) { form = { root: null }; }
     if (controlRef === void 0) { controlRef = []; }
     var value = getValueFromControlConfig(config);
     var control = {
@@ -169,7 +168,7 @@ var buildState = function (config, form, controlRef, providers) {
         controlRef: controlRef,
         validatorErrors: {},
         config: config,
-        key: generateKey(5)
+        key: generateKey(5),
     };
     var newForm = __assign(__assign({}, form), (_a = {}, _a[getFormKey(controlRef)] = __assign(__assign({}, control), { validatorErrors: getErrors(control, value, providers) }), _a));
     var controls = config.controls;
@@ -177,22 +176,21 @@ var buildState = function (config, form, controlRef, providers) {
     if (controls && !(controls instanceof Array)) {
         newForm = Object.entries(config.controls).reduce(function (acc, _a) {
             var key = _a[0], controlConfig = _a[1];
-            return buildState(controlConfig, acc, controlRef.concat(key), providers);
+            return buildState(controlConfig, controlRef.concat(key), providers, acc);
         }, newForm);
     }
     else if (controls && controls instanceof Array) {
         // Adding controls for Form Array
         newForm = config.controls.reduce(function (acc, controlConfig, index) {
-            return buildState(controlConfig, acc, controlRef.concat(index), providers);
+            return buildState(controlConfig, controlRef.concat(index), providers, acc);
         }, newForm);
     }
     return newForm;
 };
-var buildFormState = function (config, form, controlRef, providers) {
-    if (form === void 0) { form = { root: null }; }
+var buildFormState = function (config, controlRef, providers, form) {
     if (controlRef === void 0) { controlRef = []; }
     return {
-        form: buildState(config, form, controlRef, providers)
+        form: buildState(config, controlRef, providers, form),
     };
 };
 
@@ -203,7 +201,8 @@ var getScopedEffectsForControl = function (formControl, providers) {
     if (asyncValidators && asyncValidators.length) {
         scopedEffects = asyncValidators.reduce(function (acc, asyncValidator, validatorIndex) {
             var effect = function (actions$) {
-                if (!providers.asyncValidators[asyncValidator]) {
+                var _a;
+                if (!((_a = providers.asyncValidators) === null || _a === void 0 ? void 0 : _a[asyncValidator])) {
                     throw "You have not provided an asyncValidator for \"".concat(asyncValidator, "\"");
                 }
                 return actions$.pipe(operators.map(function (_a) {
@@ -215,16 +214,16 @@ var getScopedEffectsForControl = function (formControl, providers) {
                         payload: {
                             key: key,
                             errors: errors,
-                            validatorIndex: validatorIndex
-                        }
+                            validatorIndex: validatorIndex,
+                        },
                     }); }), operators.catchError(function () {
                         return rxjs.of({
                             type: 'asyncValidationResponse',
                             payload: {
                                 key: key,
                                 errors: { asyncValidationApiError: true },
-                                validatorIndex: validatorIndex
-                            }
+                                validatorIndex: validatorIndex,
+                            },
                         });
                     })));
                 }));
@@ -283,7 +282,7 @@ var updateAncestorValues = function (form, _a, providers) {
         }
         var newParentControl = __assign(__assign({}, parentControl), { validatorErrors: getErrors(parentControl, newValue, providers), value: newValue, dirty: !isEqual(newValue, parentControl.pristineValue) });
         return updateAncestorValues(__assign(__assign({}, form), (_c = {}, _c[parentFormKey] = newParentControl, _c)), {
-            payload: { controlRef: parentRef, value: newValue }
+            payload: { controlRef: parentRef, value: newValue },
         }, providers);
     }
     return form;
@@ -305,7 +304,7 @@ var getDescendantControls = function (controlRef, form, excludeSelf) {
     }
     var control = getControl(controlRef, form);
     var value = control.value, config = control.config;
-    var descendants;
+    var descendants = [];
     if (Array.isArray(config.controls)) {
         // If control is a Form Array
         descendants = value.reduce(function (acc, item, index) {
@@ -331,11 +330,11 @@ var getAncestorControls = function (controlRef, form, excludeSelf) {
         var formControls = acc.formControls.concat(getControl(currentRef, form));
         return {
             currentRef: currentRef,
-            formControls: formControls
+            formControls: formControls,
         };
     }, {
         currentRef: [],
-        formControls: []
+        formControls: [],
     }).formControls;
     var root = form['root'];
     var result = [root].concat(formControls);
@@ -407,7 +406,7 @@ var updateDescendantValues = function (form, _a, providers) {
             if (configControls) {
                 checkKeys(oldChildValue, newChildValue);
                 acc = updateDescendantValues(acc, {
-                    payload: { controlRef: control.controlRef, value: newChildValue }
+                    payload: { controlRef: control.controlRef, value: newChildValue },
                 }, providers);
             }
         }
@@ -419,10 +418,11 @@ var updateDescendantValues = function (form, _a, providers) {
 // Use AddControlPayload/RemoveControl action reducers to add/remove control
 var updateValues = function (_a, action, providers, mergeChanges) {
     var _b, _c;
-    var form = _a.form, _d = _a._changedControls, _changedControls = _d === void 0 ? {} : _d, _e = _a._removedControls, _removedControls = _e === void 0 ? {} : _e;
+    var _d;
+    var form = _a.form, _e = _a._changedControls, _changedControls = _e === void 0 ? {} : _e, _f = _a._removedControls, _removedControls = _f === void 0 ? {} : _f;
     if (mergeChanges === void 0) { mergeChanges = false; }
     var normalizers = providers.normalizers;
-    var _f = action.payload, controlRef = _f.controlRef, value = _f.value;
+    var _g = action.payload, controlRef = _g.controlRef, value = _g.value;
     controlRefCheck(controlRef);
     // Update its own value
     var ctrlKey = getFormKey(controlRef);
@@ -430,8 +430,8 @@ var updateValues = function (_a, action, providers, mergeChanges) {
     var oldValue = form[ctrlKey].value;
     var config = form[ctrlKey].config;
     if (config.normalizers) {
-        newValue = config.normalizers.reduce(function (acc, normalizer) {
-            if (!normalizers[normalizer]) {
+        newValue = (_d = config.normalizers) === null || _d === void 0 ? void 0 : _d.reduce(function (acc, normalizer) {
+            if (!(normalizers === null || normalizers === void 0 ? void 0 : normalizers[normalizer])) {
                 throw "You have not provided a normalizer for \"".concat(normalizer, "\"");
             }
             return normalizers[normalizer](acc);
@@ -441,7 +441,7 @@ var updateValues = function (_a, action, providers, mergeChanges) {
     var newControl = __assign(__assign({}, form[ctrlKey]), { validatorErrors: validatorErrors, dirty: !isEqual(value, form[ctrlKey].pristineValue), value: newValue });
     var result = {
         form: __assign(__assign({}, form), (_b = {}, _b[ctrlKey] = newControl, _b)),
-        _changedControls: (_c = {}, _c[newControl.key] = newControl, _c)
+        _changedControls: (_c = {}, _c[newControl.key] = newControl, _c),
     };
     var configControls = config.controls;
     // Update its descendants
@@ -450,8 +450,8 @@ var updateValues = function (_a, action, providers, mergeChanges) {
         var updatedDescendants = updateDescendantValues(result.form, {
             payload: {
                 controlRef: controlRef,
-                value: newValue
-            }
+                value: newValue,
+            },
         }, providers);
         var changedDescendantControls = getDescendantControls(controlRef, updatedDescendants).reduce(function (acc, control) {
             var _a;
@@ -462,7 +462,7 @@ var updateValues = function (_a, action, providers, mergeChanges) {
     // Update its Ancestors
     if (controlRef.length) {
         result = __assign(__assign({}, result), { form: updateAncestorValues(result.form, {
-                payload: { controlRef: controlRef, value: newValue }
+                payload: { controlRef: controlRef, value: newValue },
             }, providers) });
     }
     var changedAncestorControls = getAncestorControls(controlRef, result.form).reduce(function (acc, control) {
@@ -493,7 +493,7 @@ var updateAncestorValuesRemoveControl = function (form, _a, providers) {
         }
         var newParentControl = __assign(__assign({}, parentControl), { value: newValue, validatorErrors: getErrors(parentControl, newValue, providers), dirty: !isEqual(newValue, parentControl.pristineValue) });
         return updateAncestorValues(__assign(__assign({}, form), (_b = {}, _b[parentFormKey] = newParentControl, _b)), {
-            payload: { controlRef: parentRef, value: newValue }
+            payload: { controlRef: parentRef, value: newValue },
         }, providers);
     }
     return form;
@@ -547,7 +547,7 @@ var removeControl = function (state, action, providers, mergeChanges) {
         return __assign(__assign({}, acc), (_c = {}, _c[key] = control, _c));
     }, {});
     var result = updateAncestorValuesRemoveControl(controlRemoved, {
-        payload: controlRef
+        payload: controlRef,
     }, providers);
     var _changedControls = __assign(__assign({}, (mergeChanges ? state._changedControls || {} : undefined)), getAncestorControls(controlRef.slice(0, -1), result).reduce(function (acc, control) {
         var _a;
@@ -588,7 +588,7 @@ var removeControl = function (state, action, providers, mergeChanges) {
     return {
         form: result,
         _changedControls: _changedControls,
-        _removedControls: _removedControls
+        _removedControls: _removedControls,
     };
 };
 
@@ -611,7 +611,7 @@ var updateAncestorValuesAddControl = function (form, _a, providers) {
         }
         var newParentControl = __assign(__assign({}, parentControl), { value: newValue, validatorErrors: getErrors(parentControl, newValue, providers), dirty: !isEqual(newValue, parentControl.pristineValue) });
         return updateAncestorValues(__assign(__assign({}, form), (_c = {}, _c[parentFormKey] = newParentControl, _c)), {
-            payload: { controlRef: parentRef, value: newValue }
+            payload: { controlRef: parentRef, value: newValue },
         }, providers);
     }
     return form;
@@ -631,10 +631,10 @@ var addControl = function (state, action, providers, mergeChanges) {
     if (!getControl(controlRef.slice(0, -1), state.form)) {
         throw 'You are attempting to add a control to a non-existent form group';
     }
-    var newForm = buildState(config, state.form, controlRef, providers);
+    var newForm = buildState(config, controlRef, providers, state.form);
     var newValue = getControl(controlRef, newForm).value;
     var ancestorsUpdated = updateAncestorValuesAddControl(newForm, {
-        payload: { controlRef: controlRef, value: newValue }
+        payload: { controlRef: controlRef, value: newValue },
     }, providers);
     var _changedControls = getControlBranch(controlRef, ancestorsUpdated).reduce(function (acc, control) {
         var _a;
@@ -643,7 +643,7 @@ var addControl = function (state, action, providers, mergeChanges) {
     return {
         form: ancestorsUpdated,
         _changedControls: __assign(__assign({}, (mergeChanges ? state._changedControls || {} : undefined)), _changedControls),
-        _removedControls: mergeChanges ? state._removedControls || {} : undefined
+        _removedControls: mergeChanges ? state._removedControls || {} : undefined,
     };
 };
 
@@ -662,10 +662,10 @@ var pushControl = function (state, action, providers, mergeChanges) {
     else {
         throw 'You are attempting to push to a control that is not a Form Array';
     }
-    var newForm = buildState(config, state.form, newControlRef, providers);
+    var newForm = buildState(config, newControlRef, providers, state.form);
     var newValue = getControl(newControlRef, newForm).value;
     var ancestorsUpdated = updateAncestorValuesAddControl(newForm, {
-        payload: { controlRef: newControlRef, value: newValue }
+        payload: { controlRef: newControlRef, value: newValue },
     }, providers);
     var _changedControls = getControlBranch(newControlRef, ancestorsUpdated).reduce(function (acc, control) {
         var _a;
@@ -674,7 +674,7 @@ var pushControl = function (state, action, providers, mergeChanges) {
     return {
         form: ancestorsUpdated,
         _changedControls: __assign(__assign({}, (mergeChanges ? state._changedControls || {} : undefined)), _changedControls),
-        _removedControls: mergeChanges ? state._removedControls || {} : undefined
+        _removedControls: mergeChanges ? state._removedControls || {} : undefined,
     };
 };
 
@@ -705,7 +705,7 @@ var updateAncestorPristineValues = function (form, _a) {
         }
         var newParentControl = __assign(__assign({}, form[parentKey]), { pristineValue: newValue, dirty: isEqual(form[parentKey].value, newValue) });
         return updateAncestorPristineValues(__assign(__assign({}, form), (_b = {}, _b[parentKey] = newParentControl, _b)), {
-            payload: parentRef
+            payload: parentRef,
         });
     }
     return form;
@@ -723,7 +723,7 @@ var markControlAsPristine = function (state, action, mergeChanges) {
     var result = __assign(__assign({}, form), descendants);
     if (controlRef.length) {
         result = updateAncestorPristineValues(result, {
-            payload: controlRef
+            payload: controlRef,
         });
     }
     var _changedControls = getControlBranch(controlRef, result).reduce(function (acc, control) {
@@ -733,7 +733,7 @@ var markControlAsPristine = function (state, action, mergeChanges) {
     return {
         form: result,
         _changedControls: __assign(__assign({}, (mergeChanges ? state._changedControls || {} : undefined)), _changedControls),
-        _removedControls: mergeChanges ? state._removedControls || {} : undefined
+        _removedControls: mergeChanges ? state._removedControls || {} : undefined,
     };
 };
 
@@ -755,7 +755,7 @@ var markControlAsTouched = function (state, action, mergeChanges) {
     return {
         form: __assign(__assign({}, form), controls),
         _changedControls: __assign(__assign({}, (mergeChanges ? state._changedControls || {} : undefined)), _changedControls),
-        _removedControls: mergeChanges ? state._removedControls || {} : undefined
+        _removedControls: mergeChanges ? state._removedControls || {} : undefined,
     };
 };
 
@@ -785,7 +785,7 @@ var markControlAsUntouched = function (state, action, mergeChanges) {
     return {
         form: result,
         _changedControls: __assign(__assign({}, (mergeChanges ? state._changedControls || {} : undefined)), _changedControls),
-        _removedControls: mergeChanges ? state._removedControls || {} : undefined
+        _removedControls: mergeChanges ? state._removedControls || {} : undefined,
     };
 };
 
@@ -806,10 +806,10 @@ var resetControl = function (state, action, providers, mergeChanges) {
         delete descendantsRemoved[key];
     });
     // Remove all descendants
-    var restoredControls = buildState(controlToReset.config, descendantsRemoved, controlToReset.controlRef, providers);
+    var restoredControls = buildState(controlToReset.config, controlToReset.controlRef, providers, descendantsRemoved);
     var restoredControlValue = getControl(controlRef, restoredControls).value;
     var result = updateAncestorValues(restoredControls, {
-        payload: { controlRef: controlRef, value: restoredControlValue }
+        payload: { controlRef: controlRef, value: restoredControlValue },
     }, providers);
     var _changedControls = __assign(__assign({}, (mergeChanges ? state._changedControls || {} : undefined)), getControlBranch(controlRef, result).reduce(function (acc, control) {
         var _a;
@@ -828,7 +828,7 @@ var resetControl = function (state, action, providers, mergeChanges) {
     return {
         form: result,
         _changedControls: _changedControls,
-        _removedControls: _removedControls
+        _removedControls: _removedControls,
     };
 };
 
@@ -836,12 +836,14 @@ var asyncValidation = function (form, _a) {
     var controlRef = _a.payload;
     var updatedSelfAndAncestors = getAncestorControls(controlRef, form).reduce(function (acc, control) {
         var _a;
+        var _b;
         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) {
+                ? __assign({}, (_b = control.config.asyncValidators) === null || _b === void 0 ? void 0 : _b.reduce(function (acc, _, index) {
                     var _a;
                     return (__assign(__assign({}, acc), (_a = {}, _a[index] = true, _a)));
-                }, {})) : control.asyncValidateInProgress }), _a));
+                }, {}))
+                : control.asyncValidateInProgress }), _a));
     }, {});
     return __assign(__assign({}, form), updatedSelfAndAncestors);
 };
@@ -1062,7 +1064,7 @@ var control = function (config) {
             var indexMap = {
                 0: 'initialValue',
                 1: 'validators',
-                2: 'asyncValidators'
+                2: 'asyncValidators',
             };
             return __assign(__assign({}, acc), (_a = {}, _a[indexMap[index]] = index < 1 ? item : [].concat(item || []), _a));
         }, {});
@@ -1095,7 +1097,7 @@ var reducerTools = function (providers) { return ({
     },
     markControlAsUntouched: function (state, payload) {
         return markControlAsUntouched(state, { payload: payload }, true);
-    }
+    },
 }); };
 var build = function (config, options) {
     var _a, _b, _c;
@@ -1103,9 +1105,9 @@ var build = function (config, options) {
     var providers = {
         normalizers: __assign({}, (_a = options.providers) === null || _a === void 0 ? void 0 : _a.normalizers),
         validators: __assign(__assign({}, Validators), (_b = options.providers) === null || _b === void 0 ? void 0 : _b.validators),
-        asyncValidators: __assign({}, (_c = options.providers) === null || _c === void 0 ? void 0 : _c.asyncValidators)
+        asyncValidators: __assign({}, (_c = options.providers) === null || _c === void 0 ? void 0 : _c.asyncValidators),
     };
-    var initialState = buildFormState(config, undefined, undefined, providers);
+    var initialState = buildFormState(config, undefined, providers);
     return createReactable(initialState, options);
 };
 var load = function (state, options) {
@@ -1124,7 +1126,7 @@ var load = function (state, options) {
                 var key = _a[0], value = _a[1];
                 return (__assign(__assign({}, acc), (_b = {}, _b[key] = value, _b)));
             }, {}), _b));
-        }, {})
+        }, {}),
     };
     return createReactable(baseFormState, options);
 };
@@ -1134,7 +1136,7 @@ var createReactable = function (initialBaseState, options, initialFormState) {
     var providers = {
         normalizers: __assign({}, (_a = options.providers) === null || _a === void 0 ? void 0 : _a.normalizers),
         validators: __assign(__assign({}, Validators), (_b = options.providers) === null || _b === void 0 ? void 0 : _b.validators),
-        asyncValidators: __assign({}, (_c = options.providers) === null || _c === void 0 ? void 0 : _c.asyncValidators)
+        asyncValidators: __assign({}, (_c = options.providers) === null || _c === void 0 ? void 0 : _c.asyncValidators),
     };
     var reducers = options.reducers, debug = options.debug, name = options.name, otherOptions = __rest(options, ["reducers", "debug", "name"]);
     var customReducers = Object.entries(reducers || {}).reduce(function (acc, _a) {
@@ -1147,7 +1149,7 @@ var createReactable = function (initialBaseState, options, initialFormState) {
                 var form = _a.form;
                 return _reducer(reducerTools(providers), { form: form }, action);
             },
-            effects: effects
+            effects: effects,
         }, _b));
     }, {});
     var _d = core.RxBuilder(__assign({ initialState: initialBaseState, name: "Stage 1 ".concat(name ? name : 'rxForm'), debug: debug, reducers: __assign({ updateValues: function (state, action) {
@@ -1174,20 +1176,21 @@ var createReactable = function (initialBaseState, options, initialFormState) {
                 reducer: function (state) { return state; },
                 effects: function (control) { return ({
                     key: control.key,
-                    effects: getScopedEffectsForControl(control, providers)
-                }); }
+                    effects: getScopedEffectsForControl(control, providers),
+                }); },
             },
             asyncValidation: asyncValidation,
-            asyncValidationResponse: asyncValidationResponse
-        }
+            asyncValidationResponse: asyncValidationResponse,
+        },
     }), state$ = _e[0], hub2Actions = _e[1];
     var destroy = function () {
         hub1Actions.destroy();
         hub2Actions.destroy();
     };
+    var actions = __assign(__assign({}, hub1Actions), { destroy: destroy });
     return [
         state$.pipe(operators.filter(function (form) { return form !== null; })),
-        __assign(__assign({}, hub1Actions), { destroy: destroy }),
+        actions,
         hub1Actions$,
     ];
 };