@reactables/forms 0.7.0-alpha.8 → 0.7.1-alpha.1

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, S>(hub1State$: Observable<BaseFormState<T>>) => Observable<Action<T>>;
+export declare const buildHub2Source: <T>(hub1State$: Observable<BaseFormState<T>>) => Observable<Action<T>>;

package/dist/RxForm/RxForm.d.ts

@@ -1,4 +1,4 @@
-import { Reactable, EffectsAndSources, Action, Effect, ScopedEffects } from '@reactables/core';
+import { Reactable, EffectsAndSources, Action, Effect, ScopedEffects, ActionMap } from '@reactables/core';
 import { UpdateValuesPayload, AddControlPayload, MarkTouchedPayload, PushControlPayload } from '../Models/Payloads';
 import { ControlRef } from '../Models';
 import { FormControlConfig, FormArrayConfig, FormGroupConfig, AbstractControlConfig } from '../Models/Configs';
@@ -33,12 +33,17 @@ export type CustomReducer = CustomReducerFunc | {
     reducer: CustomReducerFunc;
     effects?: ((payload?: unknown) => ScopedEffects<unknown>) | Effect<unknown, unknown>[];
 };
-export interface CustomReducers {
-    [key: string]: CustomReducer;
-}
-export interface RxFormOptions<T extends CustomReducers> extends EffectsAndSources {
-    reducers?: T;
+export type CustomReducers<T> = {
+    [key in keyof (T & {
+        [key: string]: CustomReducer;
+    })]: CustomReducer;
+};
+export interface RxFormOptions extends EffectsAndSources {
+    reducers?: CustomReducers<unknown>;
     providers?: RxFormProviders;
+    name?: string;
+    debug?: boolean;
+    storeValue?: boolean;
 }
 type NormalizerFunction<T> = (value: T) => T;
 export interface RxFormProviders {
@@ -52,6 +57,6 @@ export interface RxFormProviders {
         [key: string]: ValidatorAsyncFn;
     };
 }
-export declare const build: <T extends CustomReducers>(config: AbstractControlConfig, options?: RxFormOptions<T>) => Reactable<Form<unknown>, { [K in keyof T]: (payload?: any) => void; } & RxFormActions>;
-export declare const load: <T extends CustomReducers>(state: Form<unknown>, options?: RxFormOptions<T>) => Reactable<Form<unknown>, { [K in keyof T]: (payload?: any) => void; } & RxFormActions>;
+export declare const build: (config: AbstractControlConfig, options?: RxFormOptions) => Reactable<Form<unknown>, ActionMap & RxFormActions>;
+export declare const load: (state: Form<unknown>, options?: RxFormOptions) => Reactable<Form<unknown>, ActionMap & RxFormActions>;
 export {};

package/dist/Validators/Validators.d.ts

@@ -1,3 +1,4 @@
 import { ValidatorFn } from '../Models/Validators';
 export declare const required: ValidatorFn;
+export declare const arrayNotEmpty: ValidatorFn;
 export declare const email: ValidatorFn;

package/dist/index.js

@@ -26,17 +26,20 @@ var Controls = /*#__PURE__*/Object.freeze({
 });
 
 var required = function (value) {
-    if (Array.isArray(value)) {
-        return { required: !Boolean(value.length) };
-    }
     if (typeof value === 'string' || typeof value === 'object') {
         return { required: !Boolean(value) };
     }
     if (typeof value === 'number') {
         return { required: !(value !== undefined && value !== null) };
     }
+    if (typeof value === 'boolean') {
+        return { required: !value };
+    }
     return { required: false };
 };
+var arrayNotEmpty = function (value) { return ({
+    arrayNotEmpty: !Boolean(value.length)
+}); };
 var email = function (value) {
     return value && !/^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$/g.test(value) ? { email: true } : { email: false };
 };
@@ -44,12 +47,14 @@ var email = function (value) {
 var Validators = /*#__PURE__*/Object.freeze({
   __proto__: null,
   required: required,
+  arrayNotEmpty: arrayNotEmpty,
   email: email
 });
 
 var index = /*#__PURE__*/Object.freeze({
   __proto__: null,
   required: required,
+  arrayNotEmpty: arrayNotEmpty,
   email: email
 });
 
@@ -332,34 +337,28 @@ var getAncestorControls = function (controlRef, form, excludeSelf) {
 };
 
 var UPDATE_DESCENDANT_VALUES = 'UPDATE_DESCENDANT_VALUES';
-var updateDescendants = function (state, _a, providers) {
+var updateDescendantValues = function (form, _a, providers) {
     var _b = _a.payload, controlRef = _b.controlRef, value = _b.value;
-    var descendants = getDescendantControls(controlRef, state.form, true).map(function (control) { return [getFormKey(control.controlRef), control]; });
+    var descendants = getDescendantControls(controlRef, form, true).map(function (control) { return [getFormKey(control.controlRef), control]; });
     var result = descendants.reduce(function (acc, _a) {
-        var _b, _c;
+        var _b;
         var key = _a[0], control = _a[1];
         if (isChildRef(control.controlRef, controlRef)) {
             var childValue = value[control.controlRef.at(-1)];
-            var validatorErrors = getErrors(control, value, providers);
+            var validatorErrors = getErrors(control, childValue, providers);
             var newControl = __assign(__assign({}, control), { value: childValue, validatorErrors: validatorErrors, dirty: !isEqual__default["default"](childValue, control.pristineValue) });
-            acc = {
-                form: __assign(__assign({}, acc.form), (_b = {}, _b[key] = newControl, _b)),
-                changedControls: __assign(__assign({}, acc.changedControls), (_c = {}, _c[newControl.key] = newControl, _c))
-            };
+            acc = __assign(__assign({}, acc), (_b = {}, _b[key] = newControl, _b));
             var configControls = control.config.controls;
             if (configControls) {
-                acc = updateDescendants(acc, {
+                acc = updateDescendantValues(acc, {
                     type: UPDATE_DESCENDANT_VALUES,
                     payload: { controlRef: control.controlRef, value: childValue }
                 }, providers);
             }
         }
         return acc;
-    }, { form: {}, changedControls: {} });
-    return {
-        form: __assign(__assign({}, state.form), result.form),
-        changedControls: __assign({}, result.changedControls)
-    };
+    }, form);
+    return result;
 };
 // Will only update child controls that are present.
 // Use AddControlPayload/RemoveControl action reducers to add/remove control
@@ -388,15 +387,20 @@ var updateValues = function (_a, action, providers, mergeChanges) {
         changedControls: (_c = {}, _c[newControl.key] = newControl, _c)
     };
     var configControls = config.controls;
-    // Update its children
+    // Update its descendants
     if (configControls) {
-        result = updateDescendants(result, {
+        var updatedDescendants = updateDescendantValues(result.form, {
             type: UPDATE_DESCENDANT_VALUES,
             payload: {
                 controlRef: controlRef,
                 value: newValue
             }
         }, providers);
+        var changedDescendantControls = getDescendantControls(controlRef, updatedDescendants).reduce(function (acc, control) {
+            var _a;
+            return (__assign(__assign({}, acc), (_a = {}, _a[control.key] = control, _a)));
+        }, {});
+        result = __assign(__assign({}, result), { form: updatedDescendants, changedControls: __assign(__assign({}, result.changedControls), changedDescendantControls) });
     }
     // Update its Ancestors
     if (controlRef.length) {
@@ -1082,7 +1086,7 @@ var createReactable = function (initialBaseState, options, initialFormState) {
         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)
     };
-    var reducers = options.reducers, otherOptions = __rest(options, ["reducers"]);
+    var reducers = options.reducers, debug = options.debug, name = options.name, storeValue = options.storeValue, otherOptions = __rest(options, ["reducers", "debug", "name", "storeValue"]);
     var customReducers = Object.entries(reducers || {}).reduce(function (acc, _a) {
         var _b;
         var key = _a[0], _case = _a[1];
@@ -1096,7 +1100,7 @@ var createReactable = function (initialBaseState, options, initialFormState) {
             effects: effects
         }, _b));
     }, {});
-    var _d = core.RxBuilder(__assign({ initialState: initialBaseState, reducers: __assign({ updateValues: function (state, action, mergeChanges) {
+    var _d = core.RxBuilder(__assign({ initialState: initialBaseState, name: "Stage 1 ".concat(name ? name : 'rxForm'), debug: debug, storeValue: storeValue, reducers: __assign({ updateValues: function (state, action, mergeChanges) {
                 return updateValues(state, action, providers, mergeChanges);
             }, removeControl: function (state, action, mergeChanges) {
                 return removeControl(state, action, providers, mergeChanges);
@@ -1110,6 +1114,9 @@ var createReactable = function (initialBaseState, options, initialFormState) {
     var state$ = core.RxBuilder({
         sources: [buildHub2Source(hub1State$).pipe(operators.skip(initialFormState ? 1 : 0))],
         initialState: initialFormState || null,
+        name: "Stage 2 ".concat(name ? name : 'rxForm'),
+        debug: debug,
+        storeValue: storeValue,
         reducers: {
             formChange: formChange,
             asyncValidation: {

package/package.json

@@ -14,7 +14,7 @@
   "author": "David Lai",
   "license": "ISC",
   "dependencies": {
-    "@reactables/core": "^0.7.0-alpha.8",
+    "@reactables/core": "^0.7.1-alpha.1",
     "lodash.isequal": "^4.5.0"
   },
   "peerDependencies": {
@@ -23,5 +23,5 @@
   "devDependencies": {
     "lodash.clonedeep": "^4.5.0"
   },
-  "version": "0.7.0-alpha.8"
+  "version": "0.7.1-alpha.1"
 }