Skip to content

Commit

Permalink
fix: ignore prototype methods when using setData on objects
Browse files Browse the repository at this point in the history
  • Loading branch information
Haberkamp committed Nov 30, 2023
1 parent 4bc3baa commit 6673209
Show file tree
Hide file tree
Showing 2 changed files with 130 additions and 1 deletion.
26 changes: 25 additions & 1 deletion src/utils.ts
Expand Up @@ -72,6 +72,25 @@ export function mergeGlobalProperties(
export const isObject = (obj: unknown): obj is Record<string, any> =>
!!obj && typeof obj === 'object'

function isClass(obj: unknown) {
if (!(obj instanceof Object)) return

const isCtorClass =
obj.constructor && obj.constructor.toString().substring(0, 5) === 'class'

if (!('prototype' in obj)) {
return isCtorClass
}

const prototype = obj.prototype as any
const isPrototypeCtorClass =
prototype.constructor &&
prototype.constructor.toString &&
prototype.constructor.toString().substring(0, 5) === 'class'

return isCtorClass || isPrototypeCtorClass
}

// https://stackoverflow.com/a/48218209
export const mergeDeep = (
target: Record<string, unknown>,
Expand All @@ -80,8 +99,13 @@ export const mergeDeep = (
if (!isObject(target) || !isObject(source)) {
return source
}

Object.keys(source)
.concat(Object.getOwnPropertyNames(Object.getPrototypeOf(source) ?? {}))
.concat(
isClass(source)
? Object.getOwnPropertyNames(Object.getPrototypeOf(source) ?? {})
: Object.getOwnPropertyNames(source)
)
.forEach((key) => {
const targetValue = target[key]
const sourceValue = source[key]
Expand Down
105 changes: 105 additions & 0 deletions tests/utils.spec.ts
@@ -0,0 +1,105 @@
/**
* @vitest-environment node
*/

import { describe, expect, it } from 'vitest'
import { mergeDeep } from '../src/utils'

describe('utils', () => {
it('should be possible to replace a primitive value with another', () => {
// ARRANGE
const state = {
foo: 'bar'
}

// ACT
const result = mergeDeep(state, {
foo: true
})

// ASSERT
expect(result).toStrictEqual({
foo: true
})
})

it('should be possible to merge a nested object', () => {
// ARRANGE
const state = {
foo: {
bar: 'baz'
}
}

// ACT
const result = mergeDeep(state, {
foo: {
bar: 'bar',
foo: 'foo'
}
})

// ASSERT
expect(result).toStrictEqual({
foo: {
bar: 'bar',
foo: 'foo'
}
})
})

it('should be possible to replace an array', () => {
// ARRANGE
const state = {
foo: []
}

// ACT
const result = mergeDeep(state, {
foo: ['bar', 'baz']
})

// ASSERT
expect(result).toStrictEqual({
foo: ['bar', 'baz']
})
})

it('should be possible to add additional key', () => {
// ARRANGE
const state = {
foo: 'bar'
}

// ACT
const result = mergeDeep(state, {
baz: 'foo'
})

// ASSERT
expect(result).toStrictEqual({
foo: 'bar',
baz: 'foo'
})
})

it('should result in the same value as before merging', () => {
// ARRANGE
const state = {
foo: [],
bar: []
}

// ACT
const result = mergeDeep(state, {
foo: [],
bar: []
})

// ASSERT
expect(result).toStrictEqual({
foo: [],
bar: []
})
})
})

0 comments on commit 6673209

Please sign in to comment.