Merge pull request #92 from IzikLisbon/master

Add support for all UUID versions

Author: RobinBuschmann

lib/annotations/association/BelongsToMany.ts

@@ -20,7 +20,7 @@ export function BelongsToMany(relatedClassGetter: ModelClassGetter,
     through = throughOrOptions;
   } else {
     through = (throughOrOptions as IAssociationOptionsBelongsToMany).through;
-    options = throughOrOptions;
+    options = throughOrOptions as IAssociationOptionsBelongsToMany;
   }
   return (target: any, propertyName: string) => {
     addAssociation(

lib/annotations/validation/IsUUID.ts

@@ -1,10 +1,12 @@
 import 'reflect-metadata';
 import {addAttributeOptions} from "../../services/models";
 
-/**
- * Only allow uuids
+/*
+ * Only allow uuids.
+ * Version's regular expressions:
+ * https://github.com/chriso/validator.js/blob/b59133b1727b6af355b403a9a97a19226cceb34b/lib/isUUID.js#L14-L19.
  */
-export function IsUUID(version: number): Function {
+export function IsUUID(version: 3|4|5|"3"|"4"|"5"|"all"): Function {
 
   return (target: any, propertyName: string) =>
     addAttributeOptions(target, propertyName, {

lib/interfaces/IBaseIncludeOptions.ts

@@ -15,7 +15,7 @@ export interface IBaseIncludeOptions {
    * Where clauses to apply to the child models. Note that this converts the eager load to an inner join,
    * unless you explicitly set `required: false`
    */
-  where?: WhereOptions;
+  where?: WhereOptions<any>;
 
   /**
    * A list of attributes to select from the child model

lib/interfaces/IFindOptions.ts

@@ -11,7 +11,7 @@ export interface IFindOptions extends LoggingOptions, SearchPathOptions {
   /**
    * A hash of attributes to describe your search. See above for examples.
    */
-  where?: WhereOptions | Array<col | and | or | string> | col | and | or | string;
+  where?: WhereOptions<any> | Array<col | and | or | string> | col | and | or | string;
 
   /**
    * A list of the attributes that you want to select. To rename an attribute, you can pass an array, with
@@ -69,7 +69,7 @@ export interface IFindOptions extends LoggingOptions, SearchPathOptions {
   /**
    * having ?!?
    */
-  having?: WhereOptions;
+  having?: WhereOptions<any>;
 
   /**
    * Group by. It is not mentioned in sequelize's JSDoc, but mentioned in docs.

lib/interfaces/IScopeFindOptions.ts

@@ -11,7 +11,7 @@ export interface IScopeFindOptions extends LoggingOptions, SearchPathOptions {
   /**
    * A hash of attributes to describe your search. See above for examples.
    */
-  where?: WhereOptions | Array<col | and | or | string> | col | and | or | string;
+  where?: WhereOptions<any> | Array<col | and | or | string> | col | and | or | string;
 
   /**
    * A list of the attributes that you want to select. To rename an attribute, you can pass an array, with
@@ -69,7 +69,7 @@ export interface IScopeFindOptions extends LoggingOptions, SearchPathOptions {
   /**
    * having ?!?
    */
-  having?: WhereOptions;
+  having?: WhereOptions<any>;
 
   /**
    * Group by. It is not mentioned in sequelize's JSDoc, but mentioned in docs.