From 1c8edbc819da939aaafdb43c9726e911f0d00f09 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Sat, 1 Apr 2017 12:59:29 +0200
Subject: [PATCH 01/37] Switch to AVA for tests

Has nice watch mode and output diffs
---
 package.json             | 12 ++++--
 test/common/jsurlTest.js | 83 ----------------------------------------
 test/index.js            | 25 ------------
 test/jsurl.js            | 83 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 91 insertions(+), 112 deletions(-)
 delete mode 100644 test/common/jsurlTest.js
 delete mode 100644 test/index.js
 create mode 100644 test/jsurl.js

diff --git a/package.json b/package.json
index f8f9cd7..e3707e0 100644
--- a/package.json
+++ b/package.json
@@ -10,11 +10,15 @@
     "url": "git://github.com/Sage/jsurl.git"
   },
   "devDependencies": {
-    "qunit": "^0.7.7"
+    "ava": "^0.18.2"
+  },
+  "directories": {
+    "lib": "./lib"
   },
-  "directories": {"lib": "./lib" },
   "scripts": {
-    "test": "node test"
+    "test": "ava",
+    "test-watch": "ava --watch"
   },
-  "main": "index.js"
+  "main": "index.js",
+  "dependencies": {}
 }
diff --git a/test/common/jsurlTest.js b/test/common/jsurlTest.js
deleted file mode 100644
index 1e03c80..0000000
--- a/test/common/jsurlTest.js
+++ /dev/null
@@ -1,83 +0,0 @@
-"use strict";
-QUnit.module(module.id);
-
-var JSURL = require("../..");
-var undefined;
-
-function t(v, r) {
-	strictEqual(JSURL.stringify(v), r, "stringify " + (typeof v !== 'object' ? v : JSON.stringify(v)));
-	strictEqual(JSURL.stringify(JSURL.parse(JSURL.stringify(v))), r, "roundtrip " + (typeof v !== 'object' ? v : JSON.stringify(v)));
-}
-
-test('basic values', 26, function() {
-	t(undefined, undefined);
-	t(function() {
-		foo();
-	}, undefined);
-	t(null, "~null");
-	t(false, "~false");
-	t(true, "~true");
-	t(0, "~0");
-	t(1, "~1");
-	t(-1.5, "~-1.5");
-	t("hello world\u203c", "~'hello*20world**203c");
-	t(" !\"#$%&'()*+,-./09:;<=>?@AZ[\\]^_`az{|}~", "~'*20*21*22*23!*25*26*27*28*29*2a*2b*2c-.*2f09*3a*3b*3c*3d*3e*3f*40AZ*5b*5c*5d*5e_*60az*7b*7c*7d*7e");
-	// JSON.stringify converts special numeric values to null
-	t(NaN, "~null");
-	t(Infinity, "~null");
-	t(-Infinity, "~null");
-});
-test('arrays', 4, function() {
-	t([], "~(~)");
-	t([undefined, function() {
-		foo();
-	},
-	null, false, 0, "hello world\u203c"], "~(~null~null~null~false~0~'hello*20world**203c)");
-});
-test('objects', 4, function() {
-	t({}, "~()");
-	t({
-		a: undefined,
-		b: function() {
-			foo();
-		},
-		c: null,
-		d: false,
-		e: 0,
-		f: "hello world\u203c"
-	}, "~(c~null~d~false~e~0~f~'hello*20world**203c)");
-});
-test('mix', 2, function() {
-	t({
-		a: [
-			[1, 2],
-			[], {}],
-		b: [],
-		c: {
-			d: "hello",
-			e: {},
-			f: []
-		}
-	}, "~(a~(~(~1~2)~(~)~())~b~(~)~c~(d~'hello~e~()~f~(~)))");
-});
-
-test('percent-escaped single quotes', 1, function() {
-	deepEqual(JSURL.parse("~(a~%27hello~b~%27world)"), {
-		a: 'hello',
-		b: 'world'
-	});
-});
-
-test('percent-escaped percent-escaped single quotes', 1, function() {
-	deepEqual(JSURL.parse("~(a~%2527hello~b~%2525252527world)"), {
-		a: 'hello',
-		b: 'world'
-	});
-});
-
-test('tryParse', 4, function() {
-	strictEqual(JSURL.tryParse("~null"), null);
-	strictEqual(JSURL.tryParse("~1", 2), 1);
-	strictEqual(JSURL.tryParse("1"), undefined);
-	strictEqual(JSURL.tryParse("1", 0), 0);
-});
diff --git a/test/index.js b/test/index.js
deleted file mode 100644
index 97e5741..0000000
--- a/test/index.js
+++ /dev/null
@@ -1,25 +0,0 @@
-"use strict";
-
-var fs = require('fs');
-var fsp = require('path');
-
-var root = fsp.join(__dirname, 'common');
-var tests = fs.readdirSync(root).filter(function(file) {
-	return /\.js$/.test(file);
-}).map(function(file) {
-	return fsp.join(root, file);
-});
-
-var testrunner = require("qunit");
-
-process.on('uncaughtException', function(err) {
-	console.error(err.stack);
-	process.exit(1);
-});
-
-testrunner.run({
-	code: '',
-    tests: tests,
-}, function(err) {
-	if (err) throw err;
-});
diff --git a/test/jsurl.js b/test/jsurl.js
new file mode 100644
index 0000000..6f986e3
--- /dev/null
+++ b/test/jsurl.js
@@ -0,0 +1,83 @@
+import test from 'ava'
+import JSURL from '../lib/jsurl'
+
+// test macro, both directions
+const cmp = (t, v, s) => {
+	// regular
+	t.is(JSURL.stringify(v), s)
+	// roundtrip
+	t.is(JSURL.stringify(JSURL.parse(s)), s)
+}
+cmp.title = (title, v, s) => `${title} ${s}`
+
+// basic values
+test(cmp, undefined, undefined)
+test(cmp, function () {
+	foo()
+}, undefined)
+test(cmp, null, '~null')
+test(cmp, false, '~false')
+test(cmp, true, '~true')
+test(cmp, 0, '~0')
+test(cmp, 1, '~1')
+test(cmp, -1.5, '~-1.5')
+test(cmp, 'hello world\u203c', "~'hello*20world**203c")
+test(cmp, ' !"#$%&\'()*+,-./09:;<=>?@AZ[\\]^_`az{|}~', "~'*20*21*22*23!*25*26*27*28*29*2a*2b*2c-.*2f09*3a*3b*3c*3d*3e*3f*40AZ*5b*5c*5d*5e_*60az*7b*7c*7d*7e")
+// JSON.stringify converts special numeric values to null
+test(cmp, NaN, '~null')
+test(cmp, Infinity, '~null')
+test(cmp, -Infinity, '~null')
+
+// arrays
+test(cmp, [], '~(~)')
+test(cmp, [undefined, function () {
+	foo()
+},
+	null, false, 0, 'hello world\u203c'], "~(~null~null~null~false~0~'hello*20world**203c)")
+
+// objects
+test(cmp, {}, '~()')
+test(cmp, {
+	a: undefined,
+	b: function () {
+		foo()
+	},
+	c: null,
+	d: false,
+	e: 0,
+	f: 'hello world\u203c'
+}, "~(c~null~d~false~e~0~f~'hello*20world**203c)")
+
+// mix
+test(cmp, {
+	a: [
+		[1, 2],
+		[], {}],
+	b: [],
+	c: {
+		d: 'hello',
+		e: {},
+		f: []
+	}
+}, "~(a~(~(~1~2)~(~)~())~b~(~)~c~(d~'hello~e~()~f~(~)))")
+
+test('percent-escaped single quotes', t => {
+	t.deepEqual(JSURL.parse('~(a~%27hello~b~%27world)'), {
+		a: 'hello',
+		b: 'world'
+	})
+})
+
+test('percent-escaped percent-escaped single quotes', t => {
+	t.deepEqual(JSURL.parse('~(a~%2527hello~b~%2525252527world)'), {
+		a: 'hello',
+		b: 'world'
+	})
+})
+
+test('tryParse', t => {
+	t.is(JSURL.tryParse('~null'), null)
+	t.is(JSURL.tryParse('~1', 2), 1)
+	t.is(JSURL.tryParse('1'), undefined)
+	t.is(JSURL.tryParse('1', 0), 0)
+})

From 4ffcdea624eb29070bd6c44510e438b46799e986 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Sat, 1 Apr 2017 13:11:08 +0200
Subject: [PATCH 02/37] JSURL2

* shorter encoding
* uses only unreserved symbols, plus '*'
* fast encode/decode, uses more native functions
* does not encode against URI encoding, but is immune on decode
* supports Date objects
---
 lib/jsurl2.js  | 192 +++++++++++++++++++++++++++++++++++++++++++++++++
 test/jsurl2.js |  95 ++++++++++++++++++++++++
 2 files changed, 287 insertions(+)
 create mode 100644 lib/jsurl2.js
 create mode 100644 test/jsurl2.js

diff --git a/lib/jsurl2.js b/lib/jsurl2.js
new file mode 100644
index 0000000..2cb97ec
--- /dev/null
+++ b/lib/jsurl2.js
@@ -0,0 +1,192 @@
+// TODO custom objects, support Set, Map etc
+// TODO custom dictionary
+;(function (exports) {
+	'use strict'
+	var stringRE = /^[a-zA-Z]/
+	var numRE = /^\d/
+	var TRUE = '-T'
+	var FALSE = '-F'
+	var NULL = '-N'
+	var UNDEF = '-U'
+
+	var dict = {
+		T: true,
+		F: false,
+		N: null,
+		U: undefined,
+	}
+
+	var fromEscape = {
+		'*': '*',
+		'_': '_',
+		'-': '~',
+		'.': '%',
+		'S': '$',
+		'P': '+',
+		'"': "'"
+	}
+	var toEscape = {
+		'*': '*',
+		'_': '_',
+		'~': '-',
+		'%': '.',
+		'$': 'S',
+		'+': 'P',
+		"'": '"'
+	}
+	function origChar (s) {
+		if (s === '_') {
+			return ' '
+		}
+		var c = fromEscape[s.charAt(1)]
+		if (!c) {
+			throw new Error('Illegal escape code', s)
+		}
+		return c
+	}
+	function escCode (c) {
+		if (c === ' ') {
+			return '_'
+		}
+		return '*' + toEscape[c]
+	}
+	var escapeRE = /(_|\*.)/g
+	function unescape (s) {
+		return s.replace(escapeRE, origChar)
+	}
+	var replaceRE = /([*_~%$+' ])/g
+	function escape (s) {
+		return s.replace(replaceRE, escCode)
+	}
+	function eat (a) {
+		return a.splice(0, 1)[0]
+	}
+
+	function decode (a) {
+		if (a.length === 0) {return }
+		var out, k, t
+		var t = eat(a)
+		if (!t) {return true}
+		var c = t.charAt(0)
+		if (c === '_') {
+			out = {}
+			k = unescape(t.slice(1))
+			while (k) {
+				if (!a.length) {
+					throw new Error('expected value after object key')
+				}
+				out[k] = decode(a)
+				k = false
+				if (a.length) {
+					t = eat(a)
+					if (t) {
+						k = unescape(t)
+					}
+				}
+			}
+		} else if (c === '.') {
+			out = []
+			a.unshift(t.slice(1))
+			while (a[0]) {
+				out.push(decode(a))
+			}
+			a.splice(0, 1)
+		} else if (c === '-') {
+			if (/^\d/.test(t.charAt(1))) {
+				out = Number(t)
+			} else {
+				k = unescape(t.slice(1))
+				if (k.charAt(0) === 'D') {
+					out = new Date(k.slice(1))
+				} else if (k in dict) {
+					out = dict[k]
+				} else {
+					throw new Error('Unknown dict reference', k)
+				}
+			}
+		} else if (numRE.test(c)) {
+			out = Number(t)
+		} else if (stringRE.test(c)) {
+			out = unescape(t)
+		} else if (c === '*') {
+			out = unescape(t.slice(1))
+		} else {
+			throw new Error('Cannot decode part ' + [t].concat(a).join('~'))
+		}
+		return out
+	}
+
+	function encode (v) {
+		var t, a, out, T = typeof v
+
+		if (T === 'number') {
+			out = isFinite(v) ? v : NULL
+		} else if (T === 'boolean') {
+			out = v ? '' : FALSE
+		} else if (T === 'string') {
+			t = escape(v)
+			if (stringRE.test(t)) {
+				out = t
+			} else {
+				out = '*' + t
+			}
+		} else if (T === 'object') {
+			if (!v) {
+				out = NULL
+			} else if (v instanceof Date) {
+				out = '-D' + v.toJSON().replace('T00:00:00.000Z', '')
+			} else if (Array.isArray(v)) {
+				a = []
+				for (var i = 0; i < v.length; i++) {
+					t = encode(v[i])
+					// Special case: only use full -T~ in arrays
+					a[i] = (t === '~' ? TRUE + '~' : t) || NULL
+				}
+
+				out = '.' + a.join('')
+			} else {
+				a = []
+				for (var key in v) {
+					if (v.hasOwnProperty(key)) {
+						var val = encode(v[key])
+
+						// skip undefined and functions
+						if (val !== UNDEF + '~') {
+							a.push(escape(key) + '~', val)
+						}
+					}
+				}
+
+				out = '_' + a.join('')
+			}
+		} else {
+			// function, undefined
+			out = UNDEF
+		}
+		return out + '~'
+	}
+
+	exports.stringify = function (v) {
+		return encode(v).replace(/~+$/, '~')
+	}
+
+	exports.parse = function (s) {
+		if (!s) return s
+		while (s.indexOf('%') !== -1) {
+			s = decodeURIComponent(s)
+		}
+		if (s.slice(-1) !== '~') {
+			throw new Error('not a JSURL2 string')
+		}
+		var parts = s.slice(0, -1).split('~')
+		return decode(parts)
+	}
+
+	exports.tryParse = function (s, def) {
+		try {
+			return exports.parse(s)
+		} catch (ex) {
+			return def
+		}
+	}
+})(typeof exports !== 'undefined' ? exports : (window.JSURL2 = window.JSURL2 || {}))
diff --git a/test/jsurl2.js b/test/jsurl2.js
new file mode 100644
index 0000000..172d313
--- /dev/null
+++ b/test/jsurl2.js
@@ -0,0 +1,95 @@
+import test from 'ava'
+import JSURL from '../lib/jsurl2'
+
+// test macro, both directions
+const cmp = (t, v, s) => {
+	// regular
+	t.is(JSURL.stringify(v), s)
+	// roundtrip
+	t.is(JSURL.stringify(JSURL.parse(s)), s)
+}
+cmp.title = (title, v, s) => `${title} ${s}`
+
+// basic values
+test(cmp, undefined, '-U~')
+test(cmp, function () { foo(); }, '-U~')
+test(cmp, null, '-N~')
+test(cmp, false, '-F~')
+test(cmp, true, '~')
+test(cmp, 0, '0~')
+test(cmp, 1, '1~')
+test(cmp, -1.5, '-1.5~')
+test(cmp, 'hello world\u203c', 'hello_world\u203c~')
+test(cmp, ' !"#$%&\'()*+,-./09:;<=>?@AZ[\\]^_`az{|}~', "*_!\"#*S*.&*\"()***P,-./09:;<=>?@AZ[\\]^*_`az{|}*-~")
+// JSON.stringify converts special numeric values to null
+test(cmp, NaN, '-N~')
+test(cmp, Infinity, '-N~')
+test(cmp, -Infinity, '-N~')
+test(cmp, new Date(1456898746898), '-D2016-03-02T06:05:46.898Z~')
+test(cmp, new Date('2017-04-01'), '-D2017-04-01~')
+
+// arrays
+test(cmp, [], '.~')
+test(cmp,
+	[
+		undefined, function () {
+			foo()
+		},
+		null, false, 0, 'hello world\u203c'
+	],
+	".-U~-U~-N~-F~0~hello_world\u203c~"
+)
+
+// objects
+test(cmp, {}, '_~')
+test(cmp, {
+	a: undefined,
+	b: function () {
+		foo()
+	},
+	c: null,
+	d: false,
+	t: true,
+	e: 0,
+	f: 'hello world\u203c'
+}, "_c~-N~d~-F~t~~e~0~f~hello_world\u203c~")
+
+// mix
+test(cmp, {
+	a: [
+		[1, 2],
+		[],
+		false,
+		{},
+		true,
+	],
+	b: [],
+	c: {
+		d: 'hello',
+		e: {},
+		f: [],
+		g: true,
+		n: null,
+	}
+}, '_a~..1~2~~.~-F~_~-T~~b~.~c~_d~hello~e~_~f~.~g~~n~-N~')
+
+test('percent-escaped single quotes', t => {
+	t.deepEqual(JSURL.parse('_a~*%27hello~b~*%27world~'), {
+		a: '\'hello',
+		b: '\'world',
+	})
+})
+
+test('percent-escaped percent-escaped single quotes', t => {
+	t.deepEqual(JSURL.parse('_a~*%2527hello~b~*%2525252527world~'), {
+		a: '\'hello',
+		b: '\'world'
+	})
+})
+
+test('tryParse', t => {
+	t.is(JSURL.tryParse('-N~'), null)
+	t.is(JSURL.tryParse('1~', 2), 1)
+	t.is(JSURL.tryParse('1'), undefined)
+	t.is(JSURL.tryParse('1', 0), 0)
+})

From 15cdfea0e98587ccc0ac16050c7e1682bc4f7606 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Sun, 2 Apr 2017 10:43:08 +0200
Subject: [PATCH 03/37] v2 rules update

* prefix _ instead of - for special constants
* () for objects
* !~ for arrays
---
 lib/jsurl2.js  | 55 +++++++++++++++++++++++++-------------------------
 test/jsurl2.js | 54 ++++++++++++++++++++++++-------------------------
 2 files changed, 54 insertions(+), 55 deletions(-)

diff --git a/lib/jsurl2.js b/lib/jsurl2.js
index 2cb97ec..e45434f 100644
--- a/lib/jsurl2.js
+++ b/lib/jsurl2.js
@@ -3,11 +3,11 @@
 ;(function (exports) {
 	'use strict'
 	var stringRE = /^[a-zA-Z]/
-	var numRE = /^\d/
-	var TRUE = '-T'
-	var FALSE = '-F'
-	var NULL = '-N'
-	var UNDEF = '-U'
+	var numRE = /^[\d-]/
+	var TRUE = '_T'
+	var FALSE = '_F'
+	var NULL = '_N'
+	var UNDEF = '_U'
 
 	var dict = {
 		T: true,
@@ -63,15 +63,18 @@
 	}
 
 	function decode (a) {
-		if (a.length === 0) {return }
+		if (a.length === 0) {
+			throw new Error('got empty array?')
+		}
 		var out, k, t
 		var t = eat(a)
 		if (!t) {return true}
 		var c = t.charAt(0)
-		if (c === '_') {
+		if (c === '(') {
 			out = {}
-			k = unescape(t.slice(1))
-			while (k) {
+			t = t.slice(1)
+			while (t && t.charAt(0) !== ')') {
+				k = unescape(t)
 				if (!a.length) {
 					throw new Error('expected value after object key')
 				}
@@ -79,30 +82,26 @@
 				k = false
 				if (a.length) {
 					t = eat(a)
-					if (t) {
-						k = unescape(t)
-					}
 				}
 			}
-		} else if (c === '.') {
+			if (t.charAt(0) === ')') {
+				a.unshift(t.slice(1))
+			}
+		} else if (c === '!') {
 			out = []
 			a.unshift(t.slice(1))
 			while (a[0]) {
 				out.push(decode(a))
 			}
 			a.splice(0, 1)
-		} else if (c === '-') {
-			if (/^\d/.test(t.charAt(1))) {
-				out = Number(t)
+		} else if (c === '_') {
+			k = unescape(t.slice(1))
+			if (k.charAt(0) === 'D') {
+				out = new Date(k.slice(1))
+			} else if (k in dict) {
+				out = dict[k]
 			} else {
-				k = unescape(t.slice(1))
-				if (k.charAt(0) === 'D') {
-					out = new Date(k.slice(1))
-				} else if (k in dict) {
-					out = dict[k]
-				} else {
-					throw new Error('Unknown dict reference', k)
-				}
+				throw new Error('Unknown dict reference', k)
 			}
 		} else if (numRE.test(c)) {
 			out = Number(t)
@@ -134,7 +133,7 @@
 			if (!v) {
 				out = NULL
 			} else if (v instanceof Date) {
-				out = '-D' + v.toJSON().replace('T00:00:00.000Z', '')
+				out = '_D' + v.toJSON().replace('T00:00:00.000Z', '')
 			} else if (Array.isArray(v)) {
 				a = []
 				for (var i = 0; i < v.length; i++) {
@@ -143,7 +142,7 @@
 					a[i] = (t === '~' ? TRUE + '~' : t) || NULL
 				}
 
-				out = '.' + a.join('')
+				out = '!' + a.join('')
 			} else {
 				a = []
 				for (var key in v) {
@@ -157,7 +156,7 @@
 					}
 				}
 
-				out = '_' + a.join('')
+				return '(' + a.join('') + ')'
 			}
 		} else {
 			// function, undefined
@@ -167,7 +166,7 @@
 	}
 
 	exports.stringify = function (v) {
-		return encode(v).replace(/~+$/, '~')
+		return encode(v).replace(/~*$/, '~')
 	}
 
 	exports.parse = function (s) {
diff --git a/test/jsurl2.js b/test/jsurl2.js
index 172d313..5558386 100644
--- a/test/jsurl2.js
+++ b/test/jsurl2.js
@@ -11,25 +11,25 @@ const cmp = (t, v, s) => {
 cmp.title = (title, v, s) => `${title} ${s}`
 
 // basic values
-test(cmp, undefined, '-U~')
-test(cmp, function () { foo(); }, '-U~')
-test(cmp, null, '-N~')
-test(cmp, false, '-F~')
+test(cmp, undefined, '_U~')
+test(cmp, function () { foo(); }, '_U~')
+test(cmp, null, '_N~')
+test(cmp, false, '_F~')
 test(cmp, true, '~')
 test(cmp, 0, '0~')
 test(cmp, 1, '1~')
 test(cmp, -1.5, '-1.5~')
 test(cmp, 'hello world\u203c', 'hello_world\u203c~')
-test(cmp, ' !"#$%&\'()*+,-./09:;<=>?@AZ[\\]^_`az{|}~', "*_!\"#*S*.&*\"()***P,-./09:;<=>?@AZ[\\]^*_`az{|}*-~")
+test(cmp, ' !"#$%&\'()*+,-./09:;<=>?@AZ[\\]^_`az{|}~', '*_!"#*S*.&*"()***P,-./09:;<=>?@AZ[\\]^*_`az{|}*-~')
 // JSON.stringify converts special numeric values to null
-test(cmp, NaN, '-N~')
-test(cmp, Infinity, '-N~')
-test(cmp, -Infinity, '-N~')
-test(cmp, new Date(1456898746898), '-D2016-03-02T06:05:46.898Z~')
-test(cmp, new Date('2017-04-01'), '-D2017-04-01~')
+test(cmp, NaN, '_N~')
+test(cmp, Infinity, '_N~')
+test(cmp, -Infinity, '_N~')
+test(cmp, new Date(1456898746898), '_D2016-03-02T06:05:46.898Z~')
+test(cmp, new Date('2017-04-01'), '_D2017-04-01~')
 
 // arrays
-test(cmp, [], '.~')
+test(cmp, [], '!~')
 test(cmp,
 	[
 		undefined, function () {
@@ -37,11 +37,11 @@ test(cmp,
 		},
 		null, false, 0, 'hello world\u203c'
 	],
-	".-U~-U~-N~-F~0~hello_world\u203c~"
+	'!_U~_U~_N~_F~0~hello_world\u203c~'
 )
 
 // objects
-test(cmp, {}, '_~')
+test(cmp, {}, '()~')
 test(cmp, {
 	a: undefined,
 	b: function () {
@@ -51,8 +51,8 @@ test(cmp, {
 	d: false,
 	t: true,
 	e: 0,
-	f: 'hello world\u203c'
-}, "_c~-N~d~-F~t~~e~0~f~hello_world\u203c~")
+	f: 'hello (world)\u203c'
+}, '(c~_N~d~_F~t~~e~0~f~hello_(world)\u203c~)~')
 
 // mix
 test(cmp, {
@@ -60,35 +60,35 @@ test(cmp, {
 		[1, 2],
 		[],
 		false,
-		{},
 		true,
+		{},
 	],
-	b: [],
 	c: {
 		d: 'hello',
 		e: {},
 		f: [],
 		g: true,
-		n: null,
-	}
-}, '_a~..1~2~~.~-F~_~-T~~b~.~c~_d~hello~e~_~f~.~g~~n~-N~')
+		n: null
+	},
+	b: [],
+}, '(a~!!1~2~~!~_F~_T~()~c~(d~hello~e~()f~!~g~~n~_N~)b~!~)~')
 
 test('percent-escaped single quotes', t => {
-	t.deepEqual(JSURL.parse('_a~*%27hello~b~*%27world~'), {
-		a: '\'hello',
-		b: '\'world',
+	t.deepEqual(JSURL.parse('(a~*%27hello~b~*%27world~)~'), {
+		a: "'hello",
+		b: "'world"
 	})
 })
 
 test('percent-escaped percent-escaped single quotes', t => {
-	t.deepEqual(JSURL.parse('_a~*%2527hello~b~*%2525252527world~'), {
-		a: '\'hello',
-		b: '\'world'
+	t.deepEqual(JSURL.parse('(a~*%2527hello~b~*%2525252527world~)~'), {
+		a: "'hello",
+		b: "'world"
 	})
 })
 
 test('tryParse', t => {
-	t.is(JSURL.tryParse('-N~'), null)
+	t.is(JSURL.tryParse('_N~'), null)
 	t.is(JSURL.tryParse('1~', 2), 1)
 	t.is(JSURL.tryParse('1'), undefined)
 	t.is(JSURL.tryParse('1', 0), 0)

From fd512d6e98c88d34aabfe75558391dc9af317566 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Sun, 2 Apr 2017 10:45:48 +0200
Subject: [PATCH 04/37] Make sure individual imports work in ES6

---
 test/jsurl.js  | 18 +++++++++---------
 test/jsurl2.js | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/test/jsurl.js b/test/jsurl.js
index 6f986e3..e36510f 100644
--- a/test/jsurl.js
+++ b/test/jsurl.js
@@ -1,12 +1,12 @@
 import test from 'ava'
-import JSURL from '../lib/jsurl'
+import {stringify, parse, tryParse} from '../lib/jsurl'
 
 // test macro, both directions
 const cmp = (t, v, s) => {
 	// regular
-	t.is(JSURL.stringify(v), s)
+	t.is(stringify(v), s)
 	// roundtrip
-	t.is(JSURL.stringify(JSURL.parse(s)), s)
+	t.is(stringify(parse(s)), s)
 }
 cmp.title = (title, v, s) => `${title} ${s}`
 
@@ -62,22 +62,22 @@ test(cmp, {
 }, "~(a~(~(~1~2)~(~)~())~b~(~)~c~(d~'hello~e~()~f~(~)))")
 
 test('percent-escaped single quotes', t => {
-	t.deepEqual(JSURL.parse('~(a~%27hello~b~%27world)'), {
+	t.deepEqual(parse('~(a~%27hello~b~%27world)'), {
 		a: 'hello',
 		b: 'world'
 	})
 })
 
 test('percent-escaped percent-escaped single quotes', t => {
-	t.deepEqual(JSURL.parse('~(a~%2527hello~b~%2525252527world)'), {
+	t.deepEqual(parse('~(a~%2527hello~b~%2525252527world)'), {
 		a: 'hello',
 		b: 'world'
 	})
 })
 
 test('tryParse', t => {
-	t.is(JSURL.tryParse('~null'), null)
-	t.is(JSURL.tryParse('~1', 2), 1)
-	t.is(JSURL.tryParse('1'), undefined)
-	t.is(JSURL.tryParse('1', 0), 0)
+	t.is(tryParse('~null'), null)
+	t.is(tryParse('~1', 2), 1)
+	t.is(tryParse('1'), undefined)
+	t.is(tryParse('1', 0), 0)
 })
diff --git a/test/jsurl2.js b/test/jsurl2.js
index 5558386..c041036 100644
--- a/test/jsurl2.js
+++ b/test/jsurl2.js
@@ -1,12 +1,12 @@
 import test from 'ava'
-import JSURL from '../lib/jsurl2'
+import {stringify, parse, tryParse} from '../lib/jsurl2'
 
 // test macro, both directions
 const cmp = (t, v, s) => {
 	// regular
-	t.is(JSURL.stringify(v), s)
+	t.is(stringify(v), s)
 	// roundtrip
-	t.is(JSURL.stringify(JSURL.parse(s)), s)
+	t.is(stringify(parse(s)), s)
 }
 cmp.title = (title, v, s) => `${title} ${s}`
 
@@ -74,22 +74,22 @@ test(cmp, {
 }, '(a~!!1~2~~!~_F~_T~()~c~(d~hello~e~()f~!~g~~n~_N~)b~!~)~')
 
 test('percent-escaped single quotes', t => {
-	t.deepEqual(JSURL.parse('(a~*%27hello~b~*%27world~)~'), {
+	t.deepEqual(parse('(a~*%27hello~b~*%27world~)~'), {
 		a: "'hello",
 		b: "'world"
 	})
 })
 
 test('percent-escaped percent-escaped single quotes', t => {
-	t.deepEqual(JSURL.parse('(a~*%2527hello~b~*%2525252527world~)~'), {
+	t.deepEqual(parse('(a~*%2527hello~b~*%2525252527world~)~'), {
 		a: "'hello",
 		b: "'world"
 	})
 })
 
 test('tryParse', t => {
-	t.is(JSURL.tryParse('_N~'), null)
-	t.is(JSURL.tryParse('1~', 2), 1)
-	t.is(JSURL.tryParse('1'), undefined)
-	t.is(JSURL.tryParse('1', 0), 0)
+	t.is(tryParse('_N~'), null)
+	t.is(tryParse('1~', 2), 1)
+	t.is(tryParse('1'), undefined)
+	t.is(tryParse('1', 0), 0)
 })

From b6ac1e243285ccf56495140be0425c472e901d90 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Sun, 2 Apr 2017 10:46:58 +0200
Subject: [PATCH 05/37] Poor man's performance "test"

Very variable but gives an idea. v1 is twice as fast as v2 despite doing more work :( Needs profiling.
---
 test/jsurl.js  | 24 ++++++++++++++++++++++++
 test/jsurl2.js | 24 ++++++++++++++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/test/jsurl.js b/test/jsurl.js
index e36510f..f066e2f 100644
--- a/test/jsurl.js
+++ b/test/jsurl.js
@@ -81,3 +81,27 @@ test('tryParse', t => {
 	t.is(tryParse('1'), undefined)
 	t.is(tryParse('1', 0), 0)
 })
+
+test('parse performance', t => {
+  const n = Date.now()
+  const s = '~(a~%2527hello~b~%2525252527world)'
+	const count = 10000
+  for (let i = 0; i < count; i++) {
+    parse(s)
+  }
+  const ms = Date.now() - n
+  console.log(`${count} parsed in ${ms}ms, ${ms / count}ms/item`)
+  t.true(ms < 300)
+})
+
+test('stringify performance', t => {
+  const n = Date.now()
+  const v = { a: [ [1, 2], [], false, {}, true ], b: [], c: { d: 'hello', e: {}, f: [], g: true, n: null } }
+	const count = 10000
+  for (let i = 0; i < count; i++) {
+    stringify(v)
+  }
+  const ms = Date.now() - n
+  console.log(`${count} stringified in ${ms}ms, ${ms / count}ms/item`)
+  t.true(ms < 300)
+})
diff --git a/test/jsurl2.js b/test/jsurl2.js
index c041036..cae7c6c 100644
--- a/test/jsurl2.js
+++ b/test/jsurl2.js
@@ -93,3 +93,27 @@ test('tryParse', t => {
 	t.is(tryParse('1'), undefined)
 	t.is(tryParse('1', 0), 0)
 })
+
+test('parse performance', t => {
+	const n = Date.now()
+	const s = '(a~*%2527hello~b~*%2525252527world~)~'
+	const count = 10000
+	for (let i = 0; i < count; i++) {
+		parse(s)
+	}
+	const ms = Date.now() - n
+	console.log(`v2: ${count} parsed in ${ms}ms, ${ms / count}ms/item`)
+	t.true(ms < 300)
+})
+
+test('stringify performance', t => {
+	const n = Date.now()
+	const v = { a: [ [1, 2], [], false, {}, true ], b: [], c: { d: 'hello', e: {}, f: [], g: true, n: null } }
+	const count = 10000
+	for (let i = 0; i < count; i++) {
+		stringify(v)
+	}
+	const ms = Date.now() - n
+	console.log(`v2: ${count} stringified in ${ms}ms, ${ms / count}ms/item`)
+	t.true(ms < 300)
+})

From 1b6af29f5a18982d6c0f9af8f793f78de44eed5e Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Sun, 2 Apr 2017 14:03:52 +0200
Subject: [PATCH 06/37] v2: make ~ on last element of object optional

* not for final ~ representing `true` value
* switch parser to using string indexes instead of splitting into array, so the end-of-object can be distinguished from ~
---
 lib/jsurl2.js  | 109 +++++++++++++++++++++++++++++++------------------
 test/jsurl2.js |  20 +++++----
 2 files changed, 82 insertions(+), 47 deletions(-)

diff --git a/lib/jsurl2.js b/lib/jsurl2.js
index e45434f..26d1304 100644
--- a/lib/jsurl2.js
+++ b/lib/jsurl2.js
@@ -23,7 +23,9 @@
 		'.': '%',
 		'S': '$',
 		'P': '+',
-		'"': "'"
+		'"': "'",
+		'C': '(',
+		'D': ')',
 	}
 	var toEscape = {
 		'*': '*',
@@ -32,7 +34,9 @@
 		'%': '.',
 		'$': 'S',
 		'+': 'P',
-		"'": '"'
+		"'": '"',
+		'(': 'C',
+		')': 'D',
 	}
 	function origChar (s) {
 		if (s === '_') {
@@ -54,48 +58,64 @@
 	function unescape (s) {
 		return s.replace(escapeRE, origChar)
 	}
-	var replaceRE = /([*_~%$+' ])/g
+	var replaceRE = /([*_~%$+'() ])/g
 	function escape (s) {
 		return s.replace(replaceRE, escCode)
 	}
 	function eat (a) {
-		return a.splice(0, 1)[0]
+		var j, c
+		for (
+			var j = a.i;
+			j < a.l && (c = a.s.charAt(j), c !== '~' && c !== ')');
+			j++
+		) {}
+		var w = a.s.slice(a.i, j)
+		if (c === '~') {
+			j++
+		}
+		a.i = j
+		return w
 	}
-
+	function peek (a) {
+		return a.s.charAt(a.i)
+	}
+	function eatOne (a) {
+		a.i++
+	}
+	var EOS = {} // unique symbol
 	function decode (a) {
-		if (a.length === 0) {
-			throw new Error('got empty array?')
-		}
 		var out, k, t
-		var t = eat(a)
-		if (!t) {return true}
-		var c = t.charAt(0)
-		if (c === '(') {
+		var c = peek(a)
+		if (!c) {return EOS}
+		if (c === '~') {
+			eatOne(a)
+			out = true
+		} else if (c === '(') {
+			eatOne(a)
 			out = {}
-			t = t.slice(1)
-			while (t && t.charAt(0) !== ')') {
-				k = unescape(t)
-				if (!a.length) {
+			while (c = peek(a), c && c !== ')') {
+				k = unescape(eat(a))
+				t = decode(a)
+				if (t === EOS) {
 					throw new Error('expected value after object key')
 				}
-				out[k] = decode(a)
-				k = false
-				if (a.length) {
-					t = eat(a)
-				}
+				out[k] = t
 			}
-			if (t.charAt(0) === ')') {
-				a.unshift(t.slice(1))
+			if (c === ')') {
+				eatOne(a)
 			}
 		} else if (c === '!') {
+			eatOne(a)
 			out = []
-			a.unshift(t.slice(1))
-			while (a[0]) {
+			while (c = peek(a), c && c !== '~' && c !== ')') {
 				out.push(decode(a))
 			}
-			a.splice(0, 1)
+			if (c === '~') {
+				eatOne(a)
+			}
 		} else if (c === '_') {
-			k = unescape(t.slice(1))
+			eatOne(a)
+			k = unescape(eat(a))
 			if (k.charAt(0) === 'D') {
 				out = new Date(k.slice(1))
 			} else if (k in dict) {
@@ -104,19 +124,21 @@
 				throw new Error('Unknown dict reference', k)
 			}
 		} else if (numRE.test(c)) {
-			out = Number(t)
+			out = Number(eat(a))
 		} else if (stringRE.test(c)) {
-			out = unescape(t)
+			out = unescape(eat(a))
 		} else if (c === '*') {
-			out = unescape(t.slice(1))
+			eatOne(a)
+			out = unescape(eat(a))
 		} else {
 			throw new Error('Cannot decode part ' + [t].concat(a).join('~'))
 		}
 		return out
 	}
 
+	var endTildesRE = /~*$/
 	function encode (v) {
-		var t, a, out, T = typeof v
+		var t, a, out, T = typeof v, val
 
 		if (T === 'number') {
 			out = isFinite(v) ? v : NULL
@@ -145,9 +167,10 @@
 				out = '!' + a.join('')
 			} else {
 				a = []
+				val = undefined
 				for (var key in v) {
 					if (v.hasOwnProperty(key)) {
-						var val = encode(v[key])
+						val = encode(v[key])
 
 						// skip undefined and functions
 						if (val !== UNDEF + '~') {
@@ -155,8 +178,12 @@
 						}
 					}
 				}
+				t = a.join('')
+				if (val !== true) {
+					t = t.replace(endTildesRE, '')
+				}
 
-				return '(' + a.join('') + ')'
+				return '(' + t + ')'
 			}
 		} else {
 			// function, undefined
@@ -166,19 +193,21 @@
 	}
 
 	exports.stringify = function (v) {
-		return encode(v).replace(/~*$/, '~')
+		return encode(v).replace(endTildesRE, '~')
 	}
 
-	exports.parse = function (s) {
+	exports.parse = function (s, options) {
 		if (!s) return s
-		while (s.indexOf('%') !== -1) {
-			s = decodeURIComponent(s)
+		if (options && options.deURI) {
+			while (s.indexOf('%') !== -1) {
+				s = decodeURIComponent(s)
+			}
 		}
-		if (s.slice(-1) !== '~') {
+		var l = s.length
+		if (s.charAt(l - 1) !== '~') {
 			throw new Error('not a JSURL2 string')
 		}
-		var parts = s.slice(0, -1).split('~')
-		return decode(parts)
+		return decode({s: s, i: 0, l: l})
 	}
 
 	exports.tryParse = function (s, def) {
diff --git a/test/jsurl2.js b/test/jsurl2.js
index cae7c6c..1659e76 100644
--- a/test/jsurl2.js
+++ b/test/jsurl2.js
@@ -20,7 +20,10 @@ test(cmp, 0, '0~')
 test(cmp, 1, '1~')
 test(cmp, -1.5, '-1.5~')
 test(cmp, 'hello world\u203c', 'hello_world\u203c~')
-test(cmp, ' !"#$%&\'()*+,-./09:;<=>?@AZ[\\]^_`az{|}~', '*_!"#*S*.&*"()***P,-./09:;<=>?@AZ[\\]^*_`az{|}*-~')
+test(cmp,
+	' !"#$%&\'()*+,-./09:;<=>?@AZ[\\]^_`az{|}~',
+	'*_!"#*S*.&*"*C*D***P,-./09:;<=>?@AZ[\\]^*_`az{|}*-~'
+)
 // JSON.stringify converts special numeric values to null
 test(cmp, NaN, '_N~')
 test(cmp, Infinity, '_N~')
@@ -52,8 +55,9 @@ test(cmp, {
 	t: true,
 	e: 0,
 	f: 'hello (world)\u203c'
-}, '(c~_N~d~_F~t~~e~0~f~hello_(world)\u203c~)~')
-
+}, '(c~_N~d~_F~t~~e~0~f~hello_*Cworld*D\u203c)~')
+test(cmp, {"()": {}, c: {"~": "()"}}, '(*C*D~()c~(*-~**C*D))~')
+test(cmp, {a: [[[1]]]}, '(a~!!!1)~')
 // mix
 test(cmp, {
 	a: [
@@ -71,17 +75,18 @@ test(cmp, {
 		n: null
 	},
 	b: [],
-}, '(a~!!1~2~~!~_F~_T~()~c~(d~hello~e~()f~!~g~~n~_N~)b~!~)~')
+}, '(a~!!1~2~~!~_F~_T~()~c~(d~hello~e~()f~!~g~~n~_N)b~!)~')
+test(cmp, [[{a: [{b: [[1]]}]}]], '!!(a~!(b~!!1))~')
 
 test('percent-escaped single quotes', t => {
-	t.deepEqual(parse('(a~*%27hello~b~*%27world~)~'), {
+	t.deepEqual(parse('(a~*%27hello~b~*%27world~)~', {deURI: true}), {
 		a: "'hello",
 		b: "'world"
 	})
 })
 
 test('percent-escaped percent-escaped single quotes', t => {
-	t.deepEqual(parse('(a~*%2527hello~b~*%2525252527world~)~'), {
+	t.deepEqual(parse('(a~*%2527hello~b~*%2525252527world~)~', {deURI: true}), {
 		a: "'hello",
 		b: "'world"
 	})
@@ -96,7 +101,8 @@ test('tryParse', t => {
 
 test('parse performance', t => {
 	const n = Date.now()
-	const s = '(a~*%2527hello~b~*%2525252527world~)~'
+	const v = { a: [ [1, 2], [], false, {}, true ], b: [], c: { d: 'hello', e: {}, f: [], g: true, n: null } }
+	const s = stringify(v)
 	const count = 10000
 	for (let i = 0; i < count; i++) {
 		parse(s)

From bea30da5fcfc32515cab85a905bc65ba13335e24 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Sun, 2 Apr 2017 14:05:30 +0200
Subject: [PATCH 07/37] Add performance.html to use chrome profiling tools

v2 parse is faster than v1, but stringify is slower
---
 examples/performance.html | 50 +++++++++++++++++++++++++++++++++++++++
 test/jsurl.js             | 33 +++++++++++++-------------
 2 files changed, 67 insertions(+), 16 deletions(-)
 create mode 100644 examples/performance.html

diff --git a/examples/performance.html b/examples/performance.html
new file mode 100644
index 0000000..0f32cd5
--- /dev/null
+++ b/examples/performance.html
@@ -0,0 +1,50 @@
+<!DOCTYPE HTML>
+<title>JSURL Performance </title>
+<script src="../lib/jsurl.js" type="application/javascript"></script>
+<script src="../lib/jsurl2.js" type="application/javascript"></script>
+<script>
+	const count = 200000
+	const v = { a: [ [1, 2], [], false, {}, true ], b: [], c: { d: 'hello', e: {}, f: [], g: true, n: null } }
+	const v1Parse = () => {
+		const n = Date.now()
+		const s = JSURL.stringify(v)
+		for (let i = 0; i < count; i++) {
+			JSURL.parse(s)
+		}
+		const ms = Date.now() - n
+		console.log(`v1: ${count} parsed in ${ms}ms, ${ms / count}ms/item`)
+	}
+	const v1Stringify = () => {
+		const n = Date.now()
+		for (let i = 0; i < count; i++) {
+			JSURL.stringify(v)
+		}
+		const ms = Date.now() - n
+		console.log(`v1: ${count} stringified in ${ms}ms, ${ms / count}ms/item`)
+	}
+	const v2Parse = () => {
+		const n = Date.now()
+		const s = JSURL2.stringify(v)
+		for (let i = 0; i < count; i++) {
+			JSURL2.parse(s)
+		}
+		const ms = Date.now() - n
+		console.log(`v2: ${count} parsed in ${ms}ms, ${ms / count}ms/item`)
+	}
+	const v2Stringify = () => {
+		const n = Date.now()
+		for (let j = 0; j < count; j++) {
+			JSURL2.stringify(v)
+		}
+		const ms = Date.now() - n
+		console.log(`v2: ${count} stringified in ${ms}ms, ${ms / count}ms/item`)
+	}
+	window.onload = () => {
+		v1Parse()
+		v1Stringify()
+		v2Parse()
+		v2Stringify()
+	}
+</script>
+
+<p>Use the Chrome Devtools Timeline to profile page load. See JS console for timings.</p>
\ No newline at end of file
diff --git a/test/jsurl.js b/test/jsurl.js
index f066e2f..b8555ff 100644
--- a/test/jsurl.js
+++ b/test/jsurl.js
@@ -83,25 +83,26 @@ test('tryParse', t => {
 })
 
 test('parse performance', t => {
-  const n = Date.now()
-  const s = '~(a~%2527hello~b~%2525252527world)'
+	const n = Date.now()
+	const v = { a: [ [1, 2], [], false, {}, true ], b: [], c: { d: 'hello', e: {}, f: [], g: true, n: null } }
+	const s = stringify(v)
 	const count = 10000
-  for (let i = 0; i < count; i++) {
-    parse(s)
-  }
-  const ms = Date.now() - n
-  console.log(`${count} parsed in ${ms}ms, ${ms / count}ms/item`)
-  t.true(ms < 300)
+	for (let i = 0; i < count; i++) {
+		parse(s)
+	}
+	const ms = Date.now() - n
+	console.log(`${count} parsed in ${ms}ms, ${ms / count}ms/item`)
+	t.true(ms < 300)
 })
 
 test('stringify performance', t => {
-  const n = Date.now()
-  const v = { a: [ [1, 2], [], false, {}, true ], b: [], c: { d: 'hello', e: {}, f: [], g: true, n: null } }
+	const n = Date.now()
+	const v = { a: [ [1, 2], [], false, {}, true ], b: [], c: { d: 'hello', e: {}, f: [], g: true, n: null } }
 	const count = 10000
-  for (let i = 0; i < count; i++) {
-    stringify(v)
-  }
-  const ms = Date.now() - n
-  console.log(`${count} stringified in ${ms}ms, ${ms / count}ms/item`)
-  t.true(ms < 300)
+	for (let i = 0; i < count; i++) {
+		stringify(v)
+	}
+	const ms = Date.now() - n
+	console.log(`${count} stringified in ${ms}ms, ${ms / count}ms/item`)
+	t.true(ms < 300)
 })

From ed7f6b646f11692107fabe976de794b59ac27516 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Sun, 2 Apr 2017 16:12:31 +0200
Subject: [PATCH 08/37] Add `short` option and fix `true` in objects

---
 lib/jsurl2.js  | 33 +++++++++++---------
 test/jsurl2.js | 82 +++++++++++++++++++++++++++++---------------------
 2 files changed, 65 insertions(+), 50 deletions(-)

diff --git a/lib/jsurl2.js b/lib/jsurl2.js
index 26d1304..963ad89 100644
--- a/lib/jsurl2.js
+++ b/lib/jsurl2.js
@@ -95,9 +95,11 @@
 			out = {}
 			while (c = peek(a), c && c !== ')') {
 				k = unescape(eat(a))
-				t = decode(a)
-				if (t === EOS) {
-					throw new Error('expected value after object key')
+				c = peek(a)
+				if (c && c !== ')') {
+					t = decode(a)
+				} else {
+					t = true
 				}
 				out[k] = t
 			}
@@ -167,7 +169,6 @@
 				out = '!' + a.join('')
 			} else {
 				a = []
-				val = undefined
 				for (var key in v) {
 					if (v.hasOwnProperty(key)) {
 						val = encode(v[key])
@@ -178,10 +179,7 @@
 						}
 					}
 				}
-				t = a.join('')
-				if (val !== true) {
-					t = t.replace(endTildesRE, '')
-				}
+				t = a.join('').replace(endTildesRE, '')
 
 				return '(' + t + ')'
 			}
@@ -192,22 +190,27 @@
 		return out + '~'
 	}
 
-	exports.stringify = function (v) {
-		return encode(v).replace(endTildesRE, '~')
+	var allTerminatorsRE = /\)*~*$/
+	exports.stringify = function (v, options) {
+		var r = encode(v)
+		if (options && options.short) {
+			return r.replace(allTerminatorsRE, '')
+		}
+		return r.replace(endTildesRE, '~')
 	}
 
 	exports.parse = function (s, options) {
-		if (!s) return s
 		if (options && options.deURI) {
 			while (s.indexOf('%') !== -1) {
 				s = decodeURIComponent(s)
 			}
 		}
 		var l = s.length
-		if (s.charAt(l - 1) !== '~') {
-			throw new Error('not a JSURL2 string')
-		}
-		return decode({s: s, i: 0, l: l})
+		// if (s.charAt(l - 1) !== '~') {
+		// 	throw new Error('not a JSURL2 string')
+		// }
+		var r = decode({s: s, i: 0, l: l})
+		return r === EOS ? true : r
 	}
 
 	exports.tryParse = function (s, def) {
diff --git a/test/jsurl2.js b/test/jsurl2.js
index 1659e76..dd04b49 100644
--- a/test/jsurl2.js
+++ b/test/jsurl2.js
@@ -2,37 +2,43 @@ import test from 'ava'
 import {stringify, parse, tryParse} from '../lib/jsurl2'
 
 // test macro, both directions
-const cmp = (t, v, s) => {
+const cmp = (t, v, s, short) => {
 	// regular
 	t.is(stringify(v), s)
 	// roundtrip
 	t.is(stringify(parse(s)), s)
+	// short
+	t.is(stringify(v, {short: true}), short)
+	t.is(stringify(parse(short), {short: true}), short)
 }
 cmp.title = (title, v, s) => `${title} ${s}`
 
 // basic values
-test(cmp, undefined, '_U~')
-test(cmp, function () { foo(); }, '_U~')
-test(cmp, null, '_N~')
-test(cmp, false, '_F~')
-test(cmp, true, '~')
-test(cmp, 0, '0~')
-test(cmp, 1, '1~')
-test(cmp, -1.5, '-1.5~')
-test(cmp, 'hello world\u203c', 'hello_world\u203c~')
+test(cmp, undefined, '_U~', '_U')
+test(cmp, function () { foo(); }, '_U~', '_U')
+test(cmp, null, '_N~', '_N')
+test(cmp, false, '_F~', '_F')
+test(cmp, true, '~', '')
+test(cmp, 0, '0~', '0')
+test(cmp, 1, '1~', '1')
+test(cmp, -1.5, '-1.5~', '-1.5')
+test(cmp, '', '*~', '*')
+test(cmp, 'hello world\u203c', 'hello_world\u203c~', 'hello_world\u203c')
 test(cmp,
 	' !"#$%&\'()*+,-./09:;<=>?@AZ[\\]^_`az{|}~',
-	'*_!"#*S*.&*"*C*D***P,-./09:;<=>?@AZ[\\]^*_`az{|}*-~'
+	'*_!"#*S*.&*"*C*D***P,-./09:;<=>?@AZ[\\]^*_`az{|}*-~',
+	'*_!"#*S*.&*"*C*D***P,-./09:;<=>?@AZ[\\]^*_`az{|}*-'
 )
 // JSON.stringify converts special numeric values to null
-test(cmp, NaN, '_N~')
-test(cmp, Infinity, '_N~')
-test(cmp, -Infinity, '_N~')
-test(cmp, new Date(1456898746898), '_D2016-03-02T06:05:46.898Z~')
-test(cmp, new Date('2017-04-01'), '_D2017-04-01~')
+test(cmp, NaN, '_N~', '_N')
+test(cmp, Infinity, '_N~', '_N')
+test(cmp, -Infinity, '_N~', '_N')
+test(cmp, new Date(1456898746898), '_D2016-03-02T06:05:46.898Z~', '_D2016-03-02T06:05:46.898Z')
+test(cmp, new Date('2017-04-01'), '_D2017-04-01~', '_D2017-04-01')
 
 // arrays
-test(cmp, [], '!~')
+test(cmp, [], '!~', '!')
+test(cmp, [true], '!_T~', '!_T')
 test(cmp,
 	[
 		undefined, function () {
@@ -40,24 +46,30 @@ test(cmp,
 		},
 		null, false, 0, 'hello world\u203c'
 	],
-	'!_U~_U~_N~_F~0~hello_world\u203c~'
+	'!_U~_U~_N~_F~0~hello_world\u203c~',
+	'!_U~_U~_N~_F~0~hello_world\u203c'
 )
 
 // objects
-test(cmp, {}, '()~')
-test(cmp, {
-	a: undefined,
-	b: function () {
-		foo()
+test(cmp, {}, '()~', '(')
+test(cmp, {a: true, b: true, c: true}, '(a~~b~~c)~', '(a~~b~~c')
+test(cmp,
+	{
+		a: undefined,
+		b: function () {
+			foo()
+		},
+		c: null,
+		d: false,
+		t: true,
+		e: 0,
+		f: 'hello (world)\u203c'
 	},
-	c: null,
-	d: false,
-	t: true,
-	e: 0,
-	f: 'hello (world)\u203c'
-}, '(c~_N~d~_F~t~~e~0~f~hello_*Cworld*D\u203c)~')
-test(cmp, {"()": {}, c: {"~": "()"}}, '(*C*D~()c~(*-~**C*D))~')
-test(cmp, {a: [[[1]]]}, '(a~!!!1)~')
+	'(c~_N~d~_F~t~~e~0~f~hello_*Cworld*D\u203c)~',
+	'(c~_N~d~_F~t~~e~0~f~hello_*Cworld*D\u203c',
+)
+test(cmp, {"()": {}, c: {"~": "()"}}, '(*C*D~()c~(*-~**C*D))~', '(*C*D~()c~(*-~**C*D')
+test(cmp, {a: [[[1]]]}, '(a~!!!1)~', '(a~!!!1')
 // mix
 test(cmp, {
 	a: [
@@ -75,8 +87,8 @@ test(cmp, {
 		n: null
 	},
 	b: [],
-}, '(a~!!1~2~~!~_F~_T~()~c~(d~hello~e~()f~!~g~~n~_N)b~!)~')
-test(cmp, [[{a: [{b: [[1]]}]}]], '!!(a~!(b~!!1))~')
+}, '(a~!!1~2~~!~_F~_T~()~c~(d~hello~e~()f~!~g~~n~_N)b~!)~', '(a~!!1~2~~!~_F~_T~()~c~(d~hello~e~()f~!~g~~n~_N)b~!')
+test(cmp, [[{a: [{b: [[1]]}]}]], '!!(a~!(b~!!1))~', '!!(a~!(b~!!1')
 
 test('percent-escaped single quotes', t => {
 	t.deepEqual(parse('(a~*%27hello~b~*%27world~)~', {deURI: true}), {
@@ -95,8 +107,8 @@ test('percent-escaped percent-escaped single quotes', t => {
 test('tryParse', t => {
 	t.is(tryParse('_N~'), null)
 	t.is(tryParse('1~', 2), 1)
-	t.is(tryParse('1'), undefined)
-	t.is(tryParse('1', 0), 0)
+	t.is(tryParse('_'), undefined)
+	t.is(tryParse('_', 0), 0)
 })
 
 test('parse performance', t => {

From 5986de0242069abdd3c47ca808a138f56243d106 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Sun, 2 Apr 2017 21:59:20 +0200
Subject: [PATCH 09/37] Performance improvements

It stringifies slower than v1 and JSON, but it parses faster than v1 and JSON :)
---
 examples/performance.html | 19 +++++++++++++++++++
 lib/jsurl2.js             | 24 +++++++++++++-----------
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/examples/performance.html b/examples/performance.html
index 0f32cd5..8bc9178 100644
--- a/examples/performance.html
+++ b/examples/performance.html
@@ -5,6 +5,23 @@
 <script>
 	const count = 200000
 	const v = { a: [ [1, 2], [], false, {}, true ], b: [], c: { d: 'hello', e: {}, f: [], g: true, n: null } }
+	const JSONParse = () => {
+		const n = Date.now()
+		const s = JSON.stringify(v)
+		for (let i = 0; i < count; i++) {
+			JSON.parse(s)
+		}
+		const ms = Date.now() - n
+		console.log(`JSON: ${count} parsed in ${ms}ms, ${ms / count}ms/item`)
+	}
+	const JSONStringify = () => {
+		const n = Date.now()
+		for (let i = 0; i < count; i++) {
+			JSON.stringify(v)
+		}
+		const ms = Date.now() - n
+		console.log(`JSON: ${count} stringified in ${ms}ms, ${ms / count}ms/item`)
+	}
 	const v1Parse = () => {
 		const n = Date.now()
 		const s = JSURL.stringify(v)
@@ -40,6 +57,8 @@
 		console.log(`v2: ${count} stringified in ${ms}ms, ${ms / count}ms/item`)
 	}
 	window.onload = () => {
+		JSONParse()
+		JSONStringify()
 		v1Parse()
 		v1Stringify()
 		v2Parse()
diff --git a/lib/jsurl2.js b/lib/jsurl2.js
index 963ad89..3614818 100644
--- a/lib/jsurl2.js
+++ b/lib/jsurl2.js
@@ -56,11 +56,13 @@
 	}
 	var escapeRE = /(_|\*.)/g
 	function unescape (s) {
-		return s.replace(escapeRE, origChar)
+		// oddly enough, testing first is faster
+		return escapeRE.test(s) ? s.replace(escapeRE, origChar) : s
 	}
 	var replaceRE = /([*_~%$+'() ])/g
 	function escape (s) {
-		return s.replace(replaceRE, escCode)
+		// oddly enough, testing first is faster
+		return replaceRE.test(s) ? s.replace(replaceRE, escCode) : s
 	}
 	function eat (a) {
 		var j, c
@@ -125,13 +127,13 @@
 			} else {
 				throw new Error('Unknown dict reference', k)
 			}
+		} else if (c === '*') {
+			eatOne(a)
+			out = unescape(eat(a))
 		} else if (numRE.test(c)) {
 			out = Number(eat(a))
 		} else if (stringRE.test(c)) {
 			out = unescape(eat(a))
-		} else if (c === '*') {
-			eatOne(a)
-			out = unescape(eat(a))
 		} else {
 			throw new Error('Cannot decode part ' + [t].concat(a).join('~'))
 		}
@@ -139,6 +141,7 @@
 	}
 
 	var endTildesRE = /~*$/
+	var TRUEt = TRUE + '~'
 	function encode (v) {
 		var t, a, out, T = typeof v, val
 
@@ -161,9 +164,9 @@
 			} else if (Array.isArray(v)) {
 				a = []
 				for (var i = 0; i < v.length; i++) {
-					t = encode(v[i])
+					t = v[i]
 					// Special case: only use full -T~ in arrays
-					a[i] = (t === '~' ? TRUE + '~' : t) || NULL
+					a[i] = t === true ? TRUEt : encode(t)
 				}
 
 				out = '!' + a.join('')
@@ -171,10 +174,9 @@
 				a = []
 				for (var key in v) {
 					if (v.hasOwnProperty(key)) {
-						val = encode(v[key])
-
-						// skip undefined and functions
-						if (val !== UNDEF + '~') {
+						t = v[key]
+						if (t !== undefined && typeof t !== 'function') {
+							val = encode(t)
 							a.push(escape(key) + '~', val)
 						}
 					}

From 745f0542fae3a9e553397c6d6898029f70543295 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Sun, 2 Apr 2017 23:17:53 +0200
Subject: [PATCH 10/37] :tada: now outperforms JSON on size *and* speed!

rewrote stringifier to keep intermediate results in array and replaced join('~') with smart join

performance.html:15 JSON: 200000 parsed in 731ms, 0.003655ms/item
performance.html:23 JSON: 200000 stringified in 448ms, 0.00224ms/item
performance.html:32 v1: 200000 parsed in 1337ms, 0.006685ms/item
performance.html:40 v1: 200000 stringified in 934ms, 0.00467ms/item
performance.html:49 v2: 200000 parsed in 601ms, 0.003005ms/item
performance.html:57 v2: 200000 stringified in 403ms, 0.002015ms/item
---
 lib/jsurl2.js | 78 +++++++++++++++++++++++++++++++--------------------
 1 file changed, 48 insertions(+), 30 deletions(-)

diff --git a/lib/jsurl2.js b/lib/jsurl2.js
index 3614818..99317de 100644
--- a/lib/jsurl2.js
+++ b/lib/jsurl2.js
@@ -89,10 +89,7 @@
 		var out, k, t
 		var c = peek(a)
 		if (!c) {return EOS}
-		if (c === '~') {
-			eatOne(a)
-			out = true
-		} else if (c === '(') {
+		if (c === '(') {
 			eatOne(a)
 			out = {}
 			while (c = peek(a), c && c !== ')') {
@@ -130,6 +127,9 @@
 		} else if (c === '*') {
 			eatOne(a)
 			out = unescape(eat(a))
+		} else if (c === '~') {
+			eatOne(a)
+			out = true
 		} else if (numRE.test(c)) {
 			out = Number(eat(a))
 		} else if (stringRE.test(c)) {
@@ -141,64 +141,82 @@
 	}
 
 	var endTildesRE = /~*$/
-	var TRUEt = TRUE + '~'
-	function encode (v) {
-		var t, a, out, T = typeof v, val
+	function encode (v, out) {
+		var t, a, T = typeof v, val, prefix
 
 		if (T === 'number') {
-			out = isFinite(v) ? v : NULL
+			out.push(isFinite(v) ? v.toString() : NULL)
 		} else if (T === 'boolean') {
-			out = v ? '' : FALSE
+			out.push(v ? '' : FALSE)
 		} else if (T === 'string') {
 			t = escape(v)
 			if (stringRE.test(t)) {
-				out = t
+				out.push(t)
 			} else {
-				out = '*' + t
+				out.push('*' + t)
 			}
 		} else if (T === 'object') {
 			if (!v) {
-				out = NULL
+				out.push(NULL)
 			} else if (v instanceof Date) {
-				out = '_D' + v.toJSON().replace('T00:00:00.000Z', '')
+				out.push('_D' + v.toJSON().replace('T00:00:00.000Z', ''))
 			} else if (Array.isArray(v)) {
-				a = []
+				out.push('!')
 				for (var i = 0; i < v.length; i++) {
 					t = v[i]
 					// Special case: only use full -T~ in arrays
-					a[i] = t === true ? TRUEt : encode(t)
+					if (t === true) {
+						out.push(TRUE)
+					} else {
+						encode(t, out)
+					}
 				}
-
-				out = '!' + a.join('')
+				out.push('')
 			} else {
-				a = []
+				out.push('(')
 				for (var key in v) {
 					if (v.hasOwnProperty(key)) {
 						t = v[key]
 						if (t !== undefined && typeof t !== 'function') {
-							val = encode(t)
-							a.push(escape(key) + '~', val)
+							out.push(escape(key))
+							encode(t, out)
 						}
 					}
 				}
-				t = a.join('').replace(endTildesRE, '')
-
-				return '(' + t + ')'
+				while(out[out.length - 1] === '') {
+					out.pop()
+				}
+				out.push(')')
 			}
 		} else {
 			// function, undefined
-			out = UNDEF
+			out.push(UNDEF)
 		}
-		return out + '~'
 	}
 
-	var allTerminatorsRE = /\)*~*$/
+	const closeObjRE = /\)+$/g
+	const noTilde = {'!': true, '(': true, ')': true}
 	exports.stringify = function (v, options) {
-		var r = encode(v)
-		if (options && options.short) {
-			return r.replace(allTerminatorsRE, '')
+		var out = [], t, str = '', len, sep = false, short = options && options.short
+		encode(v, out)
+		len = out.length - 1
+		// until where we have to stringify
+		while(t = out[len], t === '' || (short && t === ')')) {
+			len--
+		}
+		// extended join('~')
+		for (var i = 0; i <= len; i++) {
+			t = out[i]
+			if (sep && t !== ')') {
+				str += '~'
+			}
+			str += t
+			sep = !(t === '!' || t === '(' || t === ')')
+		}
+		if (!short) {
+			str += '~'
 		}
-		return r.replace(endTildesRE, '~')
+		return str
 	}
 
 	exports.parse = function (s, options) {

From 52220c428868338a922bb3e2b1649ac192d629aa Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Mon, 3 Apr 2017 00:01:03 +0200
Subject: [PATCH 11/37] lint

---
 lib/jsurl2.js | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/lib/jsurl2.js b/lib/jsurl2.js
index 99317de..41bda1a 100644
--- a/lib/jsurl2.js
+++ b/lib/jsurl2.js
@@ -67,7 +67,7 @@
 	function eat (a) {
 		var j, c
 		for (
-			var j = a.i;
+			j = a.i;
 			j < a.l && (c = a.s.charAt(j), c !== '~' && c !== ')');
 			j++
 		) {}
@@ -140,9 +140,8 @@
 		return out
 	}
 
-	var endTildesRE = /~*$/
 	function encode (v, out) {
-		var t, a, T = typeof v, val, prefix
+		var t, T = typeof v
 
 		if (T === 'number') {
 			out.push(isFinite(v) ? v.toString() : NULL)
@@ -183,7 +182,7 @@
 						}
 					}
 				}
-				while(out[out.length - 1] === '') {
+				while (out[out.length - 1] === '') {
 					out.pop()
 				}
 				out.push(')')
@@ -194,14 +193,12 @@
 		}
 	}
 
-	const closeObjRE = /\)+$/g
-	const noTilde = {'!': true, '(': true, ')': true}
 	exports.stringify = function (v, options) {
 		var out = [], t, str = '', len, sep = false, short = options && options.short
 		encode(v, out)
 		len = out.length - 1
 		// until where we have to stringify
-		while(t = out[len], t === '' || (short && t === ')')) {
+		while (t = out[len], t === '' || (short && t === ')')) {
 			len--
 		}
 		// extended join('~')

From 47c1b8f658ea96986290a1beaed86c0b6694d77a Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Wed, 12 Apr 2017 12:48:09 +0200
Subject: [PATCH 12/37] v2: Support .toJSON() as per JSON spec

---
 lib/jsurl2.js  | 2 ++
 test/jsurl2.js | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/lib/jsurl2.js b/lib/jsurl2.js
index 41bda1a..ac7e8af 100644
--- a/lib/jsurl2.js
+++ b/lib/jsurl2.js
@@ -159,6 +159,8 @@
 				out.push(NULL)
 			} else if (v instanceof Date) {
 				out.push('_D' + v.toJSON().replace('T00:00:00.000Z', ''))
+			} else if (typeof v.toJSON === 'function') {
+				encode(v.toJSON(), out, rich)
 			} else if (Array.isArray(v)) {
 				out.push('!')
 				for (var i = 0; i < v.length; i++) {
diff --git a/test/jsurl2.js b/test/jsurl2.js
index dd04b49..d84f570 100644
--- a/test/jsurl2.js
+++ b/test/jsurl2.js
@@ -135,3 +135,8 @@ test('stringify performance', t => {
 	console.log(`v2: ${count} stringified in ${ms}ms, ${ms / count}ms/item`)
 	t.true(ms < 300)
 })
+
+test('.toJSON()', t => {
+	const o = {s: 'hi', toJSON() {return this.s}}
+	t.is(stringify(o), 'hi~')
+})

From e220bd222ed979103ac3adb43b69572debd4ac0e Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Wed, 12 Apr 2017 12:49:00 +0200
Subject: [PATCH 13/37] v2: Only special-case Date if `rich: true`

---
 lib/jsurl2.js  | 12 ++++++------
 test/jsurl2.js | 16 +++++++++-------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/lib/jsurl2.js b/lib/jsurl2.js
index ac7e8af..77aef32 100644
--- a/lib/jsurl2.js
+++ b/lib/jsurl2.js
@@ -140,7 +140,7 @@
 		return out
 	}
 
-	function encode (v, out) {
+	function encode (v, out, rich) {
 		var t, T = typeof v
 
 		if (T === 'number') {
@@ -157,7 +157,7 @@
 		} else if (T === 'object') {
 			if (!v) {
 				out.push(NULL)
-			} else if (v instanceof Date) {
+			} else if (rich && v instanceof Date) {
 				out.push('_D' + v.toJSON().replace('T00:00:00.000Z', ''))
 			} else if (typeof v.toJSON === 'function') {
 				encode(v.toJSON(), out, rich)
@@ -169,7 +169,7 @@
 					if (t === true) {
 						out.push(TRUE)
 					} else {
-						encode(t, out)
+						encode(t, out, rich)
 					}
 				}
 				out.push('')
@@ -180,7 +180,7 @@
 						t = v[key]
 						if (t !== undefined && typeof t !== 'function') {
 							out.push(escape(key))
-							encode(t, out)
+							encode(t, out, rich)
 						}
 					}
 				}
@@ -196,8 +196,8 @@
 	}
 
 	exports.stringify = function (v, options) {
-		var out = [], t, str = '', len, sep = false, short = options && options.short
-		encode(v, out)
+		var out = [], t, str = '', len, sep = false, short = options && options.short, rich = options && options.rich
+		encode(v, out, rich)
 		len = out.length - 1
 		// until where we have to stringify
 		while (t = out[len], t === '' || (short && t === ')')) {
diff --git a/test/jsurl2.js b/test/jsurl2.js
index d84f570..6e1f241 100644
--- a/test/jsurl2.js
+++ b/test/jsurl2.js
@@ -2,14 +2,14 @@ import test from 'ava'
 import {stringify, parse, tryParse} from '../lib/jsurl2'
 
 // test macro, both directions
-const cmp = (t, v, s, short) => {
+const cmp = (t, v, s, short, rich) => {
 	// regular
-	t.is(stringify(v), s)
+	t.is(stringify(v, {rich}), s)
 	// roundtrip
-	t.is(stringify(parse(s)), s)
+	t.is(stringify(parse(s), {rich}), s)
 	// short
-	t.is(stringify(v, {short: true}), short)
-	t.is(stringify(parse(short), {short: true}), short)
+	t.is(stringify(v, {short: true, rich}), short)
+	t.is(stringify(parse(short), {short: true, rich}), short)
 }
 cmp.title = (title, v, s) => `${title} ${s}`
 
@@ -33,8 +33,10 @@ test(cmp,
 test(cmp, NaN, '_N~', '_N')
 test(cmp, Infinity, '_N~', '_N')
 test(cmp, -Infinity, '_N~', '_N')
-test(cmp, new Date(1456898746898), '_D2016-03-02T06:05:46.898Z~', '_D2016-03-02T06:05:46.898Z')
-test(cmp, new Date('2017-04-01'), '_D2017-04-01~', '_D2017-04-01')
+test(cmp, new Date(1456898746898), '*2016-03-02T06:05:46.898Z~', '*2016-03-02T06:05:46.898Z')
+test(cmp, new Date('2017-04-01'), '*2017-04-01T00:00:00.000Z~', '*2017-04-01T00:00:00.000Z')
+test(cmp, new Date(1456898746898), '_D2016-03-02T06:05:46.898Z~', '_D2016-03-02T06:05:46.898Z', true)
+test(cmp, new Date('2017-04-01'), '_D2017-04-01~', '_D2017-04-01', true)
 
 // arrays
 test(cmp, [], '!~', '!')

From 091299eea4cea48c9d1db6641244cb8584a98968 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Wed, 12 Apr 2017 12:50:20 +0200
Subject: [PATCH 14/37] travis: Only check on v4 and latest NodeJS

---
 .travis.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6491036..e699201 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
 language: node_js
 node_js:
-  - "4.2"
-  - "0.12"
-  - "0.10"
+  - "4"
+  - "node"
 sudo: false

From 137555f54a2c5d1627689665c155cd099575c650 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Wed, 12 Apr 2017 13:30:36 +0200
Subject: [PATCH 15/37] v2: Escape chars for URI and <script> encoding

---
 lib/jsurl2.js  | 29 +++++++++++++++++++++++++----
 test/jsurl2.js | 15 ++++++++-------
 2 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/lib/jsurl2.js b/lib/jsurl2.js
index 77aef32..83c7110 100644
--- a/lib/jsurl2.js
+++ b/lib/jsurl2.js
@@ -20,23 +20,43 @@
 		'*': '*',
 		'_': '_',
 		'-': '~',
-		'.': '%',
 		'S': '$',
 		'P': '+',
 		'"': "'",
-		'C': '(',
+		'C': '(', // not necessary but we keep it for symmetry
 		'D': ')',
+		'L': '<',
+		'G': '>', // not necessary but we keep it for symmetry
+		'.': '%',
+		'Q': '?',
+		'H': '#',
+		'A': '&',
+		'E': '=',
+		'B': '\\',
+		'N': '\n',
+		'R': '\r',
+		'Z': '\0',
 	}
 	var toEscape = {
 		'*': '*',
 		'_': '_',
 		'~': '-',
-		'%': '.',
 		'$': 'S',
 		'+': 'P',
 		"'": '"',
 		'(': 'C',
 		')': 'D',
+		'<': 'L',
+		'>': 'G',
+		'%': '.',
+		'?': 'Q',
+		'#': 'H',
+		'&': 'A',
+		'=': 'E',
+		'\\': 'B',
+		'\n': 'N',
+		'\r': 'R',
+		'\0': 'Z',
 	}
 	function origChar (s) {
 		if (s === '_') {
@@ -59,7 +79,8 @@
 		// oddly enough, testing first is faster
 		return escapeRE.test(s) ? s.replace(escapeRE, origChar) : s
 	}
-	var replaceRE = /([*_~%$+'() ])/g
+	// First half: encoding chars; second half: URI and script chars
+	var replaceRE = /([*_~$+'() <>%?#&=\\\n\r\0])/g
 	function escape (s) {
 		// oddly enough, testing first is faster
 		return replaceRE.test(s) ? s.replace(replaceRE, escCode) : s
diff --git a/test/jsurl2.js b/test/jsurl2.js
index 6e1f241..4cd98d5 100644
--- a/test/jsurl2.js
+++ b/test/jsurl2.js
@@ -4,12 +4,13 @@ import {stringify, parse, tryParse} from '../lib/jsurl2'
 // test macro, both directions
 const cmp = (t, v, s, short, rich) => {
 	// regular
-	t.is(stringify(v, {rich}), s)
+	t.notRegex(stringify(v, {rich}), /[%?#&=\n\r\0]/, 'has forbidden char');
+	t.is(stringify(v, {rich}), s, 'stringified wrong')
 	// roundtrip
-	t.is(stringify(parse(s), {rich}), s)
+	t.is(stringify(parse(s), {rich}), s, 'roundtrip fails')
 	// short
-	t.is(stringify(v, {short: true, rich}), short)
-	t.is(stringify(parse(short), {short: true, rich}), short)
+	t.is(stringify(v, {short: true, rich}), short, 'short stringified wrong')
+	t.is(stringify(parse(short), {short: true, rich}), short, 'short roundtrip fails')
 }
 cmp.title = (title, v, s) => `${title} ${s}`
 
@@ -25,9 +26,9 @@ test(cmp, -1.5, '-1.5~', '-1.5')
 test(cmp, '', '*~', '*')
 test(cmp, 'hello world\u203c', 'hello_world\u203c~', 'hello_world\u203c')
 test(cmp,
-	' !"#$%&\'()*+,-./09:;<=>?@AZ[\\]^_`az{|}~',
-	'*_!"#*S*.&*"*C*D***P,-./09:;<=>?@AZ[\\]^*_`az{|}*-~',
-	'*_!"#*S*.&*"*C*D***P,-./09:;<=>?@AZ[\\]^*_`az{|}*-'
+	' !"#$%&\'()*+,-./09:;<=>?@AZ[\\]^_`az{|}\n\r\0~',
+	'*_!"*H*S*.*A*"*C*D***P,-./09:;*L*E*G*Q@AZ[*B]^*_`az{|}*N*R*Z*-~',
+	'*_!"*H*S*.*A*"*C*D***P,-./09:;*L*E*G*Q@AZ[*B]^*_`az{|}*N*R*Z*-'
 )
 // JSON.stringify converts special numeric values to null
 test(cmp, NaN, '_N~', '_N')

From 2f18dbd011abdfc75a0ec3eb2d12c0827b2c699a Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Wed, 12 Apr 2017 19:11:22 +0200
Subject: [PATCH 16/37] Add some escaping test cases

---
 test/jsurl2.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/jsurl2.js b/test/jsurl2.js
index 4cd98d5..c2bb9ac 100644
--- a/test/jsurl2.js
+++ b/test/jsurl2.js
@@ -4,7 +4,7 @@ import {stringify, parse, tryParse} from '../lib/jsurl2'
 // test macro, both directions
 const cmp = (t, v, s, short, rich) => {
 	// regular
-	t.notRegex(stringify(v, {rich}), /[%?#&=\n\r\0]/, 'has forbidden char');
+	t.notRegex(stringify(v, {rich}), /[%?#&=\n\r\0'<\\]/, 'has forbidden char');
 	t.is(stringify(v, {rich}), s, 'stringified wrong')
 	// roundtrip
 	t.is(stringify(parse(s), {rich}), s, 'roundtrip fails')
@@ -30,6 +30,11 @@ test(cmp,
 	'*_!"*H*S*.*A*"*C*D***P,-./09:;*L*E*G*Q@AZ[*B]^*_`az{|}*N*R*Z*-~',
 	'*_!"*H*S*.*A*"*C*D***P,-./09:;*L*E*G*Q@AZ[*B]^*_`az{|}*N*R*Z*-'
 )
+test(cmp,
+	'Ľồťś ǒƒ ửňìćọđé ẁћəệ!',
+	'*Ľồťś_ǒƒ_ửňìćọđé_ẁћəệ!~',
+	'*Ľồťś_ǒƒ_ửňìćọđé_ẁћəệ!'
+)
 // JSON.stringify converts special numeric values to null
 test(cmp, NaN, '_N~', '_N')
 test(cmp, Infinity, '_N~', '_N')

From b80924415fbb63296de30a8c0c50993456ceda49 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Wed, 12 Apr 2017 20:40:01 +0200
Subject: [PATCH 17/37] v2: pass options via `tryParse`

---
 lib/jsurl2.js  | 4 ++--
 test/jsurl2.js | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/jsurl2.js b/lib/jsurl2.js
index 83c7110..c38a7d5 100644
--- a/lib/jsurl2.js
+++ b/lib/jsurl2.js
@@ -253,9 +253,9 @@
 		return r === EOS ? true : r
 	}
 
-	exports.tryParse = function (s, def) {
+	exports.tryParse = function (s, def, options) {
 		try {
-			return exports.parse(s)
+			return exports.parse(s, options)
 		} catch (ex) {
 			return def
 		}
diff --git a/test/jsurl2.js b/test/jsurl2.js
index c2bb9ac..51fb0d4 100644
--- a/test/jsurl2.js
+++ b/test/jsurl2.js
@@ -114,6 +114,7 @@ test('percent-escaped percent-escaped single quotes', t => {
 
 test('tryParse', t => {
 	t.is(tryParse('_N~'), null)
+	t.is(tryParse('%5FN', 5, {deURI: true}), null)
 	t.is(tryParse('1~', 2), 1)
 	t.is(tryParse('_'), undefined)
 	t.is(tryParse('_', 0), 0)
@@ -125,7 +126,7 @@ test('parse performance', t => {
 	const s = stringify(v)
 	const count = 10000
 	for (let i = 0; i < count; i++) {
-		parse(s)
+		parse(s, {deURI: true})
 	}
 	const ms = Date.now() - n
 	console.log(`v2: ${count} parsed in ${ms}ms, ${ms / count}ms/item`)

From b84a829d22fbd5abacd5ee69529addbe983c2760 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Wed, 12 Apr 2017 20:46:01 +0200
Subject: [PATCH 18/37] Make v2 default, and v1 optional as `jsurl/v1`

---
 lib/jsurl.js      | 2 +-
 lib/jsurl2.js     | 2 +-
 package.json      | 4 ++--
 test/jsurl.js     | 2 +-
 test/jsurl2.js    | 2 +-
 index.js => v1.js | 0
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename index.js => v1.js (100%)

diff --git a/lib/jsurl.js b/lib/jsurl.js
index 6a89b90..1428222 100644
--- a/lib/jsurl.js
+++ b/lib/jsurl.js
@@ -166,4 +166,4 @@
 		}
 	}
 
-})(typeof exports !== 'undefined' ? exports : (window.JSURL = window.JSURL || {}));
+})(typeof exports !== 'undefined' ? exports : (window.JSURL1 = window.JSURL1 || {}));
diff --git a/lib/jsurl2.js b/lib/jsurl2.js
index c38a7d5..aa6b900 100644
--- a/lib/jsurl2.js
+++ b/lib/jsurl2.js
@@ -260,4 +260,4 @@
 			return def
 		}
 	}
-})(typeof exports !== 'undefined' ? exports : (window.JSURL2 = window.JSURL2 || {}))
+})(typeof exports !== 'undefined' ? exports : (window.JSURL = window.JSURL || {}))
diff --git a/package.json b/package.json
index e3707e0..18a08ba 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "jsurl",
   "description": "URL friendly JSON-like formatting and parsing",
-  "version": "0.1.4",
+  "version": "2.0.0-rc1",
   "license": "MIT",
   "homepage": "http://github.com/Sage/jsurl",
   "author": "Bruno Jouhier",
@@ -19,6 +19,6 @@
     "test": "ava",
     "test-watch": "ava --watch"
   },
-  "main": "index.js",
+  "main": "lib/jsurl2.js",
   "dependencies": {}
 }
diff --git a/test/jsurl.js b/test/jsurl.js
index b8555ff..0756cd0 100644
--- a/test/jsurl.js
+++ b/test/jsurl.js
@@ -1,5 +1,5 @@
 import test from 'ava'
-import {stringify, parse, tryParse} from '../lib/jsurl'
+import {stringify, parse, tryParse} from '../v1'
 
 // test macro, both directions
 const cmp = (t, v, s) => {
diff --git a/test/jsurl2.js b/test/jsurl2.js
index 51fb0d4..9a32c55 100644
--- a/test/jsurl2.js
+++ b/test/jsurl2.js
@@ -1,5 +1,5 @@
 import test from 'ava'
-import {stringify, parse, tryParse} from '../lib/jsurl2'
+import {stringify, parse, tryParse} from '..'
 
 // test macro, both directions
 const cmp = (t, v, s, short, rich) => {
diff --git a/index.js b/v1.js
similarity index 100%
rename from index.js
rename to v1.js

From abaf43c0b9f1da908cc2a0a19e9661471322f326 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Wed, 12 Apr 2017 20:46:25 +0200
Subject: [PATCH 19/37] Document v2

---
 README.md | 98 +++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 85 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 1e178cb..fd9661a 100644
--- a/README.md
+++ b/README.md
@@ -1,19 +1,65 @@
 ## JSURL
 
-JSURL is an alternative to JSON + URL encoding (or JSON + base64 encoding). 
+JSURL exists in two flavors: v1 and v2
+
+### JSURL v2
+
+JSURL v2 aims to be a drop-in replacement for JSON encoding with better size and time characteristics.
+
+JSURL v2 has been designed to be
+
+* Fast: our test case actually outperforms native JSON
+* Compact: shorter output than JSON and v1
+* Readable: more readable than v1 in many cases as well as leaving accented characters unchanged (so they are readable in URLs and embeds)
+* URI-ready: It does not encode everything that should be URI-encoded, but it does encode all delimiters of query strings.
+  * You can embed it as part of a query string, and normally you won't need to do any URI encoding yourself (browser/http client will take care of that).
+  * It will be correctly detected as part of the URI by most auto-URL-from-text implementations.
+* embed-ready:
+  * embeddable in \<script> tags inside single-quoted JS strings
+  * `rich` mode encodes/decodes `Date` objects
+* Easy to generate and parse
+
+The most important difference with v1 is that it might need extra URI-encoding depending on your needs. You can also pass `{deURI: true}` as an option to `parse()` so it will handle any URI encoding automatically.
+
+Given its speed and size, it is also suited to pass JS values to scripts in HTML, like initial data after Server-Side-Rendering. To do so, embed the result inside a single-quoted string (not double-quoted) and parse that in your script.
+
+Some room has been left in the encoding space for special values. If you enable `rich` on the stringifier, it will encode JS Date objects so that they decode as JS Date objects, and later it might support custom encode/decode of your own object types.
+
+#### v2 syntax
+
+You don't need to know this to use it, but this might be interesting:
+
+v2 uses the allowable characters in URI schemes for multiple purposes depending on the location in the result. Some examples:
+
+* `!` starts an array if it is the first character in a value, but inside a string it is unchanged.
+* `~` and `)` are used as end-of-value and end-of-object delimiters, and are illegal inside encoded values.
+* `*` starts a string, but can be left out if the first string character is a-z. Inside a string, it escapes special characters.
+
+v2 has a `short` mode, which omits the unnecessary ending delimiters. You can use this to save a few more bytes, but you won't be able to spot an encoded value on sight by the ending `~`.
+
+Since browsers may choose to encode any character with URI escaping, and special characters are shown in URLs, no attempt is made to make v2 URI-neutral. Decoding will work no matter how many encodings happened, if you pass the `deURI: true` option to the parser.
+
+### JSURL v1
+
+JSURL v1 is an alternative to JSON + URL encoding (or JSON + base64 encoding).
 It makes it handy to pass complex values via URL query parameters.
 
-JSURL has been designed to be:
+JSURL v1 has been designed to be:
 
 * Compact: its output is much more compact than JSON + URL encoding (except in pathological cases). 
   It is even often slightly more compact than regular JSON!
 * Readable: its output is much more readable than JSON + URL encoding.
-* Foolproof: its output only contains characters that are unaffected by URL encoding/decoding. 
+* Foolproof: its output only contains characters that are unaffected by URL encoding/decoding (but see note)
   There is no risk of missing a URL encoding/decoding pass, or of messing up a JSURL string by applying 
   an extra URL encoding or decoding pass.
 * Easy to generate and parse
 
-## Syntax
+Notes:
+
+* a JSURLv1 encoded value will get its `'` characters URI-encoded by most browsers, due to security concerns that surfaced after v1 was created. v2 does not use `'` for structural encoding.
+* a JSURLv1 encoded value at the end of a URL placed in plaintext might not be detected as fully part of the URL by auto-URL-detectors (as used by email clients etc). v2 fixes this by always ending in `~`.
+
+#### v1 Syntax
 
 Think of it as JSON with the following changes:
 
@@ -36,31 +82,57 @@ Property names and string values are escaped as follows:
 JSON:
 
 ``` json
-{"name":"John Doe","age":42,"children":["Mary","Bill"]}
+{"name":"John Doé","age":42,"user":true,"children":["Mary","Bill"]}
 ```
 
 JSON + URL encoding:
 
-```
-%7B%22name%22%3A%22John%20Doe%22%2C%22age%22%3A42%2C%22children%22%3A%5B%22Mary%22%2C%22Bill%22%5D%7D
+``` jsonuri
+%7B%22name%22%3A%22John%20Do%C3%22%2C%22age%22%3A42%2C%22user%22%3Atrue%2C%22children%22%3A%5B%22Mary%22%2C%22Bill%22%5D%7D
 ```
 
-JSURL:
+JSURL v1:
 
 ``` jsurl
-~(name~'John*20Doe~age~42~children~(~'Mary~'Bill))
+~(name~'John*20Do*e9~age~42~user~true~children~(~'Mary~'Bill))
 ```
 
-## API
+JSURL v2:
+
+``` jsurl2
+(name~John_Doé~age~42~user~~children~!Mary~Bill)~
+```
+
+## v2 API
 
 ``` javascript
 var JSURL = require("jsurl");
 
-str = JSURL.stringify(obj);
-obj = JSURL.parse(str);
+// Options:
+// * `rich`: encode Date so it decodes as Date
+// * `short`: remove optional trailing delimiters
+str = JSURL.stringify(obj[, options]);
+
+// Options:
+// * `deURI`: handle any URI encoding that may still be present
+obj = JSURL.parse(str[, options]);
+
+// return def instead of throwing on error; options are like parse
+obj = JSURL.tryParse(str[, def][, options]);
+```
+
+## v1 API
+
+The old API is still available if you need to decode v1 stringifieds.
+
+``` javascript
+var JSURL1 = require("jsurl/v1");
+
+str = JSURL1.stringify(obj);
+obj = JSURL1.parse(str);
 
 // return def instead of throwing on error
-obj = JSURL.tryParse(str[, def]);
+obj = JSURL1.tryParse(str[, def]);
 ```
 
 # Installation

From f599ebdcbad4eeee15a4ebe06939f30e54350c75 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Wed, 12 Apr 2017 20:58:08 +0200
Subject: [PATCH 20/37] Some changes for bower and presumed needed for npm

---
 bower.json   | 4 ++--
 package.json | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/bower.json b/bower.json
index 40b808e..3f82f79 100644
--- a/bower.json
+++ b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "jsurl",
-  "main": "index.js",
-  "version": "0.1.0",
+  "main": "lib/jsurl2.js",
+  "version": "2.0.0-rc1",
   "homepage": "https://github.com/Sage/jsurl",
   "authors": [
     "Bruno Jouhier"
diff --git a/package.json b/package.json
index 18a08ba..6177e2a 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
   "devDependencies": {
     "ava": "^0.18.2"
   },
+  "files": ["./lib", "./v1.js"],
   "directories": {
     "lib": "./lib"
   },

From 42756e3253c205263c6f7bfb378c4b70ff8fed08 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Sun, 11 Jun 2017 10:25:10 +0200
Subject: [PATCH 21/37] attempt to fix npm install of branch

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6177e2a..0af6398 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
   "devDependencies": {
     "ava": "^0.18.2"
   },
-  "files": ["./lib", "./v1.js"],
+  "files": ["lib", "v1.js"],
   "directories": {
     "lib": "./lib"
   },

From 88030a2edeaf5824e1ec0a73b940d02453137ffa Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Sat, 3 Feb 2018 00:40:43 +0100
Subject: [PATCH 22/37] fix NaN parse on bad number

---
 lib/jsurl2.js  | 3 +++
 test/jsurl2.js | 1 +
 2 files changed, 4 insertions(+)

diff --git a/lib/jsurl2.js b/lib/jsurl2.js
index aa6b900..0fe1648 100644
--- a/lib/jsurl2.js
+++ b/lib/jsurl2.js
@@ -153,6 +153,9 @@
 			out = true
 		} else if (numRE.test(c)) {
 			out = Number(eat(a))
+			if (isNaN(out)) {
+				throw new Error('Not a number', c)
+			}
 		} else if (stringRE.test(c)) {
 			out = unescape(eat(a))
 		} else {
diff --git a/test/jsurl2.js b/test/jsurl2.js
index 9a32c55..83ab2d5 100644
--- a/test/jsurl2.js
+++ b/test/jsurl2.js
@@ -118,6 +118,7 @@ test('tryParse', t => {
 	t.is(tryParse('1~', 2), 1)
 	t.is(tryParse('_'), undefined)
 	t.is(tryParse('_', 0), 0)
+	t.is(tryParse('12323NOTANUMBER', 0), 0)
 })
 
 test('parse performance', t => {

From a124052fec7fb68d4818d5a4789a68d20b17e732 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Sat, 3 Feb 2018 00:40:51 +0100
Subject: [PATCH 23/37] prettier

---
 lib/jsurl2.js  |  87 ++++++++++++++++++--------------
 test/jsurl2.js | 132 ++++++++++++++++++++++++++++++++++---------------
 2 files changed, 141 insertions(+), 78 deletions(-)

diff --git a/lib/jsurl2.js b/lib/jsurl2.js
index 0fe1648..4e79f40 100644
--- a/lib/jsurl2.js
+++ b/lib/jsurl2.js
@@ -1,6 +1,6 @@
 // TODO custom objects, support Set, Map etc
 // TODO custom dictionary
-;(function (exports) {
+;(function(exports) {
 	'use strict'
 	var stringRE = /^[a-zA-Z]/
 	var numRE = /^[\d-]/
@@ -18,30 +18,30 @@
 
 	var fromEscape = {
 		'*': '*',
-		'_': '_',
+		_: '_',
 		'-': '~',
-		'S': '$',
-		'P': '+',
+		S: '$',
+		P: '+',
 		'"': "'",
-		'C': '(', // not necessary but we keep it for symmetry
-		'D': ')',
-		'L': '<',
-		'G': '>', // not necessary but we keep it for symmetry
+		C: '(', // not necessary but we keep it for symmetry
+		D: ')',
+		L: '<',
+		G: '>', // not necessary but we keep it for symmetry
 		'.': '%',
-		'Q': '?',
-		'H': '#',
-		'A': '&',
-		'E': '=',
-		'B': '\\',
-		'N': '\n',
-		'R': '\r',
-		'Z': '\0',
+		Q: '?',
+		H: '#',
+		A: '&',
+		E: '=',
+		B: '\\',
+		N: '\n',
+		R: '\r',
+		Z: '\0',
 	}
 	var toEscape = {
 		'*': '*',
-		'_': '_',
+		_: '_',
 		'~': '-',
-		'$': 'S',
+		$: 'S',
 		'+': 'P',
 		"'": '"',
 		'(': 'C',
@@ -58,7 +58,7 @@
 		'\r': 'R',
 		'\0': 'Z',
 	}
-	function origChar (s) {
+	function origChar(s) {
 		if (s === '_') {
 			return ' '
 		}
@@ -68,28 +68,28 @@
 		}
 		return c
 	}
-	function escCode (c) {
+	function escCode(c) {
 		if (c === ' ') {
 			return '_'
 		}
 		return '*' + toEscape[c]
 	}
 	var escapeRE = /(_|\*.)/g
-	function unescape (s) {
+	function unescape(s) {
 		// oddly enough, testing first is faster
 		return escapeRE.test(s) ? s.replace(escapeRE, origChar) : s
 	}
 	// First half: encoding chars; second half: URI and script chars
 	var replaceRE = /([*_~$+'() <>%?#&=\\\n\r\0])/g
-	function escape (s) {
+	function escape(s) {
 		// oddly enough, testing first is faster
 		return replaceRE.test(s) ? s.replace(replaceRE, escCode) : s
 	}
-	function eat (a) {
+	function eat(a) {
 		var j, c
 		for (
 			j = a.i;
-			j < a.l && (c = a.s.charAt(j), c !== '~' && c !== ')');
+			j < a.l && ((c = a.s.charAt(j)), c !== '~' && c !== ')');
 			j++
 		) {}
 		var w = a.s.slice(a.i, j)
@@ -99,21 +99,23 @@
 		a.i = j
 		return w
 	}
-	function peek (a) {
+	function peek(a) {
 		return a.s.charAt(a.i)
 	}
-	function eatOne (a) {
+	function eatOne(a) {
 		a.i++
 	}
 	var EOS = {} // unique symbol
-	function decode (a) {
+	function decode(a) {
 		var out, k, t
 		var c = peek(a)
-		if (!c) {return EOS}
+		if (!c) {
+			return EOS
+		}
 		if (c === '(') {
 			eatOne(a)
 			out = {}
-			while (c = peek(a), c && c !== ')') {
+			while (((c = peek(a)), c && c !== ')')) {
 				k = unescape(eat(a))
 				c = peek(a)
 				if (c && c !== ')') {
@@ -129,7 +131,7 @@
 		} else if (c === '!') {
 			eatOne(a)
 			out = []
-			while (c = peek(a), c && c !== '~' && c !== ')') {
+			while (((c = peek(a)), c && c !== '~' && c !== ')')) {
 				out.push(decode(a))
 			}
 			if (c === '~') {
@@ -164,8 +166,9 @@
 		return out
 	}
 
-	function encode (v, out, rich) {
-		var t, T = typeof v
+	function encode(v, out, rich) {
+		var t,
+			T = typeof v
 
 		if (T === 'number') {
 			out.push(isFinite(v) ? v.toString() : NULL)
@@ -219,12 +222,18 @@
 		}
 	}
 
-	exports.stringify = function (v, options) {
-		var out = [], t, str = '', len, sep = false, short = options && options.short, rich = options && options.rich
+	exports.stringify = function(v, options) {
+		var out = [],
+			t,
+			str = '',
+			len,
+			sep = false,
+			short = options && options.short,
+			rich = options && options.rich
 		encode(v, out, rich)
 		len = out.length - 1
 		// until where we have to stringify
-		while (t = out[len], t === '' || (short && t === ')')) {
+		while (((t = out[len]), t === '' || (short && t === ')'))) {
 			len--
 		}
 		// extended join('~')
@@ -242,7 +251,7 @@
 		return str
 	}
 
-	exports.parse = function (s, options) {
+	exports.parse = function(s, options) {
 		if (options && options.deURI) {
 			while (s.indexOf('%') !== -1) {
 				s = decodeURIComponent(s)
@@ -256,11 +265,13 @@
 		return r === EOS ? true : r
 	}
 
-	exports.tryParse = function (s, def, options) {
+	exports.tryParse = function(s, def, options) {
 		try {
 			return exports.parse(s, options)
 		} catch (ex) {
 			return def
 		}
 	}
-})(typeof exports !== 'undefined' ? exports : (window.JSURL = window.JSURL || {}))
+})(
+	typeof exports !== 'undefined' ? exports : (window.JSURL = window.JSURL || {})
+)
diff --git a/test/jsurl2.js b/test/jsurl2.js
index 83ab2d5..0060f24 100644
--- a/test/jsurl2.js
+++ b/test/jsurl2.js
@@ -4,19 +4,30 @@ import {stringify, parse, tryParse} from '..'
 // test macro, both directions
 const cmp = (t, v, s, short, rich) => {
 	// regular
-	t.notRegex(stringify(v, {rich}), /[%?#&=\n\r\0'<\\]/, 'has forbidden char');
+	t.notRegex(stringify(v, {rich}), /[%?#&=\n\r\0'<\\]/, 'has forbidden char')
 	t.is(stringify(v, {rich}), s, 'stringified wrong')
 	// roundtrip
 	t.is(stringify(parse(s), {rich}), s, 'roundtrip fails')
 	// short
 	t.is(stringify(v, {short: true, rich}), short, 'short stringified wrong')
-	t.is(stringify(parse(short), {short: true, rich}), short, 'short roundtrip fails')
+	t.is(
+		stringify(parse(short), {short: true, rich}),
+		short,
+		'short roundtrip fails'
+	)
 }
 cmp.title = (title, v, s) => `${title} ${s}`
 
 // basic values
 test(cmp, undefined, '_U~', '_U')
-test(cmp, function () { foo(); }, '_U~', '_U')
+test(
+	cmp,
+	function() {
+		foo()
+	},
+	'_U~',
+	'_U'
+)
 test(cmp, null, '_N~', '_N')
 test(cmp, false, '_F~', '_F')
 test(cmp, true, '~', '')
@@ -25,12 +36,14 @@ test(cmp, 1, '1~', '1')
 test(cmp, -1.5, '-1.5~', '-1.5')
 test(cmp, '', '*~', '*')
 test(cmp, 'hello world\u203c', 'hello_world\u203c~', 'hello_world\u203c')
-test(cmp,
-	' !"#$%&\'()*+,-./09:;<=>?@AZ[\\]^_`az{|}\n\r\0~',
-	'*_!"*H*S*.*A*"*C*D***P,-./09:;*L*E*G*Q@AZ[*B]^*_`az{|}*N*R*Z*-~',
-	'*_!"*H*S*.*A*"*C*D***P,-./09:;*L*E*G*Q@AZ[*B]^*_`az{|}*N*R*Z*-'
+test(
+	cmp,
+	' !"#$%&\'"()*+,-./09:;<=>?@AZ[\\]^_`az{|}\n\r\0~',
+	'*_!"*H*S*.*A*""*C*D***P,-./09:;*L*E*G*Q@AZ[*B]^*_`az{|}*N*R*Z*-~',
+	'*_!"*H*S*.*A*""*C*D***P,-./09:;*L*E*G*Q@AZ[*B]^*_`az{|}*N*R*Z*-'
 )
-test(cmp,
+test(
+	cmp,
 	'Ľồťś ǒƒ ửňìćọđé ẁћəệ!',
 	'*Ľồťś_ǒƒ_ửňìćọđé_ẁћəệ!~',
 	'*Ľồťś_ǒƒ_ửňìćọđé_ẁћəệ!'
@@ -39,20 +52,41 @@ test(cmp,
 test(cmp, NaN, '_N~', '_N')
 test(cmp, Infinity, '_N~', '_N')
 test(cmp, -Infinity, '_N~', '_N')
-test(cmp, new Date(1456898746898), '*2016-03-02T06:05:46.898Z~', '*2016-03-02T06:05:46.898Z')
-test(cmp, new Date('2017-04-01'), '*2017-04-01T00:00:00.000Z~', '*2017-04-01T00:00:00.000Z')
-test(cmp, new Date(1456898746898), '_D2016-03-02T06:05:46.898Z~', '_D2016-03-02T06:05:46.898Z', true)
+test(
+	cmp,
+	new Date(1456898746898),
+	'*2016-03-02T06:05:46.898Z~',
+	'*2016-03-02T06:05:46.898Z'
+)
+test(
+	cmp,
+	new Date('2017-04-01'),
+	'*2017-04-01T00:00:00.000Z~',
+	'*2017-04-01T00:00:00.000Z'
+)
+test(
+	cmp,
+	new Date(1456898746898),
+	'_D2016-03-02T06:05:46.898Z~',
+	'_D2016-03-02T06:05:46.898Z',
+	true
+)
 test(cmp, new Date('2017-04-01'), '_D2017-04-01~', '_D2017-04-01', true)
 
 // arrays
 test(cmp, [], '!~', '!')
 test(cmp, [true], '!_T~', '!_T')
-test(cmp,
+test(
+	cmp,
 	[
-		undefined, function () {
+		undefined,
+		function() {
 			foo()
 		},
-		null, false, 0, 'hello world\u203c'
+		null,
+		false,
+		0,
+		'hello world\u203c',
 	],
 	'!_U~_U~_N~_F~0~hello_world\u203c~',
 	'!_U~_U~_N~_F~0~hello_world\u203c'
@@ -61,54 +95,59 @@ test(cmp,
 // objects
 test(cmp, {}, '()~', '(')
 test(cmp, {a: true, b: true, c: true}, '(a~~b~~c)~', '(a~~b~~c')
-test(cmp,
+test(
+	cmp,
 	{
 		a: undefined,
-		b: function () {
+		b: function() {
 			foo()
 		},
 		c: null,
 		d: false,
 		t: true,
 		e: 0,
-		f: 'hello (world)\u203c'
+		f: 'hello (world)\u203c',
 	},
 	'(c~_N~d~_F~t~~e~0~f~hello_*Cworld*D\u203c)~',
-	'(c~_N~d~_F~t~~e~0~f~hello_*Cworld*D\u203c',
+	'(c~_N~d~_F~t~~e~0~f~hello_*Cworld*D\u203c'
+)
+test(
+	cmp,
+	{'()': {}, c: {'~': '()'}},
+	'(*C*D~()c~(*-~**C*D))~',
+	'(*C*D~()c~(*-~**C*D'
 )
-test(cmp, {"()": {}, c: {"~": "()"}}, '(*C*D~()c~(*-~**C*D))~', '(*C*D~()c~(*-~**C*D')
 test(cmp, {a: [[[1]]]}, '(a~!!!1)~', '(a~!!!1')
 // mix
-test(cmp, {
-	a: [
-		[1, 2],
-		[],
-		false,
-		true,
-		{},
-	],
-	c: {
-		d: 'hello',
-		e: {},
-		f: [],
-		g: true,
-		n: null
+test(
+	cmp,
+	{
+		a: [[1, 2], [], false, true, {}],
+		c: {
+			d: 'hello',
+			e: {},
+			f: [],
+			g: true,
+			n: null,
+		},
+		b: [],
 	},
-	b: [],
-}, '(a~!!1~2~~!~_F~_T~()~c~(d~hello~e~()f~!~g~~n~_N)b~!)~', '(a~!!1~2~~!~_F~_T~()~c~(d~hello~e~()f~!~g~~n~_N)b~!')
+	'(a~!!1~2~~!~_F~_T~()~c~(d~hello~e~()f~!~g~~n~_N)b~!)~',
+	'(a~!!1~2~~!~_F~_T~()~c~(d~hello~e~()f~!~g~~n~_N)b~!'
+)
 test(cmp, [[{a: [{b: [[1]]}]}]], '!!(a~!(b~!!1))~', '!!(a~!(b~!!1')
 
 test('percent-escaped single quotes', t => {
 	t.deepEqual(parse('(a~*%27hello~b~*%27world~)~', {deURI: true}), {
 		a: "'hello",
-		b: "'world"
+		b: "'world",
 	})
 })
 
 test('percent-escaped percent-escaped single quotes', t => {
 	t.deepEqual(parse('(a~*%2527hello~b~*%2525252527world~)~', {deURI: true}), {
 		a: "'hello",
-		b: "'world"
+		b: "'world",
 	})
 })
 
@@ -123,7 +162,11 @@ test('tryParse', t => {
 
 test('parse performance', t => {
 	const n = Date.now()
-	const v = { a: [ [1, 2], [], false, {}, true ], b: [], c: { d: 'hello', e: {}, f: [], g: true, n: null } }
+	const v = {
+		a: [[1, 2], [], false, {}, true],
+		b: [],
+		c: {d: 'hello', e: {}, f: [], g: true, n: null},
+	}
 	const s = stringify(v)
 	const count = 10000
 	for (let i = 0; i < count; i++) {
@@ -136,7 +179,11 @@ test('parse performance', t => {
 
 test('stringify performance', t => {
 	const n = Date.now()
-	const v = { a: [ [1, 2], [], false, {}, true ], b: [], c: { d: 'hello', e: {}, f: [], g: true, n: null } }
+	const v = {
+		a: [[1, 2], [], false, {}, true],
+		b: [],
+		c: {d: 'hello', e: {}, f: [], g: true, n: null},
+	}
 	const count = 10000
 	for (let i = 0; i < count; i++) {
 		stringify(v)
@@ -147,6 +194,11 @@ test('stringify performance', t => {
 })
 
 test('.toJSON()', t => {
-	const o = {s: 'hi', toJSON() {return this.s}}
+	const o = {
+		s: 'hi',
+		toJSON() {
+			return this.s
+		},
+	}
 	t.is(stringify(o), 'hi~')
 })

From 7e66fe0d35664fd45f178c2aa320c77da6678e3e Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Sat, 2 Jun 2018 12:03:01 +0200
Subject: [PATCH 24/37] Protect against Objects with null prototype

---
 lib/jsurl.js  | 4 +++-
 lib/jsurl2.js | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/jsurl.js b/lib/jsurl.js
index 1428222..90792d1 100644
--- a/lib/jsurl.js
+++ b/lib/jsurl.js
@@ -25,6 +25,8 @@
 //
 (function(exports) {
 	"use strict";
+	var hasOwnProperty = new Object().hasOwnProperty;
+
 	exports.stringify = function stringify(v) {
 		function encode(s) {
 			return !/[^\w-.]/.test(s) ? s : s.replace(/[^\w-.]/g, function(ch) {
@@ -57,7 +59,7 @@
 					return '~(' + (tmpAry.join('') || '~') + ')';
 				} else {
 					for (var key in v) {
-						if (v.hasOwnProperty(key)) {
+						if (hasOwnProperty.call(v, key)) {
 							var val = stringify(v[key]);
 
 							// skip undefined and functions
diff --git a/lib/jsurl2.js b/lib/jsurl2.js
index 4e79f40..6e70005 100644
--- a/lib/jsurl2.js
+++ b/lib/jsurl2.js
@@ -2,6 +2,7 @@
 // TODO custom dictionary
 ;(function(exports) {
 	'use strict'
+	var hasOwnProperty = new Object().hasOwnProperty
 	var stringRE = /^[a-zA-Z]/
 	var numRE = /^[\d-]/
 	var TRUE = '_T'
@@ -203,7 +204,7 @@
 			} else {
 				out.push('(')
 				for (var key in v) {
-					if (v.hasOwnProperty(key)) {
+					if (hasOwnProperty.call(v, key)) {
 						t = v[key]
 						if (t !== undefined && typeof t !== 'function') {
 							out.push(escape(key))

From b4c63ea2175bc905e64b129cb691b8cee446cbfb Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Thu, 12 Jul 2018 06:44:11 +0200
Subject: [PATCH 25/37] use Jest for tests

---
 __tests__/jsurl.js  | 132 ++++++++++++++++++++++++++++
 __tests__/jsurl2.js | 193 +++++++++++++++++++++++++++++++++++++++++
 package.json        |  50 ++++++-----
 test/jsurl.js       | 108 -----------------------
 test/jsurl2.js      | 204 --------------------------------------------
 5 files changed, 352 insertions(+), 335 deletions(-)
 create mode 100644 __tests__/jsurl.js
 create mode 100644 __tests__/jsurl2.js
 delete mode 100644 test/jsurl.js
 delete mode 100644 test/jsurl2.js

diff --git a/__tests__/jsurl.js b/__tests__/jsurl.js
new file mode 100644
index 0000000..de2b10e
--- /dev/null
+++ b/__tests__/jsurl.js
@@ -0,0 +1,132 @@
+const {stringify, parse, tryParse} = require('../v1')
+
+// test macro, both directions
+const cmp = (v, s) => {
+	// regular
+	expect(stringify(v)).toBe(s)
+	// roundtrip
+	expect(stringify(parse(s))).toBe(s)
+}
+
+// basic values
+test('basics', () => {
+	cmp(undefined, undefined)
+	cmp(function() {
+		foo()
+	}, undefined)
+	cmp(null, '~null')
+	cmp(false, '~false')
+	cmp(true, '~true')
+	cmp(0, '~0')
+	cmp(1, '~1')
+	cmp(-1.5, '~-1.5')
+	cmp('hello world\u203c', "~'hello*20world**203c")
+	cmp(
+		' !"#$%&\'()*+,-./09:;<=>?@AZ[\\]^_`az{|}~',
+		"~'*20*21*22*23!*25*26*27*28*29*2a*2b*2c-.*2f09*3a*3b*3c*3d*3e*3f*40AZ*5b*5c*5d*5e_*60az*7b*7c*7d*7e"
+	)
+	// JSON.stringify converts special numeric values to null
+	cmp(NaN, '~null')
+	cmp(Infinity, '~null')
+	cmp(-Infinity, '~null')
+
+	// arrays
+	cmp([], '~(~)')
+	cmp(
+		[
+			undefined,
+			function() {
+				foo()
+			},
+			null,
+			false,
+			0,
+			'hello world\u203c',
+		],
+		"~(~null~null~null~false~0~'hello*20world**203c)"
+	)
+
+	// objects
+	cmp({}, '~()')
+	cmp(
+		{
+			a: undefined,
+			b: function() {
+				foo()
+			},
+			c: null,
+			d: false,
+			e: 0,
+			f: 'hello world\u203c',
+		},
+		"~(c~null~d~false~e~0~f~'hello*20world**203c)"
+	)
+
+	// mix
+	cmp(
+		{
+			a: [[1, 2], [], {}],
+			b: [],
+			c: {
+				d: 'hello',
+				e: {},
+				f: [],
+			},
+		},
+		"~(a~(~(~1~2)~(~)~())~b~(~)~c~(d~'hello~e~()~f~(~)))"
+	)
+})
+
+test('percent-escaped single quotes', () => {
+	expect(parse('~(a~%27hello~b~%27world)')).toEqual({
+		a: 'hello',
+		b: 'world',
+	})
+})
+
+test('percent-escaped percent-escaped single quotes', () => {
+	expect(parse('~(a~%2527hello~b~%2525252527world)')).toEqual({
+		a: 'hello',
+		b: 'world',
+	})
+})
+
+test('tryParse', () => {
+	expect(tryParse('~null')).toBe(null)
+	expect(tryParse('~1', 2)).toBe(1)
+	expect(tryParse('1')).toBe(undefined)
+	expect(tryParse('1', 0)).toBe(0)
+})
+
+test('parse performance', () => {
+	const n = Date.now()
+	const v = {
+		a: [[1, 2], [], false, {}, true],
+		b: [],
+		c: {d: 'hello', e: {}, f: [], g: true, n: null},
+	}
+	const s = stringify(v)
+	const count = 10000
+	for (let i = 0; i < count; i++) {
+		parse(s)
+	}
+	const ms = Date.now() - n
+	console.log(`${count} parsed in ${ms}ms, ${ms / count}ms/item`)
+	expect(ms < 300).toBe(true)
+})
+
+test('stringify performance', () => {
+	const n = Date.now()
+	const v = {
+		a: [[1, 2], [], false, {}, true],
+		b: [],
+		c: {d: 'hello', e: {}, f: [], g: true, n: null},
+	}
+	const count = 10000
+	for (let i = 0; i < count; i++) {
+		stringify(v)
+	}
+	const ms = Date.now() - n
+	console.log(`${count} stringified in ${ms}ms, ${ms / count}ms/item`)
+	expect(ms < 300).toBe(true)
+})
diff --git a/__tests__/jsurl2.js b/__tests__/jsurl2.js
new file mode 100644
index 0000000..da4d699
--- /dev/null
+++ b/__tests__/jsurl2.js
@@ -0,0 +1,193 @@
+const {stringify, parse, tryParse} = require('..')
+
+// test macro, both directions
+const cmp = (v, s, short, rich) => {
+	// regular
+	expect(stringify(v, {rich})).not.toMatch(/[%?#&=\n\r\0'<\\]/)
+	expect(stringify(v, {rich})).toBe(s)
+	// roundtrip
+	expect(stringify(parse(s), {rich})).toBe(s)
+	// short
+	expect(stringify(v, {short: true, rich})).toBe(short)
+	expect(stringify(parse(short), {short: true, rich})).toBe(short)
+}
+cmp.title = (title, v, s) => `${title} ${s}`
+
+test('basics', () => {
+	// basic values
+	cmp(undefined, '_U~', '_U')
+	cmp(
+		function() {
+			foo()
+		},
+		'_U~',
+		'_U'
+	)
+	cmp(null, '_N~', '_N')
+	cmp(false, '_F~', '_F')
+	cmp(true, '~', '')
+	cmp(0, '0~', '0')
+	cmp(1, '1~', '1')
+	cmp(-1.5, '-1.5~', '-1.5')
+	cmp('', '*~', '*')
+	cmp('hello world\u203c', 'hello_world\u203c~', 'hello_world\u203c')
+	cmp(
+		' !"#$%&\'"()*+,-./09:;<=>?@AZ[\\]^_`az{|}\n\r\0~',
+		'*_!"*H*S*.*A*""*C*D***P,-./09:;*L*E*G*Q@AZ[*B]^*_`az{|}*N*R*Z*-~',
+		'*_!"*H*S*.*A*""*C*D***P,-./09:;*L*E*G*Q@AZ[*B]^*_`az{|}*N*R*Z*-'
+	)
+	cmp(
+		'Ľồťś ǒƒ ửňìćọđé ẁћəệ!',
+		'*Ľồťś_ǒƒ_ửňìćọđé_ẁћəệ!~',
+		'*Ľồťś_ǒƒ_ửňìćọđé_ẁћəệ!'
+	)
+	// JSON.stringify converts special numeric values to null
+	cmp(NaN, '_N~', '_N')
+	cmp(Infinity, '_N~', '_N')
+	cmp(-Infinity, '_N~', '_N')
+	cmp(
+		new Date(1456898746898),
+		'*2016-03-02T06:05:46.898Z~',
+		'*2016-03-02T06:05:46.898Z'
+	)
+	cmp(
+		new Date('2017-04-01'),
+		'*2017-04-01T00:00:00.000Z~',
+		'*2017-04-01T00:00:00.000Z'
+	)
+	cmp(
+		new Date(1456898746898),
+		'_D2016-03-02T06:05:46.898Z~',
+		'_D2016-03-02T06:05:46.898Z',
+		true
+	)
+	cmp(new Date('2017-04-01'), '_D2017-04-01~', '_D2017-04-01', true)
+
+	// arrays
+	cmp([], '!~', '!')
+	cmp([true], '!_T~', '!_T')
+	cmp(
+		[
+			undefined,
+			function() {
+				foo()
+			},
+			null,
+			false,
+			0,
+			'hello world\u203c',
+		],
+		'!_U~_U~_N~_F~0~hello_world\u203c~',
+		'!_U~_U~_N~_F~0~hello_world\u203c'
+	)
+
+	// objects
+	cmp({}, '()~', '(')
+	cmp({a: true, b: true, c: true}, '(a~~b~~c)~', '(a~~b~~c')
+	cmp(
+		{
+			a: undefined,
+			b: function() {
+				foo()
+			},
+			c: null,
+			d: false,
+			t: true,
+			e: 0,
+			f: 'hello (world)\u203c',
+		},
+		'(c~_N~d~_F~t~~e~0~f~hello_*Cworld*D\u203c)~',
+		'(c~_N~d~_F~t~~e~0~f~hello_*Cworld*D\u203c'
+	)
+	cmp(
+		{'()': {}, c: {'~': '()'}},
+		'(*C*D~()c~(*-~**C*D))~',
+		'(*C*D~()c~(*-~**C*D'
+	)
+	cmp({a: [[[1]]]}, '(a~!!!1)~', '(a~!!!1')
+	// mix
+	cmp(
+		{
+			a: [[1, 2], [], false, true, {}],
+			c: {
+				d: 'hello',
+				e: {},
+				f: [],
+				g: true,
+				n: null,
+			},
+			b: [],
+		},
+		'(a~!!1~2~~!~_F~_T~()~c~(d~hello~e~()f~!~g~~n~_N)b~!)~',
+		'(a~!!1~2~~!~_F~_T~()~c~(d~hello~e~()f~!~g~~n~_N)b~!'
+	)
+	cmp([[{a: [{b: [[1]]}]}]], '!!(a~!(b~!!1))~', '!!(a~!(b~!!1')
+})
+
+test('percent-escaped single quotes', () => {
+	expect(parse('(a~*%27hello~b~*%27world~)~', {deURI: true})).toEqual({
+		a: "'hello",
+		b: "'world",
+	})
+})
+
+test('percent-escaped percent-escaped single quotes', () => {
+	expect(parse('(a~*%2527hello~b~*%2525252527world~)~', {deURI: true})).toEqual(
+		{
+			a: "'hello",
+			b: "'world",
+		}
+	)
+})
+
+test('tryParse', () => {
+	expect(tryParse('_N~')).toBe(null)
+	expect(tryParse('%5FN', 5, {deURI: true})).toBe(null)
+	expect(tryParse('1~', 2)).toBe(1)
+	expect(tryParse('_')).toBe(undefined)
+	expect(tryParse('_', 0)).toBe(0)
+	expect(tryParse('12323NOTANUMBER', 0)).toBe(0)
+})
+
+test('parse performance', () => {
+	const n = Date.now()
+	const v = {
+		a: [[1, 2], [], false, {}, true],
+		b: [],
+		c: {d: 'hello', e: {}, f: [], g: true, n: null},
+	}
+	const s = stringify(v)
+	const count = 10000
+	for (let i = 0; i < count; i++) {
+		parse(s, {deURI: true})
+	}
+	const ms = Date.now() - n
+	console.log(`v2: ${count} parsed in ${ms}ms, ${ms / count}ms/item`)
+	expect(ms < 300).toBe(true)
+})
+
+test('stringify performance', () => {
+	const n = Date.now()
+	const v = {
+		a: [[1, 2], [], false, {}, true],
+		b: [],
+		c: {d: 'hello', e: {}, f: [], g: true, n: null},
+	}
+	const count = 10000
+	for (let i = 0; i < count; i++) {
+		stringify(v)
+	}
+	const ms = Date.now() - n
+	console.log(`v2: ${count} stringified in ${ms}ms, ${ms / count}ms/item`)
+	expect(ms < 300).toBe(true)
+})
+
+test('.toJSON()', () => {
+	const o = {
+		s: 'hi',
+		toJSON() {
+			return this.s
+		},
+	}
+	expect(stringify(o)).toBe('hi~')
+})
diff --git a/package.json b/package.json
index 0af6398..e43ca94 100644
--- a/package.json
+++ b/package.json
@@ -1,25 +1,29 @@
 {
-  "name": "jsurl",
-  "description": "URL friendly JSON-like formatting and parsing",
-  "version": "2.0.0-rc1",
-  "license": "MIT",
-  "homepage": "http://github.com/Sage/jsurl",
-  "author": "Bruno Jouhier",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/Sage/jsurl.git"
-  },
-  "devDependencies": {
-    "ava": "^0.18.2"
-  },
-  "files": ["lib", "v1.js"],
-  "directories": {
-    "lib": "./lib"
-  },
-  "scripts": {
-    "test": "ava",
-    "test-watch": "ava --watch"
-  },
-  "main": "lib/jsurl2.js",
-  "dependencies": {}
+	"name": "jsurl",
+	"description": "URL friendly JSON-like formatting and parsing",
+	"version": "2.0.0-rc1",
+	"license": "MIT",
+	"homepage": "http://github.com/Sage/jsurl",
+	"author": "Bruno Jouhier",
+	"repository": {
+		"type": "git",
+		"url": "git://github.com/Sage/jsurl.git"
+	},
+	"main": "lib/jsurl2.js",
+	"dependencies": {},
+	"devDependencies": {
+		"jest": "^23.4.0",
+		"jest-cli": "^23.4.0"
+	},
+	"files": [
+		"lib",
+		"v1.js"
+	],
+	"directories": {
+		"lib": "./lib"
+	},
+	"scripts": {
+		"test": "jest",
+		"test-watch": "jest --watch"
+	}
 }
diff --git a/test/jsurl.js b/test/jsurl.js
deleted file mode 100644
index 0756cd0..0000000
--- a/test/jsurl.js
+++ /dev/null
@@ -1,108 +0,0 @@
-import test from 'ava'
-import {stringify, parse, tryParse} from '../v1'
-
-// test macro, both directions
-const cmp = (t, v, s) => {
-	// regular
-	t.is(stringify(v), s)
-	// roundtrip
-	t.is(stringify(parse(s)), s)
-}
-cmp.title = (title, v, s) => `${title} ${s}`
-
-// basic values
-test(cmp, undefined, undefined)
-test(cmp, function () {
-	foo()
-}, undefined)
-test(cmp, null, '~null')
-test(cmp, false, '~false')
-test(cmp, true, '~true')
-test(cmp, 0, '~0')
-test(cmp, 1, '~1')
-test(cmp, -1.5, '~-1.5')
-test(cmp, 'hello world\u203c', "~'hello*20world**203c")
-test(cmp, ' !"#$%&\'()*+,-./09:;<=>?@AZ[\\]^_`az{|}~', "~'*20*21*22*23!*25*26*27*28*29*2a*2b*2c-.*2f09*3a*3b*3c*3d*3e*3f*40AZ*5b*5c*5d*5e_*60az*7b*7c*7d*7e")
-// JSON.stringify converts special numeric values to null
-test(cmp, NaN, '~null')
-test(cmp, Infinity, '~null')
-test(cmp, -Infinity, '~null')
-
-// arrays
-test(cmp, [], '~(~)')
-test(cmp, [undefined, function () {
-	foo()
-},
-	null, false, 0, 'hello world\u203c'], "~(~null~null~null~false~0~'hello*20world**203c)")
-
-// objects
-test(cmp, {}, '~()')
-test(cmp, {
-	a: undefined,
-	b: function () {
-		foo()
-	},
-	c: null,
-	d: false,
-	e: 0,
-	f: 'hello world\u203c'
-}, "~(c~null~d~false~e~0~f~'hello*20world**203c)")
-
-// mix
-test(cmp, {
-	a: [
-		[1, 2],
-		[], {}],
-	b: [],
-	c: {
-		d: 'hello',
-		e: {},
-		f: []
-	}
-}, "~(a~(~(~1~2)~(~)~())~b~(~)~c~(d~'hello~e~()~f~(~)))")
-
-test('percent-escaped single quotes', t => {
-	t.deepEqual(parse('~(a~%27hello~b~%27world)'), {
-		a: 'hello',
-		b: 'world'
-	})
-})
-
-test('percent-escaped percent-escaped single quotes', t => {
-	t.deepEqual(parse('~(a~%2527hello~b~%2525252527world)'), {
-		a: 'hello',
-		b: 'world'
-	})
-})
-
-test('tryParse', t => {
-	t.is(tryParse('~null'), null)
-	t.is(tryParse('~1', 2), 1)
-	t.is(tryParse('1'), undefined)
-	t.is(tryParse('1', 0), 0)
-})
-
-test('parse performance', t => {
-	const n = Date.now()
-	const v = { a: [ [1, 2], [], false, {}, true ], b: [], c: { d: 'hello', e: {}, f: [], g: true, n: null } }
-	const s = stringify(v)
-	const count = 10000
-	for (let i = 0; i < count; i++) {
-		parse(s)
-	}
-	const ms = Date.now() - n
-	console.log(`${count} parsed in ${ms}ms, ${ms / count}ms/item`)
-	t.true(ms < 300)
-})
-
-test('stringify performance', t => {
-	const n = Date.now()
-	const v = { a: [ [1, 2], [], false, {}, true ], b: [], c: { d: 'hello', e: {}, f: [], g: true, n: null } }
-	const count = 10000
-	for (let i = 0; i < count; i++) {
-		stringify(v)
-	}
-	const ms = Date.now() - n
-	console.log(`${count} stringified in ${ms}ms, ${ms / count}ms/item`)
-	t.true(ms < 300)
-})
diff --git a/test/jsurl2.js b/test/jsurl2.js
deleted file mode 100644
index 0060f24..0000000
--- a/test/jsurl2.js
+++ /dev/null
@@ -1,204 +0,0 @@
-import test from 'ava'
-import {stringify, parse, tryParse} from '..'
-
-// test macro, both directions
-const cmp = (t, v, s, short, rich) => {
-	// regular
-	t.notRegex(stringify(v, {rich}), /[%?#&=\n\r\0'<\\]/, 'has forbidden char')
-	t.is(stringify(v, {rich}), s, 'stringified wrong')
-	// roundtrip
-	t.is(stringify(parse(s), {rich}), s, 'roundtrip fails')
-	// short
-	t.is(stringify(v, {short: true, rich}), short, 'short stringified wrong')
-	t.is(
-		stringify(parse(short), {short: true, rich}),
-		short,
-		'short roundtrip fails'
-	)
-}
-cmp.title = (title, v, s) => `${title} ${s}`
-
-// basic values
-test(cmp, undefined, '_U~', '_U')
-test(
-	cmp,
-	function() {
-		foo()
-	},
-	'_U~',
-	'_U'
-)
-test(cmp, null, '_N~', '_N')
-test(cmp, false, '_F~', '_F')
-test(cmp, true, '~', '')
-test(cmp, 0, '0~', '0')
-test(cmp, 1, '1~', '1')
-test(cmp, -1.5, '-1.5~', '-1.5')
-test(cmp, '', '*~', '*')
-test(cmp, 'hello world\u203c', 'hello_world\u203c~', 'hello_world\u203c')
-test(
-	cmp,
-	' !"#$%&\'"()*+,-./09:;<=>?@AZ[\\]^_`az{|}\n\r\0~',
-	'*_!"*H*S*.*A*""*C*D***P,-./09:;*L*E*G*Q@AZ[*B]^*_`az{|}*N*R*Z*-~',
-	'*_!"*H*S*.*A*""*C*D***P,-./09:;*L*E*G*Q@AZ[*B]^*_`az{|}*N*R*Z*-'
-)
-test(
-	cmp,
-	'Ľồťś ǒƒ ửňìćọđé ẁћəệ!',
-	'*Ľồťś_ǒƒ_ửňìćọđé_ẁћəệ!~',
-	'*Ľồťś_ǒƒ_ửňìćọđé_ẁћəệ!'
-)
-// JSON.stringify converts special numeric values to null
-test(cmp, NaN, '_N~', '_N')
-test(cmp, Infinity, '_N~', '_N')
-test(cmp, -Infinity, '_N~', '_N')
-test(
-	cmp,
-	new Date(1456898746898),
-	'*2016-03-02T06:05:46.898Z~',
-	'*2016-03-02T06:05:46.898Z'
-)
-test(
-	cmp,
-	new Date('2017-04-01'),
-	'*2017-04-01T00:00:00.000Z~',
-	'*2017-04-01T00:00:00.000Z'
-)
-test(
-	cmp,
-	new Date(1456898746898),
-	'_D2016-03-02T06:05:46.898Z~',
-	'_D2016-03-02T06:05:46.898Z',
-	true
-)
-test(cmp, new Date('2017-04-01'), '_D2017-04-01~', '_D2017-04-01', true)
-
-// arrays
-test(cmp, [], '!~', '!')
-test(cmp, [true], '!_T~', '!_T')
-test(
-	cmp,
-	[
-		undefined,
-		function() {
-			foo()
-		},
-		null,
-		false,
-		0,
-		'hello world\u203c',
-	],
-	'!_U~_U~_N~_F~0~hello_world\u203c~',
-	'!_U~_U~_N~_F~0~hello_world\u203c'
-)
-
-// objects
-test(cmp, {}, '()~', '(')
-test(cmp, {a: true, b: true, c: true}, '(a~~b~~c)~', '(a~~b~~c')
-test(
-	cmp,
-	{
-		a: undefined,
-		b: function() {
-			foo()
-		},
-		c: null,
-		d: false,
-		t: true,
-		e: 0,
-		f: 'hello (world)\u203c',
-	},
-	'(c~_N~d~_F~t~~e~0~f~hello_*Cworld*D\u203c)~',
-	'(c~_N~d~_F~t~~e~0~f~hello_*Cworld*D\u203c'
-)
-test(
-	cmp,
-	{'()': {}, c: {'~': '()'}},
-	'(*C*D~()c~(*-~**C*D))~',
-	'(*C*D~()c~(*-~**C*D'
-)
-test(cmp, {a: [[[1]]]}, '(a~!!!1)~', '(a~!!!1')
-// mix
-test(
-	cmp,
-	{
-		a: [[1, 2], [], false, true, {}],
-		c: {
-			d: 'hello',
-			e: {},
-			f: [],
-			g: true,
-			n: null,
-		},
-		b: [],
-	},
-	'(a~!!1~2~~!~_F~_T~()~c~(d~hello~e~()f~!~g~~n~_N)b~!)~',
-	'(a~!!1~2~~!~_F~_T~()~c~(d~hello~e~()f~!~g~~n~_N)b~!'
-)
-test(cmp, [[{a: [{b: [[1]]}]}]], '!!(a~!(b~!!1))~', '!!(a~!(b~!!1')
-
-test('percent-escaped single quotes', t => {
-	t.deepEqual(parse('(a~*%27hello~b~*%27world~)~', {deURI: true}), {
-		a: "'hello",
-		b: "'world",
-	})
-})
-
-test('percent-escaped percent-escaped single quotes', t => {
-	t.deepEqual(parse('(a~*%2527hello~b~*%2525252527world~)~', {deURI: true}), {
-		a: "'hello",
-		b: "'world",
-	})
-})
-
-test('tryParse', t => {
-	t.is(tryParse('_N~'), null)
-	t.is(tryParse('%5FN', 5, {deURI: true}), null)
-	t.is(tryParse('1~', 2), 1)
-	t.is(tryParse('_'), undefined)
-	t.is(tryParse('_', 0), 0)
-	t.is(tryParse('12323NOTANUMBER', 0), 0)
-})
-
-test('parse performance', t => {
-	const n = Date.now()
-	const v = {
-		a: [[1, 2], [], false, {}, true],
-		b: [],
-		c: {d: 'hello', e: {}, f: [], g: true, n: null},
-	}
-	const s = stringify(v)
-	const count = 10000
-	for (let i = 0; i < count; i++) {
-		parse(s, {deURI: true})
-	}
-	const ms = Date.now() - n
-	console.log(`v2: ${count} parsed in ${ms}ms, ${ms / count}ms/item`)
-	t.true(ms < 300)
-})
-
-test('stringify performance', t => {
-	const n = Date.now()
-	const v = {
-		a: [[1, 2], [], false, {}, true],
-		b: [],
-		c: {d: 'hello', e: {}, f: [], g: true, n: null},
-	}
-	const count = 10000
-	for (let i = 0; i < count; i++) {
-		stringify(v)
-	}
-	const ms = Date.now() - n
-	console.log(`v2: ${count} stringified in ${ms}ms, ${ms / count}ms/item`)
-	t.true(ms < 300)
-})
-
-test('.toJSON()', t => {
-	const o = {
-		s: 'hi',
-		toJSON() {
-			return this.s
-		},
-	}
-	t.is(stringify(o), 'hi~')
-})

From 8cc227ccfc334c4f190e61672685ea31e14c7b6e Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Thu, 12 Jul 2018 08:37:32 +0200
Subject: [PATCH 26/37] fix performance page

---
 examples/performance.html | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/examples/performance.html b/examples/performance.html
index 8bc9178..9a38511 100644
--- a/examples/performance.html
+++ b/examples/performance.html
@@ -4,7 +4,7 @@
 <script src="../lib/jsurl2.js" type="application/javascript"></script>
 <script>
 	const count = 200000
-	const v = { a: [ [1, 2], [], false, {}, true ], b: [], c: { d: 'hello', e: {}, f: [], g: true, n: null } }
+	const v = { a: [[1, 2], [], false, {}, true], b: [], c: { d: 'hello', e: {}, f: [], g: true, n: null } }
 	const JSONParse = () => {
 		const n = Date.now()
 		const s = JSON.stringify(v)
@@ -24,9 +24,9 @@
 	}
 	const v1Parse = () => {
 		const n = Date.now()
-		const s = JSURL.stringify(v)
+		const s = JSURL1.stringify(v)
 		for (let i = 0; i < count; i++) {
-			JSURL.parse(s)
+			JSURL1.parse(s)
 		}
 		const ms = Date.now() - n
 		console.log(`v1: ${count} parsed in ${ms}ms, ${ms / count}ms/item`)
@@ -34,16 +34,16 @@
 	const v1Stringify = () => {
 		const n = Date.now()
 		for (let i = 0; i < count; i++) {
-			JSURL.stringify(v)
+			JSURL1.stringify(v)
 		}
 		const ms = Date.now() - n
 		console.log(`v1: ${count} stringified in ${ms}ms, ${ms / count}ms/item`)
 	}
 	const v2Parse = () => {
 		const n = Date.now()
-		const s = JSURL2.stringify(v)
+		const s = JSURL.stringify(v)
 		for (let i = 0; i < count; i++) {
-			JSURL2.parse(s)
+			JSURL.parse(s)
 		}
 		const ms = Date.now() - n
 		console.log(`v2: ${count} parsed in ${ms}ms, ${ms / count}ms/item`)
@@ -51,7 +51,7 @@
 	const v2Stringify = () => {
 		const n = Date.now()
 		for (let j = 0; j < count; j++) {
-			JSURL2.stringify(v)
+			JSURL.stringify(v)
 		}
 		const ms = Date.now() - n
 		console.log(`v2: ${count} stringified in ${ms}ms, ${ms / count}ms/item`)
@@ -66,4 +66,4 @@
 	}
 </script>
 
-<p>Use the Chrome Devtools Timeline to profile page load. See JS console for timings.</p>
\ No newline at end of file
+<p>Use the Chrome Devtools Timeline to profile page load. See JS console for timings.</p>

From b9900c5a98517f86b55a71353fbac141fa58ca30 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Mon, 16 Jul 2018 22:01:49 +0200
Subject: [PATCH 27/37] Make sure JSON can parse output only if same value

---
 __tests__/jsurl2.js | 29 ++++++++++++++++++++++++++---
 lib/jsurl2.js       |  7 ++++++-
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/__tests__/jsurl2.js b/__tests__/jsurl2.js
index da4d699..8b0bbac 100644
--- a/__tests__/jsurl2.js
+++ b/__tests__/jsurl2.js
@@ -1,15 +1,29 @@
 const {stringify, parse, tryParse} = require('..')
 
+// It only produces JSON parseable values if they are the same
+const isJsonOk = (v, str) => {
+	try {
+		const out = JSON.parse(str)
+		return v === out
+	} catch (err) {
+		return true
+	}
+}
 // test macro, both directions
 const cmp = (v, s, short, rich) => {
 	// regular
-	expect(stringify(v, {rich})).not.toMatch(/[%?#&=\n\r\0'<\\]/)
-	expect(stringify(v, {rich})).toBe(s)
+	const richStr = stringify(v, {rich})
+	expect(richStr).not.toMatch(/[%?#&=\n\r\0'<\\]/)
+	expect(richStr).toBe(s)
 	// roundtrip
 	expect(stringify(parse(s), {rich})).toBe(s)
 	// short
-	expect(stringify(v, {short: true, rich})).toBe(short)
+	const shortStr = stringify(v, {short: true, rich})
+	expect(shortStr).toBe(short)
 	expect(stringify(parse(short), {short: true, rich})).toBe(short)
+	// not JSON
+	expect(isJsonOk(v, richStr)).toBe(true)
+	expect(isJsonOk(v, shortStr)).toBe(true)
 }
 cmp.title = (title, v, s) => `${title} ${s}`
 
@@ -191,3 +205,12 @@ test('.toJSON()', () => {
 	}
 	expect(stringify(o)).toBe('hi~')
 })
+
+test('never JSON bareword', () => {
+	expect(stringify('true')).toEqual('true~')
+	expect(stringify('true', {short: true})).toEqual('*true')
+	expect(stringify('false')).toEqual('false~')
+	expect(stringify('false', {short: true})).toEqual('*false')
+	expect(stringify('null')).toEqual('null~')
+	expect(stringify('null', {short: true})).toEqual('*null')
+})
diff --git a/lib/jsurl2.js b/lib/jsurl2.js
index 6e70005..3723443 100644
--- a/lib/jsurl2.js
+++ b/lib/jsurl2.js
@@ -223,6 +223,8 @@
 		}
 	}
 
+	const antiJSON = {true: '*true', false: '*false', null: '*null'}
+
 	exports.stringify = function(v, options) {
 		var out = [],
 			t,
@@ -246,7 +248,10 @@
 			str += t
 			sep = !(t === '!' || t === '(' || t === ')')
 		}
-		if (!short) {
+		if (short) {
+			t = antiJSON[str]
+			if (t) str = t
+		} else {
 			str += '~'
 		}
 		return str

From bdd45b29bd3da9f86dd160511843df41ae374d1d Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Mon, 16 Jul 2018 21:53:06 +0200
Subject: [PATCH 28/37] allow JSON input

---
 README.md           | 76 +++++++++++++++++++++++----------------------
 __tests__/jsurl2.js |  9 ++++++
 lib/jsurl2.js       |  5 +--
 3 files changed, 51 insertions(+), 39 deletions(-)

diff --git a/README.md b/README.md
index fd9661a..33f41fb 100644
--- a/README.md
+++ b/README.md
@@ -8,16 +8,17 @@ JSURL v2 aims to be a drop-in replacement for JSON encoding with better size and
 
 JSURL v2 has been designed to be
 
-* Fast: our test case actually outperforms native JSON
-* Compact: shorter output than JSON and v1
-* Readable: more readable than v1 in many cases as well as leaving accented characters unchanged (so they are readable in URLs and embeds)
-* URI-ready: It does not encode everything that should be URI-encoded, but it does encode all delimiters of query strings.
-  * You can embed it as part of a query string, and normally you won't need to do any URI encoding yourself (browser/http client will take care of that).
-  * It will be correctly detected as part of the URI by most auto-URL-from-text implementations.
-* embed-ready:
-  * embeddable in \<script> tags inside single-quoted JS strings
-  * `rich` mode encodes/decodes `Date` objects
-* Easy to generate and parse
+- Fast: our test case actually outperforms native JSON
+- Compact: shorter output than JSON and v1
+- Readable: more readable than v1 in many cases as well as leaving accented characters unchanged (so they are readable in URLs and embeds)
+- URI-ready: It does not encode everything that should be URI-encoded, but it does encode all delimiters of query strings.
+  - You can embed it as part of a query string, and normally you won't need to do any URI encoding yourself (browser/http client will take care of that).
+  - It will be correctly detected as part of the URI by most auto-URL-from-text implementations.
+- embed-ready:
+  - embeddable in \<script> tags inside single-quoted JS strings
+  - `rich` mode encodes/decodes `Date` objects
+- Easy to generate and parse
+- Easy upgrade: it can parse JSON as well, and it will never generate valid JSON unless when it's the correct representation
 
 The most important difference with v1 is that it might need extra URI-encoding depending on your needs. You can also pass `{deURI: true}` as an option to `parse()` so it will handle any URI encoding automatically.
 
@@ -31,9 +32,10 @@ You don't need to know this to use it, but this might be interesting:
 
 v2 uses the allowable characters in URI schemes for multiple purposes depending on the location in the result. Some examples:
 
-* `!` starts an array if it is the first character in a value, but inside a string it is unchanged.
-* `~` and `)` are used as end-of-value and end-of-object delimiters, and are illegal inside encoded values.
-* `*` starts a string, but can be left out if the first string character is a-z. Inside a string, it escapes special characters.
+- `!` starts an array if it is the first character in a value, but inside a string it is unchanged.
+- `~` and `)` are used as end-of-value and end-of-object delimiters, and are illegal inside encoded values.
+- `*` starts a string, but can be left out if the first string character is a-z. Inside a string, it escapes special characters.
+- whitespace is never legal, so you can strip it before parsing if it can be introduced accidentally
 
 v2 has a `short` mode, which omits the unnecessary ending delimiters. You can use this to save a few more bytes, but you won't be able to spot an encoded value on sight by the ending `~`.
 
@@ -46,66 +48,66 @@ It makes it handy to pass complex values via URL query parameters.
 
 JSURL v1 has been designed to be:
 
-* Compact: its output is much more compact than JSON + URL encoding (except in pathological cases). 
+- Compact: its output is much more compact than JSON + URL encoding (except in pathological cases).
   It is even often slightly more compact than regular JSON!
-* Readable: its output is much more readable than JSON + URL encoding.
-* Foolproof: its output only contains characters that are unaffected by URL encoding/decoding (but see note)
-  There is no risk of missing a URL encoding/decoding pass, or of messing up a JSURL string by applying 
+- Readable: its output is much more readable than JSON + URL encoding.
+- Foolproof: its output only contains characters that are unaffected by URL encoding/decoding (but see note)
+  There is no risk of missing a URL encoding/decoding pass, or of messing up a JSURL string by applying
   an extra URL encoding or decoding pass.
-* Easy to generate and parse
+- Easy to generate and parse
 
 Notes:
 
-* a JSURLv1 encoded value will get its `'` characters URI-encoded by most browsers, due to security concerns that surfaced after v1 was created. v2 does not use `'` for structural encoding.
-* a JSURLv1 encoded value at the end of a URL placed in plaintext might not be detected as fully part of the URL by auto-URL-detectors (as used by email clients etc). v2 fixes this by always ending in `~`.
+- a JSURLv1 encoded value will get its `'` characters URI-encoded by most browsers, due to security concerns that surfaced after v1 was created. v2 does not use `'` for structural encoding.
+- a JSURLv1 encoded value at the end of a URL placed in plaintext might not be detected as fully part of the URL by auto-URL-detectors (as used by email clients etc). v2 fixes this by always ending in `~`.
 
 #### v1 Syntax
 
 Think of it as JSON with the following changes:
 
-* Curly braces (`{` and `}`) replaced by parentheses (`(` and `)`)
-* Square brackets (`[` and `]`) replaced by `(~` and `)`
-* Property names unquoted (but escaped -- see below).
-* String values prefixed by a single quote (`'`) and escaped
-* All other JSON punctuation (colon `:` and comma `,`) replaced by tildes (`~`)
-* An extra tilde (`~`) at the very beginning.
+- Curly braces (`{` and `}`) replaced by parentheses (`(` and `)`)
+- Square brackets (`[` and `]`) replaced by `(~` and `)`
+- Property names unquoted (but escaped -- see below).
+- String values prefixed by a single quote (`'`) and escaped
+- All other JSON punctuation (colon `:` and comma `,`) replaced by tildes (`~`)
+- An extra tilde (`~`) at the very beginning.
 
 Property names and string values are escaped as follows:
 
-* Letters, digits, underscore (`_`), hyphen (`-`) and dot (`.`) are preserved.
-* Dollar sign (`$`) is replaced by exclamation mark (`!`)
-* Other characters with UNICODE value <= `0xff` are encoded as `*XX`
-* Characters with UNICODE value > `0xff` are encoded as `**XXXX`
+- Letters, digits, underscore (`_`), hyphen (`-`) and dot (`.`) are preserved.
+- Dollar sign (`$`) is replaced by exclamation mark (`!`)
+- Other characters with UNICODE value <= `0xff` are encoded as `*XX`
+- Characters with UNICODE value > `0xff` are encoded as `**XXXX`
 
 ## Examples
 
 JSON:
 
-``` json
-{"name":"John Doé","age":42,"user":true,"children":["Mary","Bill"]}
+```json
+{"name": "John Doé", "age": 42, "user": true, "children": ["Mary", "Bill"]}
 ```
 
 JSON + URL encoding:
 
-``` jsonuri
+```jsonuri
 %7B%22name%22%3A%22John%20Do%C3%22%2C%22age%22%3A42%2C%22user%22%3Atrue%2C%22children%22%3A%5B%22Mary%22%2C%22Bill%22%5D%7D
 ```
 
 JSURL v1:
 
-``` jsurl
+```jsurl
 ~(name~'John*20Do*e9~age~42~user~true~children~(~'Mary~'Bill))
 ```
 
 JSURL v2:
 
-``` jsurl2
+```jsurl2
 (name~John_Doé~age~42~user~~children~!Mary~Bill)~
 ```
 
 ## v2 API
 
-``` javascript
+```javascript
 var JSURL = require("jsurl");
 
 // Options:
@@ -125,7 +127,7 @@ obj = JSURL.tryParse(str[, def][, options]);
 
 The old API is still available if you need to decode v1 stringifieds.
 
-``` javascript
+```javascript
 var JSURL1 = require("jsurl/v1");
 
 str = JSURL1.stringify(obj);
diff --git a/__tests__/jsurl2.js b/__tests__/jsurl2.js
index 8b0bbac..8ca016a 100644
--- a/__tests__/jsurl2.js
+++ b/__tests__/jsurl2.js
@@ -24,6 +24,15 @@ const cmp = (v, s, short, rich) => {
 	// not JSON
 	expect(isJsonOk(v, richStr)).toBe(true)
 	expect(isJsonOk(v, shortStr)).toBe(true)
+	// Can parse the JSON version and is equivalent
+	const jsv = JSON.stringify(v)
+	if (jsv) {
+		if (!rich)
+			expect(JSON.stringify(parse(jsv))).toEqual(JSON.stringify(parse(short)))
+	} else {
+		expect(jsv).toBe(undefined)
+		expect(s).toBe('_U~')
+	}
 }
 cmp.title = (title, v, s) => `${title} ${s}`
 
diff --git a/lib/jsurl2.js b/lib/jsurl2.js
index 3723443..d24c99e 100644
--- a/lib/jsurl2.js
+++ b/lib/jsurl2.js
@@ -223,8 +223,7 @@
 		}
 	}
 
-	const antiJSON = {true: '*true', false: '*false', null: '*null'}
-
+	var antiJSON = {true: '*true', false: '*false', null: '*null'}
 	exports.stringify = function(v, options) {
 		var out = [],
 			t,
@@ -257,12 +256,14 @@
 		return str
 	}
 
+	var JSONRE = /^({|\[|"|true$|false$|null$)/
 	exports.parse = function(s, options) {
 		if (options && options.deURI) {
 			while (s.indexOf('%') !== -1) {
 				s = decodeURIComponent(s)
 			}
 		}
+		if (JSONRE.test(s)) return JSON.parse(s)
 		var l = s.length
 		// if (s.charAt(l - 1) !== '~') {
 		// 	throw new Error('not a JSURL2 string')

From c6db093da576c05b4978b2e62b46d20c2223ba5b Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Sun, 19 Aug 2018 05:59:29 +0200
Subject: [PATCH 29/37] deURI: also strip whitespace

---
 __tests__/jsurl2.js |  9 +++++++++
 lib/jsurl2.js       | 36 +++++++++++++++++++++++++++++++++---
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/__tests__/jsurl2.js b/__tests__/jsurl2.js
index 8ca016a..4d4af8b 100644
--- a/__tests__/jsurl2.js
+++ b/__tests__/jsurl2.js
@@ -163,6 +163,15 @@ test('percent-escaped percent-escaped single quotes', () => {
 	)
 })
 
+test('whitespace etc', () => {
+	expect(
+		parse('(a~*%00he llo ~ b~ \r \n \f \t *%251fworld~)~', {deURI: true})
+	).toEqual({
+		a: 'hello',
+		b: 'world',
+	})
+})
+
 test('tryParse', () => {
 	expect(tryParse('_N~')).toBe(null)
 	expect(tryParse('%5FN', 5, {deURI: true})).toBe(null)
diff --git a/lib/jsurl2.js b/lib/jsurl2.js
index d24c99e..5b72a32 100644
--- a/lib/jsurl2.js
+++ b/lib/jsurl2.js
@@ -256,12 +256,42 @@
 		return str
 	}
 
+	function clean(s) {
+		var out = []
+		var i = 0
+		var j = 0
+		var c
+		while (i < s.length) {
+			c = s.charCodeAt(i)
+			if (c === 37) {
+				// %
+				if (i > j) out.push(s.slice(j, i))
+				i++
+				while (c === 37) {
+					c = parseInt(s.slice(i, i + 2), 16)
+					i += 2
+				}
+				if (c > 32) {
+					// not a control character or space
+					out.push(String.fromCharCode(c))
+				}
+				j = i
+			} else if (c <= 32) {
+				if (i > j) out.push(s.slice(j, i))
+				i++
+				j = i
+			} else {
+				i++
+			}
+		}
+		if (i > j) out.push(s.slice(j, i))
+		return out.join('')
+	}
+
 	var JSONRE = /^({|\[|"|true$|false$|null$)/
 	exports.parse = function(s, options) {
 		if (options && options.deURI) {
-			while (s.indexOf('%') !== -1) {
-				s = decodeURIComponent(s)
-			}
+			s = clean(s)
 		}
 		if (JSONRE.test(s)) return JSON.parse(s)
 		var l = s.length

From b6174cadfa2b246ec16db7b92459baf9fd56b91a Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Sun, 19 Aug 2018 06:02:28 +0200
Subject: [PATCH 30/37] Readme: only discuss v2

---
 README.md | 160 ++++++++++++++++++++++++------------------------------
 1 file changed, 72 insertions(+), 88 deletions(-)

diff --git a/README.md b/README.md
index 33f41fb..5fd50e0 100644
--- a/README.md
+++ b/README.md
@@ -1,84 +1,28 @@
-## JSURL
+# JSURL
 
-JSURL exists in two flavors: v1 and v2
+JSURL aims to be a drop-in replacement for JSON encoding with better size and time characteristics.
 
-### JSURL v2
-
-JSURL v2 aims to be a drop-in replacement for JSON encoding with better size and time characteristics.
-
-JSURL v2 has been designed to be
+JSURL has been designed to be
 
 - Fast: our test case actually outperforms native JSON
-- Compact: shorter output than JSON and v1
-- Readable: more readable than v1 in many cases as well as leaving accented characters unchanged (so they are readable in URLs and embeds)
+- Compact: shorter output than JSON
+- Readable: it leaves accented characters unchanged and doesn't add much characters for encoding
 - URI-ready: It does not encode everything that should be URI-encoded, but it does encode all delimiters of query strings.
   - You can embed it as part of a query string, and normally you won't need to do any URI encoding yourself (browser/http client will take care of that).
   - It will be correctly detected as part of the URI by most auto-URL-from-text implementations.
-- embed-ready:
-  - embeddable in \<script> tags inside single-quoted JS strings
+- Embeddable:
+  - You can safely put it in `<script>` tags inside single-quoted Javascript strings (unlike JSON)
+  - Added whitespace can simply be removed, it is not used
+- Extensible:
   - `rich` mode encodes/decodes `Date` objects
-- Easy to generate and parse
-- Easy upgrade: it can parse JSON as well, and it will never generate valid JSON unless when it's the correct representation
-
-The most important difference with v1 is that it might need extra URI-encoding depending on your needs. You can also pass `{deURI: true}` as an option to `parse()` so it will handle any URI encoding automatically.
+  - Future: The encoding dictionary can be extended, providing more space optimization
+  - Future: You can provide your own stringify/parse for custom objects
+- Easy upgrade: it can parse JSON as well, and it will never generate valid JSON except when it's the correct representation
 
-Given its speed and size, it is also suited to pass JS values to scripts in HTML, like initial data after Server-Side-Rendering. To do so, embed the result inside a single-quoted string (not double-quoted) and parse that in your script.
+Given its speed and size, it is well-suited to pass JS values to scripts in HTML, like initial data after Server-Side-Rendering. To do so, embed the result inside a single-quoted string (not double-quoted) and parse that in your script.
 
 Some room has been left in the encoding space for special values. If you enable `rich` on the stringifier, it will encode JS Date objects so that they decode as JS Date objects, and later it might support custom encode/decode of your own object types.
 
-#### v2 syntax
-
-You don't need to know this to use it, but this might be interesting:
-
-v2 uses the allowable characters in URI schemes for multiple purposes depending on the location in the result. Some examples:
-
-- `!` starts an array if it is the first character in a value, but inside a string it is unchanged.
-- `~` and `)` are used as end-of-value and end-of-object delimiters, and are illegal inside encoded values.
-- `*` starts a string, but can be left out if the first string character is a-z. Inside a string, it escapes special characters.
-- whitespace is never legal, so you can strip it before parsing if it can be introduced accidentally
-
-v2 has a `short` mode, which omits the unnecessary ending delimiters. You can use this to save a few more bytes, but you won't be able to spot an encoded value on sight by the ending `~`.
-
-Since browsers may choose to encode any character with URI escaping, and special characters are shown in URLs, no attempt is made to make v2 URI-neutral. Decoding will work no matter how many encodings happened, if you pass the `deURI: true` option to the parser.
-
-### JSURL v1
-
-JSURL v1 is an alternative to JSON + URL encoding (or JSON + base64 encoding).
-It makes it handy to pass complex values via URL query parameters.
-
-JSURL v1 has been designed to be:
-
-- Compact: its output is much more compact than JSON + URL encoding (except in pathological cases).
-  It is even often slightly more compact than regular JSON!
-- Readable: its output is much more readable than JSON + URL encoding.
-- Foolproof: its output only contains characters that are unaffected by URL encoding/decoding (but see note)
-  There is no risk of missing a URL encoding/decoding pass, or of messing up a JSURL string by applying
-  an extra URL encoding or decoding pass.
-- Easy to generate and parse
-
-Notes:
-
-- a JSURLv1 encoded value will get its `'` characters URI-encoded by most browsers, due to security concerns that surfaced after v1 was created. v2 does not use `'` for structural encoding.
-- a JSURLv1 encoded value at the end of a URL placed in plaintext might not be detected as fully part of the URL by auto-URL-detectors (as used by email clients etc). v2 fixes this by always ending in `~`.
-
-#### v1 Syntax
-
-Think of it as JSON with the following changes:
-
-- Curly braces (`{` and `}`) replaced by parentheses (`(` and `)`)
-- Square brackets (`[` and `]`) replaced by `(~` and `)`
-- Property names unquoted (but escaped -- see below).
-- String values prefixed by a single quote (`'`) and escaped
-- All other JSON punctuation (colon `:` and comma `,`) replaced by tildes (`~`)
-- An extra tilde (`~`) at the very beginning.
-
-Property names and string values are escaped as follows:
-
-- Letters, digits, underscore (`_`), hyphen (`-`) and dot (`.`) are preserved.
-- Dollar sign (`$`) is replaced by exclamation mark (`!`)
-- Other characters with UNICODE value <= `0xff` are encoded as `*XX`
-- Characters with UNICODE value > `0xff` are encoded as `**XXXX`
-
 ## Examples
 
 JSON:
@@ -87,45 +31,60 @@ JSON:
 {"name": "John Doé", "age": 42, "user": true, "children": ["Mary", "Bill"]}
 ```
 
-JSON + URL encoding:
+JSON + URI encoding:
 
-```jsonuri
+```text
 %7B%22name%22%3A%22John%20Do%C3%22%2C%22age%22%3A42%2C%22user%22%3Atrue%2C%22children%22%3A%5B%22Mary%22%2C%22Bill%22%5D%7D
 ```
 
-JSURL v1:
+JSURL:
 
 ```jsurl
-~(name~'John*20Do*e9~age~42~user~true~children~(~'Mary~'Bill))
+(name~John_Doé~age~42~user~~children~!Mary~Bill)~
 ```
 
-JSURL v2:
+JSURL + URI encoding:
 
-```jsurl2
-(name~John_Doé~age~42~user~~children~!Mary~Bill)~
+```text
+(name~John_Do%C3%A9~age~42~user~~children~!Mary~Bill)~
+```
+
+## Installing
+
+The easiest way to install `jsurl` is with NPM:
+
+```sh
+npm install jsurl
 ```
 
-## v2 API
+## API
 
 ```javascript
 var JSURL = require("jsurl");
 
 // Options:
-// * `rich`: encode Date so it decodes as Date
+// * `rich`: encode Date, `undefined`, `Infinity`
 // * `short`: remove optional trailing delimiters
 str = JSURL.stringify(obj[, options]);
 
 // Options:
-// * `deURI`: handle any URI encoding that may still be present
+// * `deURI`: remove URI encoding and whitespace
 obj = JSURL.parse(str[, options]);
 
-// return def instead of throwing on error; options are like parse
-obj = JSURL.tryParse(str[, def][, options]);
+// return `default` instead of throwing on error; options are passed to `parse()`
+obj = JSURL.tryParse(str[, default][, options]);
 ```
 
-## v1 API
+### Upgrading from version 1
+
+- Version 2 might need extra URI-encoding depending on your needs
+  - You can call `parse(text, {deURI: true})` to handle any URI decoding automatically. This is slower, so only do this if needed.
+- Version 1 encoded text is parsed by v2
+- Version 1 clients will _not_ be able to parse version 2 encoded text, be careful when deploying new encoded text
+
+### Version 1
 
-The old API is still available if you need to decode v1 stringifieds.
+The old v1 API is still available if you need to decode v1 stringifieds.
 
 ```javascript
 var JSURL1 = require("jsurl/v1");
@@ -137,13 +96,38 @@ obj = JSURL1.parse(str);
 obj = JSURL1.tryParse(str[, def]);
 ```
 
-# Installation
+## Syntax
 
-The easiest way to install `jsurl` is with NPM:
+JSURL uses the allowable characters in URI schemes for multiple purposes depending on the location in the result. Some examples:
 
-```sh
-npm install jsurl
-```
+- `!` starts an array if it is the first character in a value, but inside a string it is unchanged.
+- `~` and `)` are used as end-of-value and end-of-object delimiters, and are illegal inside encoded values.
+- `*` starts a string, but can be left out if the first string character is a-z. Inside a string, it escapes special characters.
+- whitespace is never legal, so you can strip it before parsing if it can be introduced accidentally
+
+JSURL has a `short` mode, which omits the unnecessary ending delimiters. You can use this to save a few more bytes, but you won't be able to spot an encoded value on sight by the ending `~`.
+
+Since browsers may choose to encode any character with URI escaping, and special characters are shown in URLs, no attempt is made to make v2 URI-neutral. Decoding will work no matter how many encodings happened, if you pass the `deURI: true` option to the parser.
+
+## Roadmap
+
+- JSON compatible: `rich: false` should generate exact same result object as JSON
+- Indenting
+  - `stringify` adds whitespace (post-process, too slow in parser code)
+- Encoding dictionary
+  - Pass to `parse` and `stringify`
+  - Allow embedding dictionary in encoded output
+    - Only embed used keys
+    - Auto mode that encodes object keys with length > 4
+- Custom encoding
+  - Dictionary of encoders that get called on Objects
+  - First one to return a value other than `undefined` wins
+  - Decoders get called on their encoded values
+- `new JSURL`-based API to prepare custom encoding and dictionary
+- Interactive demo webpage
+  - Examples that you can edit with JSON/JSURL side-by-side
+  - For each example, compare with JSON: length, length when URI encoded, stringify speed, parse speed
+  - Benchmark: generates random objects to encode, average space and time savings
 
 ## License
 

From 7c741b038a4e669f1b616f3274c7ef36afc06b44 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Sun, 19 Aug 2018 06:57:33 +0200
Subject: [PATCH 31/37] `rich:false` generates same objects as JSON

Only exception: When `JSON.stringify()` returns `undefined`, JSURL returns `"_U"`
---
 README.md           | 10 +++++++---
 __tests__/jsurl2.js | 24 +++++++++++++++++++-----
 lib/jsurl2.js       | 26 +++++++++++++-------------
 3 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index 5fd50e0..1c7f3d5 100644
--- a/README.md
+++ b/README.md
@@ -14,10 +14,15 @@ JSURL has been designed to be
   - You can safely put it in `<script>` tags inside single-quoted Javascript strings (unlike JSON)
   - Added whitespace can simply be removed, it is not used
 - Extensible:
-  - `rich` mode encodes/decodes `Date` objects
+  - `rich` mode encodes/decodes `Date` objects and `undefined`
   - Future: The encoding dictionary can be extended, providing more space optimization
   - Future: You can provide your own stringify/parse for custom objects
-- Easy upgrade: it can parse JSON as well, and it will never generate valid JSON except when it's the correct representation
+- Easy upgrade:
+  - Simply replace `JSON.parse` with `JSURL.parse` and `JSON.stringify` with `JSURL.stringify`
+  - Parses JSON as well
+  - A stringify/parse cycle generates the same output as with JSON
+  - (one exception: it always returns a string, even when JSON would return `undefined`)
+  - It will never generate valid JSON except when it's the correct representation
 
 Given its speed and size, it is well-suited to pass JS values to scripts in HTML, like initial data after Server-Side-Rendering. To do so, embed the result inside a single-quoted string (not double-quoted) and parse that in your script.
 
@@ -111,7 +116,6 @@ Since browsers may choose to encode any character with URI escaping, and special
 
 ## Roadmap
 
-- JSON compatible: `rich: false` should generate exact same result object as JSON
 - Indenting
   - `stringify` adds whitespace (post-process, too slow in parser code)
 - Encoding dictionary
diff --git a/__tests__/jsurl2.js b/__tests__/jsurl2.js
index 4d4af8b..5d071a6 100644
--- a/__tests__/jsurl2.js
+++ b/__tests__/jsurl2.js
@@ -14,7 +14,7 @@ const cmp = (v, s, short, rich) => {
 	// regular
 	const richStr = stringify(v, {rich})
 	expect(richStr).not.toMatch(/[%?#&=\n\r\0'<\\]/)
-	expect(richStr).toBe(s)
+	expect([v, richStr]).toEqual([v, s])
 	// roundtrip
 	expect(stringify(parse(s), {rich})).toBe(s)
 	// short
@@ -27,11 +27,10 @@ const cmp = (v, s, short, rich) => {
 	// Can parse the JSON version and is equivalent
 	const jsv = JSON.stringify(v)
 	if (jsv) {
-		if (!rich)
-			expect(JSON.stringify(parse(jsv))).toEqual(JSON.stringify(parse(short)))
+		expect(parse(jsv)).toEqual(parse(short))
 	} else {
 		expect(jsv).toBe(undefined)
-		expect(s).toBe('_U~')
+		expect([v, s]).toEqual([v, '_U~'])
 	}
 }
 cmp.title = (title, v, s) => `${title} ${s}`
@@ -89,6 +88,20 @@ test('basics', () => {
 	// arrays
 	cmp([], '!~', '!')
 	cmp([true], '!_T~', '!_T')
+	cmp(
+		[
+			undefined,
+			function() {
+				foo()
+			},
+			null,
+			false,
+			0,
+			'hello world\u203c',
+		],
+		'!_N~_N~_N~_F~0~hello_world\u203c~',
+		'!_N~_N~_N~_F~0~hello_world\u203c'
+	)
 	cmp(
 		[
 			undefined,
@@ -101,7 +114,8 @@ test('basics', () => {
 			'hello world\u203c',
 		],
 		'!_U~_U~_N~_F~0~hello_world\u203c~',
-		'!_U~_U~_N~_F~0~hello_world\u203c'
+		'!_U~_U~_N~_F~0~hello_world\u203c',
+		true
 	)
 
 	// objects
diff --git a/lib/jsurl2.js b/lib/jsurl2.js
index 5b72a32..cd83aa5 100644
--- a/lib/jsurl2.js
+++ b/lib/jsurl2.js
@@ -167,7 +167,7 @@
 		return out
 	}
 
-	function encode(v, out, rich) {
+	function encode(v, out, rich, depth) {
 		var t,
 			T = typeof v
 
@@ -188,7 +188,7 @@
 			} else if (rich && v instanceof Date) {
 				out.push('_D' + v.toJSON().replace('T00:00:00.000Z', ''))
 			} else if (typeof v.toJSON === 'function') {
-				encode(v.toJSON(), out, rich)
+				encode(v.toJSON(), out, rich, depth)
 			} else if (Array.isArray(v)) {
 				out.push('!')
 				for (var i = 0; i < v.length; i++) {
@@ -197,7 +197,7 @@
 					if (t === true) {
 						out.push(TRUE)
 					} else {
-						encode(t, out, rich)
+						encode(t, out, rich, depth + 1)
 					}
 				}
 				out.push('')
@@ -208,7 +208,7 @@
 						t = v[key]
 						if (t !== undefined && typeof t !== 'function') {
 							out.push(escape(key))
-							encode(t, out, rich)
+							encode(t, out, rich, depth + 1)
 						}
 					}
 				}
@@ -218,8 +218,8 @@
 				out.push(')')
 			}
 		} else {
-			// function, undefined
-			out.push(UNDEF)
+			// function or undefined
+			out.push(rich || depth === 0 ? UNDEF : NULL)
 		}
 	}
 
@@ -232,9 +232,9 @@
 			sep = false,
 			short = options && options.short,
 			rich = options && options.rich
-		encode(v, out, rich)
-		len = out.length - 1
+		encode(v, out, rich, 0)
 		// until where we have to stringify
+		len = out.length - 1
 		while (((t = out[len]), t === '' || (short && t === ')'))) {
 			len--
 		}
@@ -248,8 +248,10 @@
 			sep = !(t === '!' || t === '(' || t === ')')
 		}
 		if (short) {
-			t = antiJSON[str]
-			if (t) str = t
+			if (str.length < 6) {
+				t = antiJSON[str]
+				if (t) str = t
+			}
 		} else {
 			str += '~'
 		}
@@ -290,9 +292,7 @@
 
 	var JSONRE = /^({|\[|"|true$|false$|null$)/
 	exports.parse = function(s, options) {
-		if (options && options.deURI) {
-			s = clean(s)
-		}
+		if (options && options.deURI) s = clean(s)
 		if (JSONRE.test(s)) return JSON.parse(s)
 		var l = s.length
 		// if (s.charAt(l - 1) !== '~') {

From c3418dc6eddc1408e68fcbc2d1e616e0f14f8dfd Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Sun, 19 Aug 2018 07:02:42 +0200
Subject: [PATCH 32/37] test: oops

---
 __tests__/jsurl2.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/__tests__/jsurl2.js b/__tests__/jsurl2.js
index 5d071a6..35c5cbf 100644
--- a/__tests__/jsurl2.js
+++ b/__tests__/jsurl2.js
@@ -27,7 +27,7 @@ const cmp = (v, s, short, rich) => {
 	// Can parse the JSON version and is equivalent
 	const jsv = JSON.stringify(v)
 	if (jsv) {
-		expect(parse(jsv)).toEqual(parse(short))
+		if (!rich) expect(parse(jsv)).toEqual(parse(short))
 	} else {
 		expect(jsv).toBe(undefined)
 		expect([v, s]).toEqual([v, '_U~'])

From b35881fd46ecca4b175d08ba5733fb4548fffacd Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Sun, 19 Aug 2018 07:12:04 +0200
Subject: [PATCH 33/37] rich: NaN, +-Infinity

---
 README.md           |  2 +-
 __tests__/jsurl2.js |  3 +++
 lib/jsurl2.js       | 18 +++++++++++++++++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 1c7f3d5..fdf0ed5 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ JSURL has been designed to be
   - You can safely put it in `<script>` tags inside single-quoted Javascript strings (unlike JSON)
   - Added whitespace can simply be removed, it is not used
 - Extensible:
-  - `rich` mode encodes/decodes `Date` objects and `undefined`
+  - `rich` mode encodes/decodes `Date` objects, `undefined`, `NaN` and `Infinity`
   - Future: The encoding dictionary can be extended, providing more space optimization
   - Future: You can provide your own stringify/parse for custom objects
 - Easy upgrade:
diff --git a/__tests__/jsurl2.js b/__tests__/jsurl2.js
index 35c5cbf..19b3eb3 100644
--- a/__tests__/jsurl2.js
+++ b/__tests__/jsurl2.js
@@ -67,6 +67,9 @@ test('basics', () => {
 	cmp(NaN, '_N~', '_N')
 	cmp(Infinity, '_N~', '_N')
 	cmp(-Infinity, '_N~', '_N')
+	cmp(NaN, '_n~', '_n', true)
+	cmp(Infinity, '_I~', '_I', true)
+	cmp(-Infinity, '_J~', '_J', true)
 	cmp(
 		new Date(1456898746898),
 		'*2016-03-02T06:05:46.898Z~',
diff --git a/lib/jsurl2.js b/lib/jsurl2.js
index cd83aa5..d3de862 100644
--- a/lib/jsurl2.js
+++ b/lib/jsurl2.js
@@ -9,12 +9,18 @@
 	var FALSE = '_F'
 	var NULL = '_N'
 	var UNDEF = '_U'
+	var NAN = '_n'
+	var INF = '_I'
+	var NINF = '_J'
 
 	var dict = {
 		T: true,
 		F: false,
 		N: null,
 		U: undefined,
+		n: NaN,
+		I: Infinity,
+		J: -Infinity,
 	}
 
 	var fromEscape = {
@@ -172,7 +178,17 @@
 			T = typeof v
 
 		if (T === 'number') {
-			out.push(isFinite(v) ? v.toString() : NULL)
+			out.push(
+				isFinite(v)
+					? v.toString()
+					: rich
+						? isNaN(v)
+							? NAN
+							: v > 0
+								? INF
+								: NINF
+						: NULL
+			)
 		} else if (T === 'boolean') {
 			out.push(v ? '' : FALSE)
 		} else if (T === 'string') {

From 083ff8941159ff8a9f64c0196d5e01ed96b44f64 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Sun, 19 Aug 2018 07:24:28 +0200
Subject: [PATCH 34/37] clean: concat is slightly faster than join

---
 lib/jsurl2.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/jsurl2.js b/lib/jsurl2.js
index d3de862..264e3d6 100644
--- a/lib/jsurl2.js
+++ b/lib/jsurl2.js
@@ -275,7 +275,7 @@
 	}
 
 	function clean(s) {
-		var out = []
+		var out = ''
 		var i = 0
 		var j = 0
 		var c
@@ -283,7 +283,7 @@
 			c = s.charCodeAt(i)
 			if (c === 37) {
 				// %
-				if (i > j) out.push(s.slice(j, i))
+				if (i > j) out += s.slice(j, i)
 				i++
 				while (c === 37) {
 					c = parseInt(s.slice(i, i + 2), 16)
@@ -291,19 +291,19 @@
 				}
 				if (c > 32) {
 					// not a control character or space
-					out.push(String.fromCharCode(c))
+					out += String.fromCharCode(c)
 				}
 				j = i
 			} else if (c <= 32) {
-				if (i > j) out.push(s.slice(j, i))
+				if (i > j) out += s.slice(j, i)
 				i++
 				j = i
 			} else {
 				i++
 			}
 		}
-		if (i > j) out.push(s.slice(j, i))
-		return out.join('')
+		if (i > j) out += s.slice(j, i)
+		return out
 	}
 
 	var JSONRE = /^({|\[|"|true$|false$|null$)/

From edce7d8c00da461ec892b0ca121d75cfea20aa5e Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Wed, 31 Oct 2018 11:20:28 +0100
Subject: [PATCH 35/37] Make Travis work

Jest is no longer compatible with Node 4, plus that's no longer maintained anyway
---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e699201..63c844d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,4 @@
 language: node_js
 node_js:
-  - "4"
-  - "node"
+  - "lts/*"
 sudo: false

From 22e652494ee09426894d7ec685dd0a4e319ea713 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Mon, 19 Nov 2018 09:25:45 +0100
Subject: [PATCH 36/37] Escape Unicode Character 'LINE SEPARATOR' (U+2028)

Some browsers don't like it inside strings in JS
---
 __tests__/jsurl2.js | 8 ++++----
 lib/jsurl2.js       | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/__tests__/jsurl2.js b/__tests__/jsurl2.js
index 19b3eb3..da2855b 100644
--- a/__tests__/jsurl2.js
+++ b/__tests__/jsurl2.js
@@ -13,7 +13,7 @@ const isJsonOk = (v, str) => {
 const cmp = (v, s, short, rich) => {
 	// regular
 	const richStr = stringify(v, {rich})
-	expect(richStr).not.toMatch(/[%?#&=\n\r\0'<\\]/)
+	expect(richStr).not.toMatch(/[%?#&=\n\r\0'<\\\u2028]/)
 	expect([v, richStr]).toEqual([v, s])
 	// roundtrip
 	expect(stringify(parse(s), {rich})).toBe(s)
@@ -54,9 +54,9 @@ test('basics', () => {
 	cmp('', '*~', '*')
 	cmp('hello world\u203c', 'hello_world\u203c~', 'hello_world\u203c')
 	cmp(
-		' !"#$%&\'"()*+,-./09:;<=>?@AZ[\\]^_`az{|}\n\r\0~',
-		'*_!"*H*S*.*A*""*C*D***P,-./09:;*L*E*G*Q@AZ[*B]^*_`az{|}*N*R*Z*-~',
-		'*_!"*H*S*.*A*""*C*D***P,-./09:;*L*E*G*Q@AZ[*B]^*_`az{|}*N*R*Z*-'
+		' !"#$%&\'"()*+,-./09:;<=>?@AZ[\\]^_`az{|}\n\r\0\u2028~',
+		'*_!"*H*S*.*A*""*C*D***P,-./09:;*L*E*G*Q@AZ[*B]^*_`az{|}*N*R*Z*U*-~',
+		'*_!"*H*S*.*A*""*C*D***P,-./09:;*L*E*G*Q@AZ[*B]^*_`az{|}*N*R*Z*U*-'
 	)
 	cmp(
 		'Ľồťś ǒƒ ửňìćọđé ẁћəệ!',
diff --git a/lib/jsurl2.js b/lib/jsurl2.js
index 264e3d6..c5a3d8e 100644
--- a/lib/jsurl2.js
+++ b/lib/jsurl2.js
@@ -42,6 +42,7 @@
 		B: '\\',
 		N: '\n',
 		R: '\r',
+		U: '\u2028',
 		Z: '\0',
 	}
 	var toEscape = {
@@ -64,6 +65,7 @@
 		'\n': 'N',
 		'\r': 'R',
 		'\0': 'Z',
+		'\u2028': 'U',
 	}
 	function origChar(s) {
 		if (s === '_') {
@@ -87,7 +89,7 @@
 		return escapeRE.test(s) ? s.replace(escapeRE, origChar) : s
 	}
 	// First half: encoding chars; second half: URI and script chars
-	var replaceRE = /([*_~$+'() <>%?#&=\\\n\r\0])/g
+	var replaceRE = /([*_~$+'() <>%?#&=\\\n\r\0\u2028])/g
 	function escape(s) {
 		// oddly enough, testing first is faster
 		return replaceRE.test(s) ? s.replace(replaceRE, escCode) : s

From 6d5714bb0728acc1297bb618e2ef6aabd7d41b82 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Mon, 19 Nov 2018 09:45:17 +0100
Subject: [PATCH 37/37] tests: add Big List of Naughty Strings

* change cmp so it accepts objects for round-trip encode and checking assertions
---
 __tests__/jsurl2.js | 12 ++++++++++--
 package.json        |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/__tests__/jsurl2.js b/__tests__/jsurl2.js
index da2855b..7b7ff88 100644
--- a/__tests__/jsurl2.js
+++ b/__tests__/jsurl2.js
@@ -1,3 +1,4 @@
+const blns = require('blns')
 const {stringify, parse, tryParse} = require('..')
 
 // It only produces JSON parseable values if they are the same
@@ -14,12 +15,14 @@ const cmp = (v, s, short, rich) => {
 	// regular
 	const richStr = stringify(v, {rich})
 	expect(richStr).not.toMatch(/[%?#&=\n\r\0'<\\\u2028]/)
-	expect([v, richStr]).toEqual([v, s])
+	if (s) expect([v, richStr]).toEqual([v, s])
+	else s = richStr
 	// roundtrip
 	expect(stringify(parse(s), {rich})).toBe(s)
 	// short
 	const shortStr = stringify(v, {short: true, rich})
-	expect(shortStr).toBe(short)
+	if (short) expect(shortStr).toBe(short)
+	else short = shortStr
 	expect(stringify(parse(short), {short: true, rich})).toBe(short)
 	// not JSON
 	expect(isJsonOk(v, richStr)).toBe(true)
@@ -249,3 +252,8 @@ test('never JSON bareword', () => {
 	expect(stringify('null')).toEqual('null~')
 	expect(stringify('null', {short: true})).toEqual('*null')
 })
+
+test('naughty strings', () => {
+	expect.hasAssertions()
+	blns.forEach(naughty => cmp(naughty))
+})
diff --git a/package.json b/package.json
index e43ca94..21d4459 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
 	"main": "lib/jsurl2.js",
 	"dependencies": {},
 	"devDependencies": {
+		"blns": "^2.0.4",
 		"jest": "^23.4.0",
 		"jest-cli": "^23.4.0"
 	},