feat: update types to handle basic types to validate

nobrainr · Jun 22, 2019 · 9f469e5 · 9f469e5
1 parent 62d27e7
commit 9f469e5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/morphism.ts b/src/morphism.ts
@@ -72,7 +72,7 @@ function transformItems<T, TSchema extends Schema<T | {}>>(schema: TSchema, type
     tree = new MorphismSchemaTree(schema);
   }
 
-  function mapper(source: any) {
+  const mapper: Mapper<TSchema> = (source: any) => {
     if (!source) {
       return source;
     }
@@ -96,7 +96,7 @@ function transformItems<T, TSchema extends Schema<T | {}>>(schema: TSchema, type
         return transformValuesFromObject(object, tree, [object], jsObject);
       }
     }
-  }
+  };
 
   return mapper;
 }

diff --git a/src/types.ts b/src/types.ts
@@ -1,4 +1,5 @@
 import { SCHEMA_OPTIONS_SYMBOL, SchemaOptions } from './morphism';
+import { BasicTypes } from './validation/validators';
 
 /**
  * A structure-preserving object from a source data towards a target data.
@@ -159,7 +160,9 @@ export type ActionAggregator<T extends unknown = unknown> = T extends object ? (
  */
 export interface ActionSelector<Source = object, R = any> {
   path: ActionString<Source> | ActionAggregator<Source>;
-  fn: (fieldValue: any, object: Source, items: Source, objectToCompute: R) => R;
+  // | ((source: Source) => unknown);
+  fn?: (fieldValue: any, object: Source, items: Source, objectToCompute: R) => R;
+  type?: BasicTypes;
 }
 
 export interface Constructable<T> {
@@ -172,6 +175,6 @@ export type DestinationFromSchema<T> = T extends StrictSchema<infer U> | Schema<
 export type ResultItem<TSchema extends Schema> = DestinationFromSchema<TSchema>;
 
 export interface Mapper<TSchema extends Schema | StrictSchema, TResult = ResultItem<TSchema>> {
-  (data: SourceFromSchema<TSchema>[]): TResult[];
-  (data: SourceFromSchema<TSchema>): TResult;
+  (data?: SourceFromSchema<TSchema>[] | null): TResult[];
+  (data?: SourceFromSchema<TSchema> | null): TResult;
 }