dzeio/libs
1
0
Fork 0
mirror of https://github.com/dzeiocom/libs.git synced 2025-04-23 19:32:14 +00:00
Code

Fixed Object.freeze throwing error with objectOmit (#46)

Browse Source 
Signed-off-by: Avior <github@avior.me>
This commit is contained in:
Florian Bouillon 2021-09-29 17:15:52 +02:00 committed by GitHub
parent 3524264b68
commit 9f608a52fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/object-util/__tests__/index.test.ts
View File

@ -158,6 +158,18 @@ describe('Object Clone Tests', () => {
;(clone[2][0] as string) = 'zero' ;(clone[2][0] as string) = 'zero'
expect(clone).not.toEqual(obj) expect(clone).not.toEqual(obj)
}) })
it('should clone with Object.freeze', () => {
const obj = Object.freeze({
pouet: 'first',
toto: 'second'
})
const clone = objectClone<Record<string, string>>(obj)
expect(clone).toEqual(obj)
clone.pouet = 'third'
expect(clone).not.toEqual(obj)
})
}) })
describe('Object Set Tests', () => { describe('Object Set Tests', () => {
@ -237,7 +249,8 @@ describe('Object Clean Tests', () => {
const obj = {a: '', b: null, c: undefined} const obj = {a: '', b: null, c: undefined}
objectClean(obj) objectClean(obj)
expect(obj).toEqual({a: '', b: null}) expect(obj).toEqual({a: '', b: null})
})
it('should not clean when options.cleanUndefined is false', () => {
const obj2 = {a: '', b: null, c: undefined} const obj2 = {a: '', b: null, c: undefined}
objectClean(obj2, {cleanUndefined: false}) objectClean(obj2, {cleanUndefined: false})
expect(obj2).toEqual({a: '', b: null, c: undefined}) expect(obj2).toEqual({a: '', b: null, c: undefined})
@ -268,6 +281,10 @@ describe('Object Omit Tests', () => {
const obj = {a: 'a', b: 'c', c: 'b'} const obj = {a: 'a', b: 'c', c: 'b'}
expect(objectOmit(obj, 'b', 'd')).toEqual({a: 'a', c: 'b'}) expect(objectOmit(obj, 'b', 'd')).toEqual({a: 'a', c: 'b'})
}) })
it('should work with Object.freeze', () => {
const obj = {a: 'a', b: 'c', c: 'b'}
expect(objectOmit(Object.freeze(obj), 'b', 'd')).toEqual({a: 'a', c: 'b'})
})
}) })
describe('Is Object Tests', () => { describe('Is Object Tests', () => {

6
packages/object-util/src/ObjectUtil.ts
View File

@ -109,7 +109,7 @@ export function cloneObject<T = Record<string, any>>(obj: T): T {
* @param obj the object to clone * @param obj the object to clone
* @returns the clone of the object * @returns the clone of the object
*/ */
export function objectClone<T = Record<string, any>>(obj: T): T { export function objectClone<T = Record<string, any>>(obj: T, options?: {deep?: boolean}): T {
mustBeObject(obj) mustBeObject(obj)
if (Array.isArray(obj)) { if (Array.isArray(obj)) {
const arr: Array<any> = [] const arr: Array<any> = []
@ -124,7 +124,7 @@ export function objectClone<T = Record<string, any>>(obj: T): T {
} }
const clone: Partial<T> = {} const clone: Partial<T> = {}
objectLoop(obj, (value, key) => { objectLoop(obj, (value, key) => {
if (typeof value === 'object' && value != null) { if (typeof value === 'object' && value != null && (typeof options?.deep === 'undefined' || options.deep)) {
clone[key as Extract<keyof T, string>] = objectClone(value) clone[key as Extract<keyof T, string>] = objectClone(value)
return return
} }
@ -228,7 +228,7 @@ export function objectClean(obj: Record<string, any>, options?: {cleanUndefined?
* @returns the cloned object * @returns the cloned object
*/ */
export function objectOmit<T extends Record<string, any> = Record<string, any>>(obj: T, ...keys: Array<string>): T { export function objectOmit<T extends Record<string, any> = Record<string, any>>(obj: T, ...keys: Array<string>): T {
const cloned = obj const cloned = objectClone(obj, {deep: false})
for (const key of keys) { for (const key of keys) {
if (key in cloned) { if (key in cloned) {
delete cloned[key] delete cloned[key]