diff --git a/src/core/util/props.js b/src/core/util/props.js index 1b57f77c..26a76664 100644 --- a/src/core/util/props.js +++ b/src/core/util/props.js @@ -205,18 +205,19 @@ function getInvalidTypeMessage (name, value, expectedTypes) { ` Expected ${expectedTypes.map(capitalize).join(', ')}` const expectedType = expectedTypes[0] const receivedType = toRawType(value) - const expectedValue = styleValue(value, expectedType) - const receivedValue = styleValue(value, receivedType) // check if we need to specify expected value - if (expectedTypes.length === 1 && - isExplicable(expectedType) && - !isBoolean(expectedType, receivedType)) { - message += ` with value ${expectedValue}` + if ( + expectedTypes.length === 1 && + isExplicable(expectedType) && + isExplicable(typeof value) && + !isBoolean(expectedType, receivedType) + ) { + message += ` with value ${styleValue(value, expectedType)}` } message += `, got ${receivedType} ` // check if we need to specify received value if (isExplicable(receivedType)) { - message += `with value ${receivedValue}.` + message += `with value ${styleValue(value, receivedType)}.` } return message } @@ -231,9 +232,9 @@ function styleValue (value, type) { } } +const EXPLICABLE_TYPES = ['string', 'number', 'boolean'] function isExplicable (value) { - const explicitTypes = ['string', 'number', 'boolean'] - return explicitTypes.some(elem => value.toLowerCase() === elem) + return EXPLICABLE_TYPES.some(elem => value.toLowerCase() === elem) } function isBoolean (...args) { diff --git a/test/unit/features/options/props.spec.js b/test/unit/features/options/props.spec.js index 5adedeb2..b2bf4827 100644 --- a/test/unit/features/options/props.spec.js +++ b/test/unit/features/options/props.spec.js @@ -241,6 +241,16 @@ describe('Options props', () => { makeInstance({}, Symbol) expect('Expected Symbol, got Object').toHaveBeenWarned() }) + + it('warns when expected an explicable type but Symbol was provided', () => { + makeInstance(Symbol('foo'), String) + expect('Expected String, got Symbol').toHaveBeenWarned() + }) + + it('warns when expected an explicable type but Symbol was provided', () => { + makeInstance(Symbol('foo'), [String, Number]) + expect('Expected String, Number, got Symbol').toHaveBeenWarned() + }) } it('custom constructor', () => {