added FindLastIndex, fixed issue in package.json

Author: morrisjdev

README.md

@@ -89,6 +89,17 @@ var array = ["item1", "item2", "item3", "item4", "no"];
 array.FindIndex("x => x == 'item3'");
 ```
 
+### FindLastIndex
+
+Gets the index of the last item found by a filter
+
+```javascript
+var array = ["item1", "item2", "item3", "item2", "item4", "no"];
+
+//3
+array.FindIndex("x => x == 'item2'");
+```
+
 ### Get
 
 Gets the item with the index

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "linq4js",
   "description": "Linq methods for JavaScript/TypeScript for working with Arrays",
-  "main": "dist/Linq4JS.js",
+  "main": "dist/linq4js.js",
   "authors": [
     "Morris Janatzek"
   ],
@@ -23,8 +23,7 @@
     "demo",
     ".gitignore",
     ".npmignore",
-    "gulpfile.js",
-    "package.json"
+    "gulpfile.js"
   ],
   "devDependencies": {
     "qunit": "^2.1.1"

demo/demo.js

@@ -42,3 +42,23 @@ console.log(result);
 var array = ["item1", "item2", "item3", "item2", "item4"];
 var res2 = array.TakeWhile('(x, s) => x != "item2" || s.c < 1', 's => s.c = 0', '(x, s) => x == "item2" && s.c++');
 console.log(res2);
+console.log(array.FindLastIndex(function (x) { return x == "item2"; }));
+//let test: Array<Linq4JS.Entity> = [new testClass("test", 5, 1), new testClass("test5", 3, 2)];
+//console.log(test);
+//console.log("Foreach");
+//test.ForEach(x => console.log(x.Name));
+//console.log("Foreach End");
+//console.log(test.Take(1));
+//console.log(test.Skip(1));
+//test.Update(new testClass("test1235234234234", 3, 1), "x => x.OtherId");
+//console.log(test);
+//console.log(test.Where(x => x.Id == 3));
+//console.log(test.Any(x => x.Id == 78));
+//console.log(test.First(x => x.Id == 3));
+//console.log(test.FirstOrDefault());
+//console.log(test.Last(x => x.Id == 3));
+//console.log(test.LastOrDefault(x => x.Id == 44));
+//console.log(test.Select(x => new displayClass(x)));
+//test.Remove(new testClass("test55", 3, 1), x => x.OtherId);
+//console.log(test);
+//console.log(test.Count(x => x.Id > 3)); 

demo/js/app.ts

@@ -61,6 +61,8 @@ let res2 = array.TakeWhile('(x, s) => x != "item2" || s.c < 1', 's => s.c = 0',
 
 console.log(res2);
 
+console.log(array.FindLastIndex(x => x == "item2"));
+
 //let test: Array<Linq4JS.Entity> = [new testClass("test", 5, 1), new testClass("test5", 3, 2)];
 //console.log(test);
 

dev/IArray.ts

@@ -13,6 +13,12 @@
      */
     FindIndex(filter: ((item: T) => boolean) | string): number;
 
+    /**
+     * Gets the index of the last item found by a filter
+     * @param filter A function (or function-string) that returns a boolean when matching element was found
+     */
+    FindLastIndex(filter: ((item: T) => boolean) | string): number;
+
     /**
      * Gets the item with the index
      * @param index Item index
@@ -23,7 +29,7 @@
      * Executes a method for each item in the array
      * @param action A function (or function-string) that gets executed for each element. If it returns false the loop stops.
      */
-    ForEach(action: ((item: T) => boolean | any) | string): Array<T>;
+    ForEach(action: ((item: T, index?: number) => boolean | any) | string): Array<T>;
 
     /**
      * Updates an object in the array
@@ -78,7 +84,7 @@
      * Searches for all items in array that match the given filter
      * @param filter A function (or function-string) that returns a boolean when matching element was found
      */
-    Where(filter: ((item: T) => boolean) | string): Array<T>;
+    Where(filter: ((item: T, index?: number) => boolean) | string): Array<T>;
 
     /**
      * Takes items in a specific range

dev/Modules/Add.ts

@@ -2,7 +2,6 @@
     let that: Array<T> = this;
 
     if (object != null) {
-
         if (generateId == true) {
             let newIndex: number;
 

dev/Modules/Distinct.ts

@@ -4,13 +4,13 @@
     if(valueSelector != null){
         let valueSelectorFunction = Linq4JS.Helper.ConvertFunction<(item: T) => any>(valueSelector);
 
-        return that.filter((value, index, self) => {
-            return self.FindIndex(x => valueSelectorFunction(x) == valueSelectorFunction(value)) == index;
-        });
+        return that.Where((x, i) => {
+            return that.FindIndex(y => valueSelectorFunction(y) == valueSelectorFunction(x)) == i;
+        })
     }
     else{
-        return that.filter((value, index, self) => {
-            return self.indexOf(value) == index;
-        });
+        return that.Where((x, i) => {
+            return that.FindIndex(y => y == x) == i;
+        })
     }
 };

dev/Modules/FindLastIndex.ts

@@ -0,0 +1,20 @@
+Array.prototype.FindLastIndex = function<T> (filter: ((item: T) => boolean) | string): number {
+    let that: Array<T> = this;
+
+    if (filter != null) {
+        let filterFunction = Linq4JS.Helper.ConvertFunction<(item: T) => boolean>(filter);
+
+        for (let i = that.length - 1; i >= 0; i--) {
+            let obj: T = that[i];
+
+            if (filterFunction(obj) == true) {
+                return i;
+            }
+        }
+
+        return -1;
+    }
+    else {
+        throw "Linq4JS: You must define a filter";
+    }
+};

dev/Modules/ForEach.ts

@@ -1,10 +1,10 @@
-Array.prototype.ForEach = function<T> (action: ((item: T) => boolean | any) | string): Array<T> {
+Array.prototype.ForEach = function<T> (action: ((item: T, index?: number) => boolean | any) | string): Array<T> {
     let that: Array<T> = this;
 
-    let actionFunction = Linq4JS.Helper.ConvertFunction<(item: T) => boolean | any>(action);
+    let actionFunction = Linq4JS.Helper.ConvertFunction<(item: T, index?: number) => boolean | any>(action);
 
-    for (let obj of that) {
-        let result = actionFunction(obj);
+    for (let i = 0; i < that.length; i++) {
+        let result = actionFunction(that[i], i);
 
         if(result != null && result == true){
             break;

dev/Modules/Where.ts

@@ -1,15 +1,15 @@
-Array.prototype.Where = function<T> (filter: ((item: T) => boolean) | string): Array<T> {
+Array.prototype.Where = function<T> (filter: ((item: T, index?: number) => boolean) | string): Array<T> {
     let that: Array<T> = this;
 
     if (filter != null) {
-        let filterFunction = Linq4JS.Helper.ConvertFunction<(item: T) => boolean>(filter);
+        let filterFunction = Linq4JS.Helper.ConvertFunction<(item: T, index?: number) => boolean>(filter);
 
         let newArray: Array<T> = new Array<T>();
 
         for (let i = 0; i < that.length; i++) {
             let obj: T = that[i];
 
-            if (filterFunction(obj) == true) {
+            if (filterFunction(obj, i) == true) {
                 newArray.push(obj);
             }
         }