@reactables/forms 2.0.0-beta.2 → 2.0.0-beta.3

package/dist/RxForm/RxForm.d.ts

@@ -29,22 +29,17 @@ export interface FormReducers {
     markControlAsUntouched: <T>(state: BaseFormState<T>, payload: ControlRef) => BaseFormState<T>;
     resetControl: <T>(state: BaseFormState<T>, payload: ControlRef) => BaseFormState<T>;
 }
-export type CustomReducerFunc<T = unknown> = (reducers: FormReducers, state: BaseFormState<unknown>, action: Action<T>) => BaseFormState<unknown>;
-export type CustomReducer = CustomReducerFunc | {
-    reducer: CustomReducerFunc;
+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 CustomReducers<T> = {
-    [key in keyof (T & {
-        [key: string]: CustomReducer;
-    })]: CustomReducer;
-};
-export type ActionCreatorTypeFromCustomReducer<T> = T extends (reducers: FormReducers, state: BaseFormState<unknown>) => BaseFormState<unknown> ? () => void : T extends CustomReducerFunc<infer P> ? (payload: P) => void : T extends {
+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>;
 } ? () => void : T extends {
-    reducer: CustomReducerFunc<infer P>;
+    reducer: CustomReducerFunc<unknown, infer P>;
 } ? (payload: P) => void : never;
-export interface RxFormOptions<T extends CustomReducers<unknown> = CustomReducers<unknown>> {
+export interface RxFormOptions<T extends Record<string, CustomReducer> = Record<string, CustomReducer>> {
     reducers?: T;
     providers?: RxFormProviders;
     name?: string;
@@ -63,8 +58,8 @@ export interface RxFormProviders {
         [key: string]: ValidatorAsyncFn;
     };
 }
-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;
+export declare const build: <FormValue, CustomReducers extends Record<string, CustomReducer<FormValue, unknown>>>(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;
     removeControl: (payload: ControlRef) => void;
@@ -72,11 +67,11 @@ export declare const build: <T extends CustomReducers<unknown>>(config: Abstract
     markControlAsTouched: (payload: MarkTouchedPayload) => void;
     markControlAsUntouched: (payload: ControlRef) => void;
     resetControl: (payload: ControlRef) => void;
-} & ActionMap & DestroyAction, CustomReducerActionTypes<T> & FormActionTypes & {
+} & ActionMap & DestroyAction, CustomReducerActionTypes<CustomReducers> & FormActionTypes & {
     destroy: 'destroy';
 }>;
-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;
+export declare const load: <FormValue, CustomReducers extends Record<string, CustomReducer<FormValue, unknown>>>(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;
     removeControl: (payload: ControlRef) => void;
@@ -84,10 +79,10 @@ export declare const load: <Value, T extends CustomReducers<unknown>>(state: For
     markControlAsTouched: (payload: MarkTouchedPayload) => void;
     markControlAsUntouched: (payload: ControlRef) => void;
     resetControl: (payload: ControlRef) => void;
-} & ActionMap & DestroyAction, CustomReducerActionTypes<T> & FormActionTypes & {
+} & ActionMap & DestroyAction, CustomReducerActionTypes<CustomReducers> & FormActionTypes & {
     destroy: 'destroy';
 }>;
-type CustomReducerActionTypes<T extends CustomReducers<unknown>> = {
+type CustomReducerActionTypes<T extends Record<string, CustomReducer>> = {
     [K in keyof T as `${K & string}`]: `${K & string}`;
 };
 type FormActionTypes = {

package/dist/RxForm/index.d.ts

@@ -1 +1 @@
-export { build, load, group, array, control, RxFormActions, CustomReducer, CustomReducers, FormReducers, RxFormOptions, RxFormProviders, } from './RxForm';
+export { build, load, group, array, control, RxFormActions, CustomReducer, FormReducers, RxFormOptions, RxFormProviders, } from './RxForm';