Fixing support for sandbox in the case of functions;

brettz9 · brettz9 · commit 7849f70802e5 · 2016-03-15T16:06:43.000-07:00
update CHANGES; Lint JS test support files; Split out tests into `eslint`, `remark`, `lint`, `nodeunit`; Add remark linting to testing process (JSONPath-Plus#70); bump to 0.15.0
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,20 +1,28 @@
 # JSONPath changes
 
-## Unreleased
-
-- Use `this` if present for global export
-
-## Jan 10, 2016
+## 0.15.0 (Mar 15, 2016)
+
+- Fix: Fixing support for sandbox in the case of functions
+- Feature: Use `this` if present for global export
+- Docs: Clarify function signature
+- Docs: Update testing section
+- Dev testing: Add in missing test for browser testing
+- Dev testing: Add remark linting to testing process (#70)
+- Dev testing: Lint JS test support files
+- Dev testing: Split out tests into `eslint`, `remark`, `lint`, `nodeunit`
+- Dev testing: Remove need for nodeunit build step
+- Dev testing: Simplify nodeunit usage and make available
+  as `npm run browser-test`
+
+## 0.14.0 (Jan 10, 2016)
 
 - Add `@scalar()` type operator (in JavaScript mode, will also include)
-- Version 0.14.0
 
-## Jan 5, 2016
+## 0.13.1 (Jan 5, 2016)
 
 - Avoid double-encoding path in results
-- Version 0.13.1
 
-## Dec 13, 2015
+## 0.13.0 (Dec 13, 2015)
 
 - Breaking change (from version 0.11): Silently strip `~` and `^` operators
   and type operators such as `@string()` in `JSONPath.toPathString()` calls.
@@ -27,32 +35,28 @@
 - Fix: Enhance Node checking to avoid issue reported with angular-mock
 - Fix: Allow for `@` or other special characters in at-sign-prefixed
   property names (by use of `[?(@['...'])]` or  `[(@['...'])]`).
-- Version 0.13.0
 
-## Dec 12, 2015 10:39pm
+## 0.12.0 (Dec 12, 2015 10:39pm)
 
 - Breaking change: Problems with upper-case letters in npm is causing
   us to rename the package, so have renamed package to "jsonpath-plus"
   (there are already package with lower-case "jsonpath" or "json-path").
   The new name also reflects that there have been changes to the
   original spec.
-- Version 0.12.0
 
-## Dec 12, 2015 10:36pm
+## 0.11.2 (Dec 12, 2015 10:36pm)
 
 - Actually add the warning in the README that problems in npm
   with upper-case letters is causing us to rename to "jsonpath-plus"
   (next version will actually apply the change).
-- Version 0.11.2
 
-## Dec 12, 2015 10:11pm
+## 0.11.1 (Dec 12, 2015 10:11pm)
 
 - Give warning in README that problems in npm with upper-case letters
   is causing us to rename to "jsonpath-plus" (next version will actually
   apply the change).
-- Version 0.11.1
 
-## Dec 12, 2015
+## 0.11.0 (Dec 12, 2015)
 
 - Breaking change: For unwrapped results, return `undefined` instead
   of `false` upon failure to find path (to allow distinguishing of
@@ -92,18 +96,15 @@
 - Fix: Allow `^` as property name
 - Fix: Support `.` within properties
 - Fix: `@path` in index/property evaluations
-- Version 0.11
 
-## Oct 23, 2013
+## 0.10.0 (Oct 23, 2013)
 
 - Support for parent selection via `^`
 - Access current path via `@path` in test statements
 - Allowing for multi-statement evals
 - Performance improvements
-- Version 0.10
 
-## Mar 28, 2012
+## 0.9.0 (Mar 28, 2012)
 
 - Support a sandbox arg to eval
 - Use vm.runInNewContext in place of eval
-- Version 0.9.0
diff --git a/lib/jsonpath.js b/lib/jsonpath.js
@@ -15,15 +15,33 @@ var isNode = module && !!module.exports;
 
 var allowedResultTypes = ['value', 'path', 'pointer', 'parent', 'parentProperty', 'all'];
 
+var moveToAnotherArray = function (source, target, conditionCb) {
+  for (var i = 0, kl = source.length; i < kl; i++) {
+      var key = source[i];
+      if (conditionCb(key)) {
+          target.push(source.splice(i--, 1)[0]);
+      }
+  }
+};
+
 var vm = isNode
     ? require('vm') : {
         runInNewContext: function (expr, context) {
-            return eval(Object.keys(context).reduce(function (s, vr) {
+            var keys = Object.keys(context);
+            var funcs = [];
+            moveToAnotherArray(keys, funcs, function (key) {
+                return typeof context[key] === 'function';
+            });
+            var code = funcs.reduce(function (s, func) {
+                return 'var ' + func + '=' + context[func].toString() + ';' + s;
+            }, '');
+            code += keys.reduce(function (s, vr) {
                 return 'var ' + vr + '=' + JSON.stringify(context[vr]).replace(/\u2028|\u2029/g, function (m) {
                     // http://www.thespanner.co.uk/2011/07/25/the-json-specification-is-now-wrong/
                     return '\\u202' + (m === '\u2028' ? '8' : '9');
                 }) + ';' + s;
-            }, expr));
+            }, expr);
+            return eval(code);
         }
     };
 
diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
     }
   ],
   "license": "MIT",
-  "version": "0.14.0",
+  "version": "0.15.0",
   "repository": {
     "type": "git",
     "url": "git://github.com/s3u/JSONPath.git"
@@ -45,14 +45,20 @@
     "eslint": "^1.10.3",
     "eslint-config-standard": "^4.4.0",
     "eslint-plugin-standard": "^1.3.1",
-    "nodeunit": "0.9.0"
+    "nodeunit": "0.9.0",
+    "remark-lint": "^3.0.0",
+    "remark": "^4.1.2"
   },
   "keywords": [
     "json",
     "jsonpath"
   ],
   "scripts": {
-    "test": "./node_modules/.bin/eslint test lib && \"./node_modules/.bin/nodeunit\" test",
-    "browser-test": "node ./test-helpers/nodeunit-server"
+    "eslint": "./node_modules/.bin/eslint test lib test-helpers",
+    "remark": "./node_modules/.bin/remark -q -f .",
+    "lint": "npm run eslint && npm run remark",
+    "nodeunit": "./node_modules/.bin/nodeunit test",
+    "test": "npm run lint && npm run nodeunit",
+    "browser-test": "npm run lint && node ./test-helpers/nodeunit-server"
   }
 }
