diff --git a/src/validate/js/index.js b/src/validate/js/index.js index 60e34e111b..257c913301 100644 --- a/src/validate/js/index.js +++ b/src/validate/js/index.js @@ -17,42 +17,44 @@ export default function validateJs ( validator, js ) { if ( node.type === 'ExportDefaultDeclaration' ) { if ( validator.defaultExport ) { - validator.error( `Duplicate default export`, node.start ); + return validator.error( `Duplicate default export`, node.start ); } - validator.defaultExport = node; - } - }); + if ( node.declaration.type !== 'ObjectExpression' ) { + return validator.error( `Default export must be an object literal`, node.declaration.start ); + } + + checkForComputedKeys( validator, node.declaration.properties ); + checkForDupes( validator, node.declaration.properties ); - // ensure all exported props are valid - if ( validator.defaultExport ) { - checkForComputedKeys( validator, validator.defaultExport.declaration.properties ); - checkForDupes( validator, validator.defaultExport.declaration.properties ); - - validator.defaultExport.declaration.properties.forEach( prop => { - validator.templateProperties[ prop.key.name ] = prop; - }); - - validator.defaultExport.declaration.properties.forEach( prop => { - const propValidator = propValidators[ prop.key.name ]; - - if ( propValidator ) { - propValidator( validator, prop ); - } else { - const matches = fuzzySet.get( prop.key.name ); - if ( matches && matches[0] && matches[0][0] > 0.7 ) { - validator.error( `Unexpected property '${prop.key.name}' (did you mean '${matches[0][1]}'?)`, prop.start ); - } else if ( /FunctionExpression/.test( prop.value.type ) ) { - validator.error( `Unexpected property '${prop.key.name}' (did you mean to include it in 'methods'?)`, prop.start ); + node.declaration.properties.forEach( prop => { + validator.templateProperties[ prop.key.name ] = prop; + }); + + // ensure all exported props are valid + node.declaration.properties.forEach( prop => { + const propValidator = propValidators[ prop.key.name ]; + + if ( propValidator ) { + propValidator( validator, prop ); } else { - validator.error( `Unexpected property '${prop.key.name}'`, prop.start ); + const matches = fuzzySet.get( prop.key.name ); + if ( matches && matches[0] && matches[0][0] > 0.7 ) { + validator.error( `Unexpected property '${prop.key.name}' (did you mean '${matches[0][1]}'?)`, prop.start ); + } else if ( /FunctionExpression/.test( prop.value.type ) ) { + validator.error( `Unexpected property '${prop.key.name}' (did you mean to include it in 'methods'?)`, prop.start ); + } else { + validator.error( `Unexpected property '${prop.key.name}'`, prop.start ); + } } + }); + + if ( validator.templateProperties.namespace ) { + const ns = validator.templateProperties.namespace.value.value; + validator.namespace = namespaces[ ns ] || ns; } - }); - if ( validator.templateProperties.namespace ) { - const ns = validator.templateProperties.namespace.value.value; - validator.namespace = namespaces[ ns ] || ns; + validator.defaultExport = node; } - } + }); } diff --git a/test/validator/export-default-must-be-object/errors.json b/test/validator/export-default-must-be-object/errors.json new file mode 100644 index 0000000000..e8106bdc12 --- /dev/null +++ b/test/validator/export-default-must-be-object/errors.json @@ -0,0 +1,8 @@ +[{ + "message": "Default export must be an object literal", + "pos": 25, + "loc": { + "line": 2, + "column": 16 + } +}] diff --git a/test/validator/export-default-must-be-object/input.html b/test/validator/export-default-must-be-object/input.html new file mode 100644 index 0000000000..0451644c7b --- /dev/null +++ b/test/validator/export-default-must-be-object/input.html @@ -0,0 +1,3 @@ +