Remove DisallowArraysAndTypeProperty and create Props

ngrx · Jan 7, 2020 · 7ed56c8 · 7ed56c8
1 parent ab5254a
commit 7ed56c8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/modules/store/src/action_creator.ts b/modules/store/src/action_creator.ts
@@ -4,6 +4,7 @@ import {
   TypedAction,
   FunctionWithParametersType,
   NotAllowedCheck,
+  Props,
 } from './models';
 
 // Action creators taken from ts-action library and modified a bit to better
@@ -14,7 +15,7 @@ export function createAction<T extends string>(
 ): ActionCreator<T, () => TypedAction<T>>;
 export function createAction<T extends string, P extends object>(
   type: T,
-  config: { _as: 'props'; _p: P }
+  config: Props<P>
 ): ActionCreator<T, (props: P & NotAllowedCheck<P>) => P & TypedAction<T>>;
 export function createAction<
   T extends string,
@@ -120,7 +121,7 @@ export function createAction<T extends string, C extends Creator>(
   }
 }
 
-export function props<P extends object>(): { _as: 'props'; _p: P } {
+export function props<P extends object>(): Props<P> {
   return { _as: 'props', _p: undefined! };
 }
 

diff --git a/modules/store/src/models.ts b/modules/store/src/models.ts
@@ -57,10 +57,6 @@ export const arraysAreNotAllowedMsg =
   'arrays are not allowed in action creators';
 type ArraysAreNotAllowed = typeof arraysAreNotAllowedMsg;
 
-export type DisallowArraysAndTypeProperty<T> = T extends any[]
-  ? ArraysAreNotAllowed
-  : T extends { type: any } ? TypePropertyIsNotAllowed : T;
-
 export const typePropertyIsNotAllowedMsg =
   'type property is not allowed in action creators';
 type TypePropertyIsNotAllowed = typeof typePropertyIsNotAllowedMsg;
@@ -89,6 +85,11 @@ export type ActionCreator<
   C extends Creator = Creator
 > = C & TypedAction<T>;
 
+export interface Props<T> {
+  _as: 'props';
+  _p: T;
+}
+
 export type FunctionWithParametersType<P extends unknown[], R = void> = (
   ...args: P
 ) => R;