Fix JSONPath-Plus#5.

Author: Subbu Allamaraju

.gitignore

@@ -1 +1,9 @@
+*.iml
+.DS_Store
+.idea
+temp
 node_modules
+pids
+reports
+target
+*.log

.npmignore

@@ -0,0 +1,2 @@
+node_modules
+test

lib/jsonpath.js

@@ -4,11 +4,13 @@
  * Licensed under the MIT (MIT-LICENSE.txt) licence.
  */
 
+var _ = require('underscore');
 exports.eval = jsonPath;
 var cache = {};
 function jsonPath(obj, expr, arg) {
    var P = {
       resultType: arg && arg.resultType || "VALUE",
+      flatten: arg && arg.flatten || false,
       result: [],
       normalize: function(expr) {
          if(cache[expr]) {
@@ -31,7 +33,19 @@ function jsonPath(obj, expr, arg) {
          return p;
       },
       store: function(p, v) {
-         if (p) P.result[P.result.length] = P.resultType == "PATH" ? P.asPath(p) : v;
+         if (p) {
+             if (P.resultType == "PATH") {
+                 P.result[P.result.length] = P.asPath(p);
+             }
+             else {
+                 if(_.isArray(v) && P.flatten) {
+                     P.result = P.result.concat(v);
+                 }
+                 else {
+                     P.result[P.result.length] = v;
+                 }
+             }
+         }
          return !!p;
       },
       trace: function(expr, val, path) {

package.json

@@ -1,19 +1,31 @@
 {
-  "author": "Stefan Goessner",
-  "name": "JSONPath",
-  "description": "A JS implementation of JSONPath",
-  "contributors": [ 
-    { "name": "Stefan Goessner", "email": "[email protected]" },
-    { "name": "Mike Brevoort", "email": "[email protected]" }
-  ],  
-  "version": "0.8.2",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/s3u/JSONPath.git"
-  },
-  "main" : "./lib/jsonpath",
-  "dependencies": {},
-  "devDependencies": {
-    "nodeunit": "latest"
-  }
+    "author": "Stefan Goessner",
+    "name": "JSONPath",
+    "description": "A JS implementation of JSONPath",
+    "contributors": [
+        {
+            "name": "Prof. Gšssner",
+            "email": "[email protected]"
+        },
+        {
+            "name": "Subbu Allamaraju",
+            "email": "[email protected]"
+        },
+        {
+            "name": "Mike Brevoort",
+            "email": "[email protected]"
+        }
+    ],
+    "version": "0.8.3",
+    "repository": {
+        "type": "git",
+        "url": "git://github.com/s3u/JSONPath.git"
+    },
+    "main": "./lib/jsonpath",
+    "dependencies": {
+        "underscore": "latest"
+    },
+    "devDependencies": {
+        "nodeunit": "latest"
+    }
 }

test/test.intermixed.arr.js

@@ -0,0 +1,54 @@
+var jsonpath = require("../").eval,
+    sys = require('sys'),
+    testCase = require('nodeunit').testCase
+
+// tests based on examples at http://goessner.net/articles/JsonPath/
+
+var json = {"store":{
+    "book":[
+        { "category":"reference",
+            "author":"Nigel Rees",
+            "title":"Sayings of the Century",
+            "price":[8.95, 8.94, 8.93]
+        },
+        { "category":"fiction",
+            "author":"Evelyn Waugh",
+            "title":"Sword of Honour",
+            "price":12.99
+        },
+        { "category":"fiction",
+            "author":"Herman Melville",
+            "title":"Moby Dick",
+            "isbn":"0-553-21311-3",
+            "price":8.99
+        },
+        { "category":"fiction",
+            "author":"J. R. R. Tolkien",
+            "title":"The Lord of the Rings",
+            "isbn":"0-395-19395-8",
+            "price":22.99
+        }
+    ],
+    "bicycle":{
+        "color":"red",
+        "price":19.95
+    }
+}
+};
+
+
+module.exports = testCase({
+
+    // ============================================================================
+    "all sub properties, entire tree":function (test) {
+        // ============================================================================
+        test.expect(1);
+        var books = json.store.book;
+        var expected = [books[1].price, books[2].price, books[3].price, json.store.bicycle.price];
+        expected = books[0].price.concat(expected);
+        var result = jsonpath(json, "$.store..price", {flatten: true});
+        test.deepEqual(expected, result);
+
+        test.done();
+    }
+});