fix: handle Object assign within class constructors (#31)

* Fixed class Object assign. Removed unnecessary hasOwnProperty. * Undo auto-formatting. * Undo organize-imports. * Check if a property exists in the original object * Update test/suites/class.js Co-authored-by: Luke Edwards <[email protected]>
lukeed · Oct 27, 2021 · 7650274 · 7650274
1 parent 28565c3
commit 7650274
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/src/index.js b/src/index.js
@@ -7,7 +7,7 @@ export function klona(x) {
 		if (x.constructor !== Object && typeof x.constructor === 'function') {
 			tmp = new x.constructor();
 			for (k in x) {
-				if (tmp.hasOwnProperty(k) && tmp[k] !== x[k]) {
+				if (x.hasOwnProperty(k) && tmp[k] !== x[k]) {
 					tmp[k] = klona(x[k]);
 				}
 			}

diff --git a/src/lite.js b/src/lite.js
@@ -7,7 +7,7 @@ export function klona(x) {
 		if (x.constructor !== Object && typeof x.constructor === 'function') {
 			tmp = new x.constructor();
 			for (k in x) {
-				if (tmp.hasOwnProperty(k) && tmp[k] !== x[k]) {
+				if (x.hasOwnProperty(k) && tmp[k] !== x[k]) {
 					tmp[k] = klona(x[k]);
 				}
 			}

diff --git a/test/suites/class.js b/test/suites/class.js
@@ -203,5 +203,19 @@ export default function (klona) {
 		);
 	});
 
+	Classes('constructor properties :: Object.assign', () => {
+		class Foobar {
+			constructor(data) {
+				Object.assign(this, data);
+			}
+		}
+		const input = new Foobar({ test: 123 });
+		const output = klona(input);
+
+		assert.deepEqual(input, output);
+		assert.equal(input.constructor, output.constructor);
+		assert.equal(output.constructor.name, 'Foobar');
+	});
+
 	Classes.run();
 }