From 84dac8dfab3a10fa7068786e31c46c6b71d93dcc Mon Sep 17 00:00:00 2001
From: Sam Boylett <sam.boylett@netsells.co.uk>
Date: Mon, 11 Feb 2019 11:14:21 +0000
Subject: [PATCH 1/2] Remove use of Object.assign

---
 src/index.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index 50945fa..3e0be7c 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -115,15 +115,15 @@ export default function devalue(value: any) {
 				return `new ${type}([${Array.from(thing).map(stringify).join(',')}])`;
 
 			default:
-				const obj = `{${Object.keys(thing).map(key => `${safeKey(key)}:${stringify(thing[key])}`).join(',')}}`;
-				const proto = Object.getPrototypeOf(thing);
-				if (proto === null) {
-					return Object.keys(thing).length > 0
-						? `Object.assign(Object.create(null),${obj})`
-						: `Object.create(null)`;
+				if (Object.getPrototypeOf(thing) === null) {
+					if (Object.keys(thing).length === 0) {
+						return 'Object.create(null)';
+					}
+
+					return `Object.create(null,{${Object.keys(thing).map(key => `${safeKey(key)}:{writable:true,value:${stringify(thing[key])}}`).join(',')}})`;
 				}
 
-				return obj;
+				return `{${Object.keys(thing).map(key => `${safeKey(key)}:${stringify(thing[key])}`).join(',')}}`;
 		}
 	}
 

From 6a3cad4c5fb07d152c2f964d37e8f1abcd50b29d Mon Sep 17 00:00:00 2001
From: Sam Boylett <sam.boylett@netsells.co.uk>
Date: Mon, 11 Feb 2019 11:21:21 +0000
Subject: [PATCH 2/2] Add test for object with no prototype but with values
 using Object.create

---
 test/test.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/test.ts b/test/test.ts
index f0efc95..5bb47d5 100644
--- a/test/test.ts
+++ b/test/test.ts
@@ -93,6 +93,8 @@ describe('devalue', () => {
 	describe('misc', () => {
 		test('Object without prototype', Object.create(null), 'Object.create(null)');
 
+		test('Object without prototype with values', Object.assign(Object.create(null), { foo: 1 }), 'Object.create(null,{foo:{writable:true,value:1}})');
+
 		// let arr = [];
 		// arr.x = 42;
 		// test('Array with named properties', arr, `TODO`);