theluyuan/vue3-yuanma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(shared): fix toDisplayString on object with null prototype (#4335)

Browse Source 
fix #4334
This commit is contained in:
edison 2021-08-17 03:28:34 +08:00 committed by GitHub
parent 6db15a27cf
commit 42a334e12e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/shared/__tests__/toDisplayString.spec.ts
View File

@ -19,6 +19,9 @@ describe('toDisplayString', () => {
expect(toDisplayString(obj)).toBe(JSON.stringify(obj, null, 2)) expect(toDisplayString(obj)).toBe(JSON.stringify(obj, null, 2))
const arr = [obj] const arr = [obj]
expect(toDisplayString(arr)).toBe(JSON.stringify(arr, null, 2)) expect(toDisplayString(arr)).toBe(JSON.stringify(arr, null, 2))
const foo = Object.create(null)
foo.bar = 1
expect(toDisplayString(foo)).toBe(JSON.stringify(foo, null, 2))
}) })
test('refs', () => { test('refs', () => {

5
packages/shared/src/toDisplayString.ts
View File

@ -2,6 +2,7 @@ import {
isArray, isArray,
isMap, isMap,
isObject, isObject,
isFunction,
isPlainObject, isPlainObject,
isSet, isSet,
objectToString objectToString
@ -14,7 +15,9 @@ import {
export const toDisplayString = (val: unknown): string => { export const toDisplayString = (val: unknown): string => {
return val == null return val == null
? '' ? ''
: isArray(val) || (isObject(val) && val.toString === objectToString) : isArray(val) ||
(isObject(val) &&
(val.toString === objectToString || !isFunction(val.toString)))
? JSON.stringify(val, replacer, 2) ? JSON.stringify(val, replacer, 2)
: String(val) : String(val)
} }