fixes

Author: Rich-Harris

src/parse.js

@@ -45,8 +45,14 @@ export function parse(serialized) {
 					case 'Set':
 						const set = new Set();
 						values[i] = set;
-						for (let j = 1; j < value.length; j += 1) {
-							set.add(get_value(value[j]));
+						for (const n of value[1]) set.add(get_value(n));
+						break;
+
+					case 'Map':
+						const map = new Map();
+						values[i] = map;
+						for (let i = 0; i < value[1].length; i += 2) {
+							map.set(get_value(value[i]), get_value(value[i + 1]));
 						}
 						break;
 
@@ -90,6 +96,5 @@ export function parse(serialized) {
 		}
 	}
 
-	console.log(values);
 	return values[0];
 }

src/stringify.js

@@ -132,21 +132,25 @@ export function stringify(value) {
 						);
 					}
 
-					/** @type {string[]} */
-					const flattened_object = [];
-
-					for (const key in thing) {
-						keys.push(`.${key}`);
-						flattened_object.push(
-							`${stringify_string(key)}:${flatten(thing[key])}`
-						);
-						keys.pop();
-					}
-
-					stringified[index] = `{${flattened_object.join(',')}}`;
-
 					if (Object.getPrototypeOf(thing) === null) {
-						stringified[index] = `["null",${stringified[index]}]`;
+						let str = '["null"';
+						for (const key in thing) {
+							keys.push(`.${key}`);
+							str += `,${stringify_string(key)},${flatten(thing[key])}`;
+							keys.pop();
+						}
+						stringified[index] = str + ']';
+					} else {
+						let str = '{';
+						let started = false;
+						for (const key in thing) {
+							if (started) str += ',';
+							started = true;
+							keys.push(`.${key}`);
+							str += `${stringify_string(key)}:${flatten(thing[key])}`;
+							keys.pop();
+						}
+						stringified[index] = str + '}';
 					}
 			}
 		}

test/test.js

@@ -1,3 +1,4 @@
+import * as util from 'util';
 import * as vm from 'vm';
 import * as assert from 'uvu/assert';
 import * as uvu from 'uvu';
@@ -256,7 +257,7 @@ const fixtures = {
 				name: 'Object with null prototype (cyclical)',
 				value: obj,
 				js: '(function(a){a.self=a;return a}(Object.create(null)))',
-				json: '[["null",{"self":0}]]'
+				json: '[["null","self",0]]'
 			};
 		})(Object.create(null)),
 
@@ -307,7 +308,7 @@ const fixtures = {
 			name: 'Object without prototype',
 			value: Object.create(null),
 			js: 'Object.create(null)',
-			json: '[["null",{}]]'
+			json: '[["null"]]'
 		},
 		{
 			name: 'cross-realm POJO',