Fix merge/apply being flipped

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsonop",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "JSON-encoded operations on JSON documents",
   "main": "src/index",
   "scripts": {

src/index.js

@@ -1,4 +1,4 @@
 var jsonop = require("./jsonop");
 
-exports.merge = function (left, right) { return jsonop(left, right, false); };
-exports.apply = function (left, right) { return jsonop(left, right, true); };
+exports.merge = function (left, right) { return jsonop(left, right, true); };
+exports.apply = function (left, right) { return jsonop(left, right, false); };

src/jsonop.js

@@ -21,7 +21,7 @@ module.exports = function (left, right, doMerge) {
 		$mul: updater(function (a, b) { return a * b; }),
 		$min: updater(function (a, b) { return Math.min(a, b); }),
 		$max: updater(function (a, b) { return Math.max(a, b); }),
-		$mod: updater(function (a, b) { return a % b; }),
+		$mod: function (a, b) { return typeof a === "undefined" ? 0 : a % b; },
 
 		$union: updater(function (a, b) {
 			var result = a.slice(0), i = 0, l = b.length;

tests/jsonop.test.js

@@ -1,32 +1,37 @@
-var jsonop = require('../src/jsonop.js'),
+var jsonop = require('../src/index.js'),
 	test = require('ava');
 
 test('kitchen sink', (t) => {
+	let result = jsonop.apply(
+		{
+			a: 1,
+			b: 2,
+			c: 3,
+			d: 4,
+			e: 5,
+			f: { foo: 6 },
+			g: [7, 8, 9],
+			h: [8, 9, 10],
+			i: { foo: 9 },
+		},
+		{
+			a: 3,
+			b: [2, "$add"],
+			d: [4, "$mul"],
+			e: "$delete",
+			f: { bar: 7 },
+			g: [10, 11],
+			h: [ [11, 9, 4], "$union" ],
+			i: [ { bar: 10 }, "$replace" ],
+			j: [ 3, "$add" ],
+			k: { foo: [7, "$mod"] }
+		}
+	);
+
+	console.log("Result is", result);
+
 	t.deepEqual(
-		jsonop.apply(
-			{
-				a: 1,
-				b: 2,
-				c: 3,
-				d: 4,
-				e: 5,
-				f: { foo: 6 },
-				g: [7, 8, 9],
-				h: [8, 9, 10],
-				i: { foo: 9 },
-			},
-			{
-				a: 3,
-				b: [2, "$add"],
-				d: [4, "$mul"],
-				e: "$delete",
-				f: { bar: 7 },
-				g: [10, 11],
-				h: [ [11, 9, 4], "$union" ],
-				i: [ { bar: 10 }, "$replace" ],
-				j: [ 3, "$add" ],
-			}
-		),
+		result,
 		{
 			a: 3,
 			b: 4,
@@ -36,7 +41,8 @@ test('kitchen sink', (t) => {
 			g: [10, 11],
 			h: [8, 9, 10, 11, 4],
 			i: { bar: 10 },
-			j: 3
+			j: 3,
+			k: { foo: 0 }
 		}
 	);