argument updates.

Author: ffMathy

src/Arguments.ts

@@ -1,9 +1,8 @@
-export class Arg {
+class Arg {
     private constructor(
         private description: string,
         private matchingFunction: (arg: any) => boolean
     ) {
-
     }
 
     matches(arg: any) {
@@ -20,10 +19,13 @@ export class Arg {
 
     static any()
     static any<T extends 'string'|'number'|'boolean'|'symbol'|'undefined'|'object'|'function'|'array'>(type: T)
-    static any(type?: string) {
+    static any(type?: string): any {
         const description = !type ? '{any arg}' : '{arg matching ' + type + '}';
         return new Arg(description, x => {
-            if(typeof type !== 'string')
+            if(typeof type === 'string')
+                return true;
+
+            if(typeof type === 'undefined')
                 return true;
 
             if(type === 'array')
@@ -33,13 +35,13 @@ export class Arg {
         });
     }
 
-    static is<T>(value: T)
-    static is<T>(predicate: (input: T) => boolean) 
-    static is<T>(predicateOrValue: ((input: T) => boolean) | T) {
+    static is<T>(value: T): Arg & T
+    static is<T>(predicate: (input: T) => boolean): Arg & T
+    static is<T>(predicateOrValue: ((input: T) => boolean) | T): Arg & T {
         if(typeof predicateOrValue === 'function')
-            return new Arg('{arg matching predicate ' + this.toStringify(predicateOrValue) + '}', predicateOrValue);
+            return new Arg('{arg matching predicate ' + this.toStringify(predicateOrValue) + '}', predicateOrValue) as any;
 
-        return new Arg('{arg matching ' + this.toStringify(predicateOrValue) + '}', x => x === predicateOrValue);
+        return new Arg('{arg matching ' + this.toStringify(predicateOrValue) + '}', x => x === predicateOrValue) as any;
     }
 
     private static toStringify(obj: any) {