@reactables/forms 1.3.0-alpha.3 → 1.3.0-beta-2

package/dist/RxForm/RxForm.d.ts

@@ -28,7 +28,7 @@ export interface FormReducers {
     markControlAsUntouched: <T>(state: BaseFormState<T>, payload: ControlRef) => BaseFormState<T>;
     resetControl: <T>(state: BaseFormState<T>, payload: ControlRef) => BaseFormState<T>;
 }
-export type CustomReducerFunc = (reducers: FormReducers, state: BaseFormState<unknown>, action: Action<unknown>) => BaseFormState<unknown>;
+export type CustomReducerFunc<T = unknown> = (reducers: FormReducers, state: BaseFormState<unknown>, action: Action<T>) => BaseFormState<unknown>;
 export type CustomReducer = CustomReducerFunc | {
     reducer: CustomReducerFunc;
     effects?: Effect<unknown, unknown>[] | ((payload?: unknown) => ScopedEffects<unknown>);
@@ -38,8 +38,13 @@ export type CustomReducers<T> = {
         [key: string]: CustomReducer;
     })]: CustomReducer;
 };
-export interface RxFormOptions extends EffectsAndSources {
-    reducers?: CustomReducers<unknown>;
+export type ActionCreatorTypeFromCustomReducer<T> = T extends (reducers: FormReducers, state: BaseFormState<unknown>) => BaseFormState<unknown> ? () => void : T extends CustomReducerFunc<infer P> ? (payload: P) => void : T extends {
+    reducer: (reducers: FormReducers, state: BaseFormState<unknown>) => BaseFormState<unknown>;
+} ? () => void : T extends {
+    reducer: CustomReducerFunc<infer P>;
+} ? (payload: P) => void : never;
+export interface RxFormOptions<T extends CustomReducers<unknown> = CustomReducers<unknown>> extends EffectsAndSources {
+    reducers?: T;
     providers?: RxFormProviders;
     name?: string;
     debug?: boolean;
@@ -57,6 +62,38 @@ export interface RxFormProviders {
         [key: string]: ValidatorAsyncFn;
     };
 }
-export declare const build: <Value, Actions = RxFormActions>(config: AbstractControlConfig, options?: RxFormOptions) => Reactable<Form<Value>, Actions>;
-export declare const load: <Value, Actions = RxFormActions>(state: Form<Value>, options?: RxFormOptions) => Reactable<Form<Value>, Actions>;
+export declare const build: <T extends CustomReducers<unknown>>(config: AbstractControlConfig, options?: RxFormOptions<T>) => Reactable<Form<unknown>, { [K in keyof T]: ActionCreatorTypeFromCustomReducer<T[K]>; } & {
+    updateValues: <T_1>(payload: UpdateValuesPayload<T_1>) => void;
+    addControl: (payload: AddControlPayload) => void;
+    pushControl: (payload: PushControlPayload) => void;
+    removeControl: (payload: ControlRef) => void;
+    markControlAsPristine: (payload: ControlRef) => void;
+    markControlAsTouched: (payload: MarkTouchedPayload) => void;
+    markControlAsUntouched: (payload: ControlRef) => void;
+    resetControl: (payload: ControlRef) => void;
+} & ActionMap, ActionTypes<T>>;
+export declare const load: <Value, T extends CustomReducers<unknown>>(state: Form<Value>, options?: RxFormOptions<T>) => Reactable<Form<unknown>, { [K in keyof T]: ActionCreatorTypeFromCustomReducer<T[K]>; } & {
+    updateValues: <T_1>(payload: UpdateValuesPayload<T_1>) => void;
+    addControl: (payload: AddControlPayload) => void;
+    pushControl: (payload: PushControlPayload) => void;
+    removeControl: (payload: ControlRef) => void;
+    markControlAsPristine: (payload: ControlRef) => void;
+    markControlAsTouched: (payload: MarkTouchedPayload) => void;
+    markControlAsUntouched: (payload: ControlRef) => void;
+    resetControl: (payload: ControlRef) => void;
+} & ActionMap, ActionTypes<T>>;
+type CustomReducerActionTypes<T extends CustomReducers<unknown>> = {
+    [K in keyof T as `${K & string}`]: `${K & string}`;
+};
+type FormActionTypes = {
+    updateValues: 'updateValues';
+    addControl: 'addControl';
+    pushControl: 'pushControl';
+    removeControl: 'removeControl';
+    markControlAsPristine: 'markControlAsPristine';
+    markControlAsTouched: 'markControlAsTouched';
+    markControlAsUntouched: 'markControlAsUntouched';
+    resetControl: 'resetControl';
+};
+type ActionTypes<T extends CustomReducers<unknown>> = CustomReducerActionTypes<T> & FormActionTypes;
 export {};

package/dist/RxForm/Tests/combinedTest.test.d.ts

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

package/dist/index.js

@@ -1152,17 +1152,19 @@ var createReactable = function (initialBaseState, options, initialFormState) {
             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, mergeChanges) {
-                return updateValues(state, action, providers, mergeChanges);
-            }, removeControl: function (state, action, mergeChanges) {
-                return removeControl(state, action, providers, mergeChanges);
-            }, addControl: function (state, action, mergeChanges) {
-                return addControl(state, action, providers, mergeChanges);
-            }, pushControl: function (state, action, mergeChanges) {
-                return pushControl(state, action, providers, mergeChanges);
-            }, resetControl: function (state, action, mergeChanges) {
-                return resetControl(state, action, providers, mergeChanges);
-            }, markControlAsPristine: markControlAsPristine, markControlAsTouched: markControlAsTouched, markControlAsUntouched: markControlAsUntouched }, customReducers) }, otherOptions)), hub1State$ = _d[0], hub1Actions = _d[1], hub1Actions$ = _d[2];
+    var _d = core.RxBuilder(__assign({ initialState: initialBaseState, name: "Stage 1 ".concat(name ? name : 'rxForm'), debug: debug, reducers: __assign({ updateValues: function (state, action) {
+                return updateValues(state, action, providers);
+            }, removeControl: function (state, action) { return removeControl(state, action, providers); }, addControl: function (state, action) {
+                return addControl(state, action, providers);
+            }, pushControl: function (state, action) {
+                return pushControl(state, action, providers);
+            }, resetControl: function (state, action) { return resetControl(state, action, providers); }, markControlAsPristine: function (state, action) {
+                return markControlAsPristine(state, action);
+            }, markControlAsTouched: function (state, action) {
+                return markControlAsTouched(state, action);
+            }, markControlAsUntouched: function (state, action) {
+                return markControlAsUntouched(state, action);
+            } }, customReducers) }, otherOptions)), hub1State$ = _d[0], hub1Actions = _d[1], hub1Actions$ = _d[2];
     var state$ = core.RxBuilder({
         sources: [buildHub2Source(hub1State$, initialBaseState).pipe(operators.skip(initialFormState ? 1 : 0))],
         initialState: initialFormState || null,

package/package.json

@@ -14,7 +14,7 @@
   "author": "David Lai",
   "license": "ISC",
   "dependencies": {
-    "@reactables/core": "^1.3.0-alpha.3",
+    "@reactables/core": "^1.3.0-beta-2",
     "lodash.isequal": "^4.5.0"
   },
   "peerDependencies": {
@@ -23,5 +23,5 @@
   "devDependencies": {
     "lodash.clonedeep": "^4.5.0"
   },
-  "version": "1.3.0-alpha.3"
+  "version": "1.3.0-beta-2"
 }