added new functions

Author: morrisjdev

dev/Helper.ts

@@ -6,19 +6,21 @@
                 throw "Linq4JS: Cannot convert empty string to function";
             }
 
-            let varname: string = functionString.substring(0, functionString.indexOf("=>")).replace(" ", "");
+            let varnameString: string = functionString.substring(0, functionString.indexOf("=>")).replace(" ", "").replace("(", "").replace(")", "");
 
-            if (varname.indexOf(",") != -1) {
-                throw `Linq4JS: Cannot use '${varname}' as variable`;
-            }
+            let varnames: Array<string> = varnameString.split(",");
 
             let func: string = functionString
                 .substring(functionString.indexOf("=>") + 2)
+                .replace("{", "").replace("}", "")
                 .split(".match(//gi)").join("");
 
-            func = "return " + func;
+            /*No return outside of quotations*/
+            if(func.match(/return(?=([^\"']*[\"'][^\"']*[\"'])*[^\"']*$)/g) == null){
+                func = "return " + func;
+            }
 
-            return Function(varname, func);
+            return Function(...varnames, func);
         }
 
         static ConvertFunction: Function = function (testFunction: any): Function {

dev/IArray.ts

@@ -15,6 +15,7 @@
     Where(filter: any): Array<T>;
     Range(start: number, length: number): Array<T>;
     Count(filter?: any): number;
+    All(filter: any): boolean;
     Any(filter?: any): boolean;
     First(filter?: any): T;
     FirstOrDefault(filter?: any): T;
@@ -29,4 +30,10 @@
     ThenByDescending(valueSelector: any): Array<T>;
     Move(oldIndex: number, newIndex: number): Array<T>;
     Distinct(valueSelector: any, takelast?: boolean): Array<T>;
+    Contains(object: T): boolean;
+    Concat(array: Array<T>): Array<T>;
+    Join(character: string, selector?: any): string;
+    Aggregate(method: any): string;
+    Reverse(): Array<T>;
+    Average(selector?: any, filter?: any): number;
 }

dev/Modules/Aggregate.ts

@@ -0,0 +1,12 @@
+Array.prototype.Aggregate = function<T> (method: any): string {
+    let that: Array<T> = this;
+
+    let result: string = "";
+    let methodFunction: Function = Linq4JS.Helper.ConvertFunction(method);
+
+    that.ForEach(function(x){
+        result = methodFunction(result, x);
+    });
+
+    return result;
+};

dev/Modules/All.ts

@@ -0,0 +1,5 @@
+Array.prototype.All = function<T> (filter: any): boolean {
+    let that: Array<T> = this;
+
+    return that.Count(filter) == that.Count();
+};

dev/Modules/Average.ts

@@ -0,0 +1,20 @@
+Array.prototype.Average = function <T>(selector?: any, filter?: any): number {
+    let that: Array<T> = this;
+
+    let result: number = 0;
+    let array: Array<any> = that;
+
+    if (filter != null) {
+        array = array.Where(filter);
+    }
+
+    if(selector != null){
+        array = array.Select(selector);
+    }
+
+    array.ForEach(function(x){
+        result += x;
+    });
+
+    return result / array.Count();
+};

dev/Modules/Concat.ts

@@ -0,0 +1,5 @@
+Array.prototype.Concat = function<T> (array: Array<T>): Array<T> {
+    let that: Array<T> = this;
+    that = that.concat(array); 
+    return that;
+};

dev/Modules/Contains.ts

@@ -0,0 +1,7 @@
+Array.prototype.Contains = function<T> (object: T): boolean {
+    let that: Array<T> = this;
+    
+    return that.Any(function(x){
+        return x == object;
+    });
+};

dev/Modules/Join.ts

@@ -0,0 +1,11 @@
+Array.prototype.Join = function <T>(char: string, selector?: any): string {
+    let that: Array<T> = this;
+
+    let array: Array<any> = that;
+
+    if(selector != null){
+        array = array.Select(selector);
+    }
+
+    return array.join(char);
+};

dev/Modules/Reverse.ts

@@ -0,0 +1,4 @@
+Array.prototype.Reverse = function <T>(): Array<T> {
+    let that: Array<T> = this;
+    return that.reverse();
+};

dist/Linq4JS.d.ts

@@ -27,6 +27,7 @@ interface Array<T> {
     Where(filter: any): Array<T>;
     Range(start: number, length: number): Array<T>;
     Count(filter?: any): number;
+    All(filter: any): boolean;
     Any(filter?: any): boolean;
     First(filter?: any): T;
     FirstOrDefault(filter?: any): T;
@@ -41,6 +42,12 @@ interface Array<T> {
     ThenByDescending(valueSelector: any): Array<T>;
     Move(oldIndex: number, newIndex: number): Array<T>;
     Distinct(valueSelector: any, takelast?: boolean): Array<T>;
+    Contains(object: T): boolean;
+    Concat(array: Array<T>): Array<T>;
+    Join(character: string, selector?: any): string;
+    Aggregate(method: any): string;
+    Reverse(): Array<T>;
+    Average(selector?: any, filter?: any): number;
 }
 declare namespace Linq4JS {
     class OrderEntry {