merge master -> readonly-dev-warning

src/generators/dom/index.js

@@ -103,11 +103,10 @@ export default function dom ( parsed, source, options ) {
 
 			generator.readonly.add( key );
 
-			builder.addBlock( deindent`
-				if ( isInitial || ${deps.map( dep => `( '${dep}' in newState && ${differs}( state.${dep}, oldState.${dep} ) )` ).join( ' || ' )} ) {
-					state.${key} = newState.${key} = ${generator.alias( 'template' )}.computed.${key}( ${deps.map( dep => `state.${dep}` ).join( ', ' )} );
-				}
-			` );
+			const condition = `isInitial || ${deps.map( dep => `( '${dep}' in newState && ${differs}( state.${dep}, oldState.${dep} ) )` ).join( ' || ' )}`;
+			const statement = `state.${key} = newState.${key} = ${generator.alias( 'template' )}.computed.${key}( ${deps.map( dep => `state.${dep}` ).join( ', ' )} );`;
+
+			builder.addConditionalLine( condition, statement );
 		});
 
 		builders.main.addBlock( deindent`

src/generators/dom/visitors/Text.js

@@ -1,6 +1,21 @@
+// Whitespace inside one of these elements will not result in
+// a whitespace node being created in any circumstances. (This
+// list is almost certainly very incomplete)
+const elementsWithoutText = new Set([
+	'audio',
+	'datalist',
+	'dl',
+	'ol',
+	'optgroup',
+	'select',
+	'ul',
+	'video'
+]);
+
 export default function visitText ( generator, block, state, node ) {
-	if ( state.namespace && !/\S/.test( node.data ) ) {
-		return;
+	if ( !/\S/.test( node.data ) ) {
+		if ( state.namespace ) return;
+		if ( elementsWithoutText.has( state.parentNodeName) ) return;
 	}
 
 	const name = block.getUniqueName( `text` );

src/utils/CodeBuilder.js

@@ -7,9 +7,31 @@ export default class CodeBuilder {
 
 		this.first = null;
 		this.last = null;
+
+		this.lastCondition = null;
+	}
+
+	addConditionalLine ( condition, line ) {
+		if ( condition === this.lastCondition ) {
+			this.result += `\n\t${line}`;
+		} else {
+			if ( this.lastCondition ) {
+				this.result += `\n}`;
+			}
+
+			this.result += `if ( ${condition} ) {\n\t${line}`;
+			this.lastCondition = condition;
+		}
+
+		this.last = BLOCK;
 	}
 
 	addLine ( line ) {
+		if ( this.lastCondition ) {
+			this.result += `\n}`;
+			this.lastCondition = null;
+		}
+
 		if ( this.last === BLOCK ) {
 			this.result += `\n\n${line}`;
 		} else if ( this.last === LINE ) {
@@ -36,6 +58,11 @@ export default class CodeBuilder {
 	}
 
 	addBlock ( block ) {
+		if ( this.lastCondition ) {
+			this.result += `\n}`;
+			this.lastCondition = null;
+		}
+
 		if ( this.result ) {
 			this.result += `\n\n${block}`;
 		} else {
@@ -62,6 +89,6 @@ export default class CodeBuilder {
 	}
 
 	toString () {
-		return this.result.trim();
+		return this.result.trim() + ( this.lastCondition ? `\n}` : `` );
 	}
 }

src/validate/js/propValidators/methods.js

@@ -1,3 +1,4 @@
+import checkForAccessors from '../utils/checkForAccessors.js';
 import checkForDupes from '../utils/checkForDupes.js';
 import checkForComputedKeys from '../utils/checkForComputedKeys.js';
 import usesThisOrArguments from '../utils/usesThisOrArguments.js';
@@ -10,6 +11,7 @@ export default function methods ( validator, prop ) {
 		return;
 	}
 
+	checkForAccessors( validator, prop.value.properties, 'Methods' );
 	checkForDupes( validator, prop.value.properties );
 	checkForComputedKeys( validator, prop.value.properties );
 

src/validate/js/utils/checkForAccessors.js

@@ -0,0 +1,7 @@
+export default function checkForAccessors ( validator, properties, label ) {
+	properties.forEach( prop => {
+		if ( prop.kind !== 'init' ) {
+			validator.error( `${label} cannot use getters and setters`, prop.start );
+		}
+	});
+}

test/js/samples/computed-collapsed-if/expected.js

@@ -0,0 +1,74 @@
+import { assign, differs, dispatchObservers, noop, proto } from "svelte/shared.js";
+
+function recompute ( state, newState, oldState, isInitial ) {
+	if ( isInitial || ( 'x' in newState && differs( state.x, oldState.x ) ) ) {
+		state.a = newState.a = template.computed.a( state.x );
+		state.b = newState.b = template.computed.b( state.x );
+	}
+}
+
+var template = (function () {
+	return {
+		computed: {
+			a: x => x * 2,
+			b: x => x * 3
+		}
+	};
+}());
+
+function create_main_fragment ( root, component ) {
+	
+
+	return {
+		mount: noop,
+		
+		update: noop,
+		
+		destroy: noop
+	};
+}
+
+function SvelteComponent ( options ) {
+	options = options || {};
+	this._state = options.data || {};
+	recompute( this._state, this._state, {}, true );
+	
+	this._observers = {
+		pre: Object.create( null ),
+		post: Object.create( null )
+	};
+	
+	this._handlers = Object.create( null );
+	
+	this._root = options._root;
+	this._yield = options._yield;
+	
+	this._torndown = false;
+	
+	this._fragment = create_main_fragment( this._state, this );
+	if ( options.target ) this._fragment.mount( options.target, null );
+}
+
+assign( SvelteComponent.prototype, proto );
+
+SvelteComponent.prototype._set = function _set ( newState ) {
+	var oldState = this._state;
+	this._state = assign( {}, oldState, newState );
+	recompute( this._state, newState, oldState, false )
+	
+	dispatchObservers( this, this._observers.pre, newState, oldState );
+	if ( this._fragment ) this._fragment.update( newState, this._state );
+	dispatchObservers( this, this._observers.post, newState, oldState );
+};
+
+SvelteComponent.prototype.teardown = SvelteComponent.prototype.destroy = function destroy ( detach ) {
+	this.fire( 'destroy' );
+
+	this._fragment.destroy( detach !== false );
+	this._fragment = null;
+
+	this._state = {};
+	this._torndown = true;
+};
+
+export default SvelteComponent;

test/js/samples/computed-collapsed-if/input.html

@@ -0,0 +1,8 @@
+<script>
+	export default {
+		computed: {
+			a: x => x * 2,
+			b: x => x * 3
+		}
+	};
+</script>

test/runtime/samples/select-no-whitespace/_config.js

@@ -0,0 +1,6 @@
+export default {
+	test ( assert, component, target ) {
+		const select = target.querySelector( 'select' );
+		assert.equal( select.childNodes.length, 3 );
+	}
+};

test/runtime/samples/select-no-whitespace/main.html

@@ -0,0 +1,5 @@
+<select>
+	<option>a</option>
+	<option>b</option>
+	<option>c</option>
+</select>

test/validator/index.js

@@ -1,12 +1,13 @@
 import * as fs from 'fs';
 import assert from 'assert';
-import { svelte, exists, tryToLoadJson } from '../helpers.js';
+import { svelte, tryToLoadJson } from '../helpers.js';
 
 describe( 'validate', () => {
 	fs.readdirSync( 'test/validator/samples' ).forEach( dir => {
 		if ( dir[0] === '.' ) return;
 
-		const solo = exists( `test/validator/samples/${dir}/solo` );
+		// add .solo to a sample directory name to only run that test
+		const solo = /\.solo/.test( dir );
 
 		if ( solo && process.env.CI ) {
 			throw new Error( 'Forgot to remove `solo: true` from test' );

test/validator/samples/properties-methods-getters-setters/errors.json

@@ -0,0 +1,8 @@
+[{
+	"message": "Methods cannot use getters and setters",
+	"loc": {
+		"line": 4,
+		"column": 3
+	},
+	"pos": 43
+}]

test/validator/samples/properties-methods-getters-setters/input.html

@@ -0,0 +1,9 @@
+<script>
+	export default {
+		methods: {
+			get foo () {
+
+			}
+		}
+	};
+</script>