Merge pull request #149 from nobrainr/fix/typescript-type-widening-on…

…-action-function Fix/typescript type widening on action function
nobrainr · Nov 11, 2019 · 438a168 · 438a168
2 parents 883c2b8 + 922f487
commit 438a168
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/types.ts b/src/types.ts
@@ -35,7 +35,7 @@ export type StrictSchema<Target = any, Source = any> = {
   /** `destinationProperty` is the name of the property of the target object you want to produce */
   [destinationProperty in keyof Target]:
     | ActionString<Source>
-    | ActionFunction<Target, Source, Target[destinationProperty]>
+    | { (iteratee: Source, source: Source[], target: Target[destinationProperty]): Target[destinationProperty] }
     | ActionAggregator<Source>
     | ActionSelector<Source, Target>
     | StrictSchema<Target[destinationProperty], Source>;
@@ -44,7 +44,7 @@ export type Schema<Target = any, Source = any> = {
   /** `destinationProperty` is the name of the property of the target object you want to produce */
   [destinationProperty in keyof Target]?:
     | ActionString<Source>
-    | ActionFunction<Target, Source, Target[destinationProperty]>
+    | { (iteratee: Source, source: Source[], target: Target[destinationProperty]): Target[destinationProperty] }
     | ActionAggregator<Source>
     | ActionSelector<Source, Target>
     | Schema<Target[destinationProperty], Source>;

diff --git a/src/typescript.spec.ts b/src/typescript.spec.ts
@@ -1,4 +1,4 @@
-import Morphism, { morphism, StrictSchema, Schema } from './morphism';
+import Morphism, { morphism, StrictSchema, Schema, createSchema } from './morphism';
 
 describe('Typescript', () => {
   describe('Registry Type Checking', () => {
@@ -184,6 +184,14 @@ describe('Typescript', () => {
         expect(item).toEqual(expected[idx]);
       });
     });
+
+    it('should accept union types as Target', () => {
+      const schema = createSchema<{ a: string } | { a: string; b: string }, { c: string }>({
+        a: ({ c }) => c
+      });
+
+      expect(morphism(schema, { c: 'result' }).a).toEqual('result');
+    });
   });
 
   describe('Morphism Function Type Checking', () => {