Merge pull request #565 from sveltejs/coverage

[WIP] increase test coverage

Author: Rich-Harris

mocha.coverage.opts

@@ -1,5 +1,5 @@
 --require babel-register
 --require reify
- --recursive
+--recursive
 ./**/__test__.js
 test/*/index.js

package.json

@@ -80,10 +80,12 @@
   },
   "nyc": {
     "include": [
-      "src/**/*.js"
+      "src/**/*.js",
+      "shared.js"
     ],
     "exclude": [
-      "src/**/__test__.js"
+      "src/**/__test__.js",
+      "src/shared/**"
     ]
   },
   "babel": {

src/generators/dom/index.js

@@ -183,7 +183,8 @@ export default function dom ( parsed, source, options ) {
 		};
 
 		${name}.prototype.teardown = ${name}.prototype.destroy = function destroy ( detach ) {
-			this.fire( 'destroy' );${templateProperties.ondestroy ? `\n${generator.alias( 'template' )}.ondestroy.call( this );` : ``}
+			this.fire( 'destroy' );
+			${templateProperties.ondestroy && `${generator.alias( 'template' )}.ondestroy.call( this );`}
 
 			this._fragment.destroy( detach !== false );
 			this._fragment = null;

src/generators/dom/visitors/Element/meta/Window.js

@@ -60,11 +60,6 @@ export default function visitWindow ( generator, block, node ) {
 		}
 
 		if ( attribute.type === 'Binding' ) {
-			if ( attribute.value.type !== 'Identifier' ) {
-				const { parts, keypath } = flattenReference( attribute.value );
-				throw new Error( `Bindings on <:Window/> must be to top-level properties, e.g. '${parts.pop()}' rather than '${keypath}'` );
-			}
-
 			// in dev mode, throw if read-only values are written to
 			if ( readonly.has( attribute.name ) ) {
 				generator.readonly.add( attribute.value.name );

src/generators/dom/visitors/IfBlock.js

@@ -215,6 +215,7 @@ function compoundWithOutros ( generator, block, state, node, branches, dynamic,
 	const if_current_block_index = hasElse ? '' : `if ( ~${current_block_index} ) `;
 
 	block.addVariable( current_block_index );
+	block.addVariable( name );
 
 	block.builders.create.addBlock( deindent`
 		var ${if_block_creators} = [
@@ -233,12 +234,12 @@ function compoundWithOutros ( generator, block, state, node, branches, dynamic,
 	if ( hasElse ) {
 		block.builders.create.addBlock( deindent`
 			${current_block_index} = ${get_block}( ${params} );
-			${if_blocks}[ ${current_block_index} ] = ${if_block_creators}[ ${current_block_index} ]( ${params}, ${block.component} );
+			${name} = ${if_blocks}[ ${current_block_index} ] = ${if_block_creators}[ ${current_block_index} ]( ${params}, ${block.component} );
 		` );
 	} else {
 		block.builders.create.addBlock( deindent`
 			if ( ~( ${current_block_index} = ${get_block}( ${params} ) ) ) {
-				${if_blocks}[ ${current_block_index} ] = ${if_block_creators}[ ${current_block_index} ]( ${params}, ${block.component} );
+				${name} = ${if_blocks}[ ${current_block_index} ] = ${if_block_creators}[ ${current_block_index} ]( ${params}, ${block.component} );
 			}
 		` );
 	}
@@ -253,37 +254,35 @@ function compoundWithOutros ( generator, block, state, node, branches, dynamic,
 
 	const parentNode = state.parentNode || `${anchor}.parentNode`;
 
-	const changeBlock = deindent`
-		var ${name} = ${if_blocks}[ ${previous_block_index} ];
-		if ( ${name} ) {
-			${name}.outro( function () {
-				${if_blocks}[ ${previous_block_index} ].destroy( true );
-				${if_blocks}[ ${previous_block_index} ] = null;
-			});
-		}
+	const destroyOldBlock = deindent`
+		${name}.outro( function () {
+			${if_blocks}[ ${previous_block_index} ].destroy( true );
+			${if_blocks}[ ${previous_block_index} ] = null;
+		});
 	`;
 
-	if ( hasElse ) {
-		block.builders.create.addBlock( deindent`
-			${name} = ${if_blocks}[ ${current_block_index} ];
-			if ( !${name} ) {
-				${name} = ${if_blocks}[ ${current_block_index} ] = ${if_block_creators}[ ${current_block_index} ]( ${params}, ${block.component} );
+	const createNewBlock = deindent`
+		${name} = ${if_blocks}[ ${current_block_index} ] = ${if_block_creators}[ ${current_block_index} ]( ${params}, ${block.component} );
+		${name}.${mountOrIntro}( ${parentNode}, ${anchor} );
+	`;
+
+	const changeBlock = hasElse ?
+		deindent`
+			${destroyOldBlock}
+
+			${createNewBlock}
+		` :
+		deindent`
+			if ( ${name} ) {
+				${destroyOldBlock}
 			}
 
-			${name}.${mountOrIntro}( ${parentNode}, ${anchor} );
-		` );
-	} else {
-		block.builders.create.addBlock( deindent`
 			if ( ~${current_block_index} ) {
-				${name} = ${if_blocks}[ ${current_block_index} ];
-				if ( !${name} ) {
-					${name} = ${if_blocks}[ ${current_block_index} ] = ${if_block_creators}[ ${current_block_index} ]( ${params}, ${block.component} );
-				}
-
-				${name}.${mountOrIntro}( ${parentNode}, ${anchor} );
+				${createNewBlock}
+			} else {
+				${name} = null;
 			}
-		` );
-	}
+		`;
 
 	if ( dynamic ) {
 		block.builders.update.addBlock( deindent`

src/index.js

@@ -56,19 +56,16 @@ export function create ( source, _options = {} ) {
 		return;
 	}
 
-	let result;
 	try {
-		result = (new Function( 'return ' + compiled.code ))();
+		return (new Function( 'return ' + compiled.code ))();
 	} catch ( err ) {
 		if ( _options.onerror ) {
 			_options.onerror( err );
+			return;
 		} else {
 			throw err;
 		}
-		return;
 	}
-
-	return result;
 }
 
 export { parse, validate, version as VERSION };