added index Generation; fixed some bugs

Author: morrisjdev

dev/Helper.ts

@@ -1,5 +1,5 @@
 namespace Linq4JS {
-    export class Helper implements Helper {
+    export class Helper {
         static ConvertStringFunction: Function = function (functionString: string): Function {
 
             if (functionString.length == 0) {

dev/IArray.ts

@@ -9,7 +9,7 @@
     UpdateRange(objects: Array<T>, primaryKeySelector?: any): Array<T>;
     Remove(object: T, primaryKeySelector?: any): Array<T>;
     RemoveRange(objects: Array<T>, primaryKeySelector?: any): Array<T>;
-    Add(object: T): Array<T>;
+    Add(object: T, generateId?: boolean): Array<T>;
     AddRange(objects: Array<T>): Array<T>;
     Insert(object: T, index: number): Array<T>;
     Where(filter: any): Array<T>;

dev/Modules/Add.ts

@@ -1,7 +1,29 @@
-Array.prototype.Add = function<T> (object: T): Array<T> {
+Array.prototype.Add = function<T> (object: T, generateId?: boolean): Array<T> {
     let that: Array<T> = this;
 
     if (object != null) {
+
+        if (generateId == true) {
+            let newIndex: number;
+
+            let last: T = that.LastOrDefault();
+            if(last != null){
+
+                newIndex = last["_Id"] != null ? last["_Id"] : 1;
+
+                while(that.Any(function(x){
+                    return x["_Id"] == newIndex;
+                })){
+                    newIndex++;
+                }
+
+                object["_Id"] = newIndex;
+            }
+            else{
+                object["_Id"] = 1;
+            }
+        }
+
         that.push(object);
     }
 

dev/OrderEntry.ts

@@ -1,5 +1,5 @@
 namespace Linq4JS {
-    export class OrderEntry implements OrderEntry{
+    export class OrderEntry{
         test: string;
         Direction: OrderDirection;
         ValueSelector: Function;

dist/Linq4JS.d.ts

@@ -5,7 +5,7 @@ declare namespace Linq4JS {
     }
 }
 declare namespace Linq4JS {
-    class Helper implements Helper {
+    class Helper {
         static ConvertStringFunction: Function;
         static ConvertFunction: Function;
         static OrderCompareFunction: Function;
@@ -21,7 +21,7 @@ interface Array<T> {
     UpdateRange(objects: Array<T>, primaryKeySelector?: any): Array<T>;
     Remove(object: T, primaryKeySelector?: any): Array<T>;
     RemoveRange(objects: Array<T>, primaryKeySelector?: any): Array<T>;
-    Add(object: T): Array<T>;
+    Add(object: T, generateId?: boolean): Array<T>;
     AddRange(objects: Array<T>): Array<T>;
     Insert(object: T, index: number): Array<T>;
     Where(filter: any): Array<T>;
@@ -43,7 +43,7 @@ interface Array<T> {
     Distinct(valueSelector: any, takelast?: boolean): Array<T>;
 }
 declare namespace Linq4JS {
-    class OrderEntry implements OrderEntry {
+    class OrderEntry {
         test: string;
         Direction: OrderDirection;
         ValueSelector: Function;

dist/Linq4JS.js

@@ -103,9 +103,25 @@ var Linq4JS;
         OrderDirection[OrderDirection["Descending"] = 1] = "Descending";
     })(OrderDirection = Linq4JS.OrderDirection || (Linq4JS.OrderDirection = {}));
 })(Linq4JS || (Linq4JS = {}));
-Array.prototype.Add = function (object) {
+Array.prototype.Add = function (object, generateId) {
     var that = this;
     if (object != null) {
+        if (generateId == true) {
+            var newIndex_1;
+            var last = that.LastOrDefault();
+            if (last != null) {
+                newIndex_1 = last["_Id"] != null ? last["_Id"] : 1;
+                while (that.Any(function (x) {
+                    return x["_Id"] == newIndex_1;
+                })) {
+                    newIndex_1++;
+                }
+                object["_Id"] = newIndex_1;
+            }
+            else {
+                object["_Id"] = 1;
+            }
+        }
         that.push(object);
     }
     return that;

gulpfile.js

@@ -29,7 +29,7 @@ gulp.task("testts", function () {
         .pipe(gulp.dest("test"));
 });
 
-gulp.task("typescriptRelease", function () {
+gulp.task("typescript", function () {
     var tsResult = gulp.src("dev/**/*.ts")
         .pipe(typescript({
             declaration: true,
@@ -42,7 +42,7 @@ gulp.task("typescriptRelease", function () {
     ]);
 });
 
-gulp.task("minifyJS", ["typescriptRelease"], function () {
+gulp.task("minifyJS", ["typescript"], function () {
     return gulp.src(["dist/**/*.js", "!dist/**/*.min.js"])
         .pipe(minify({
             ext: {
@@ -59,26 +59,26 @@ gulp.task("minifyJS", ["typescriptRelease"], function () {
 gulp.task("browsersync", function () {
     browsersync.init({
         proxy: {
-            target: "localhost:15222",
+            target: "localhost:15666",
             ws: true
         },
         ui: {
-            port: 15224
+            port: 15668
         },
-        port: 15223,
+        port: 15667,
         open: false,
         notify: false
     });
 });
 
 gulp.task("server", ["browsersync"], function () {
     connect.server({
-        port: 15222
+        port: 15666
     });
 
     gulp.watch("demo/**/*.ts", ["demots"]);
     gulp.watch("test/**/*.ts", ["testts"]);
-    gulp.watch("js/**/*.ts", ["typescript"]);
+    gulp.watch("dev/**/*.ts", ["typescript"]);
 
     gulp.watch("**/*.html").on("change", browsersync.reload);
     gulp.watch("dist/**/*.js").on("change", browsersync.reload);