Merge remote-tracking branch 'origin/master' into on-any

src/compiler/compile/compiler_errors.ts

@@ -286,36 +286,8 @@ export default {
 		code: 'invalid-component-style-directive',
 		message: 'Style directives cannot be used on components'
 	},
-  invalid_style_directive_modifier: (valid: string) => ({
+	invalid_style_directive_modifier: (valid: string) => ({
 		code: 'invalid-style-directive-modifier',
 		message: `Valid modifiers for style directives are: ${valid}`
-	}),
-	invalid_component_svelte_directive: (name) => ({
-		code: 'invalid-component-svelte-directive',
-		message: `svelte:${name} directives cannot be used on components`
-	}),
-	duplicate_directive: (directive) => ({
-		code: 'duplicate-directive',
-		message: `An element can only have one '${directive}' directive`
-	}),
-	invalid_directive: (directive) => ({
-		code: 'invalid-directive',
-		message: `'${directive}' is not a valid directive`
-	}),
-	invalid_modifier: {
-		code: 'invalid-modifier',
-		message: 'No modifier allowed on this directive'
-	},
-	directive_conflict: (directive1, directive2) => ({
-		code: 'directive-conflict',
-		message: `Cannot use ${directive1} and ${directive2} on the same element`
-  	}),
-	invalid_forward_event_alias_count: {
-		code: 'invalid-forward-event-alias-count',
-		message: 'Forward-event accept only one modifier (the event alias)'
-	},
-	invalid_forward_event_alias_any: {
-		code: 'invalid-forward-event-alias-any',
-		message: 'The alias for on:* must be one of the following form: "prefix*" or "*suffix"'
-	},
+	})
 };

src/compiler/compile/nodes/Element.ts

@@ -24,7 +24,6 @@ import compiler_warnings from '../compiler_warnings';
 import compiler_errors from '../compiler_errors';
 import { ARIARoleDefintionKey, roles, aria, ARIAPropertyDefinition, ARIAProperty } from 'aria-query';
 import { is_interactive_element, is_non_interactive_roles, is_presentation_role, is_interactive_roles, is_hidden_from_screen_reader, is_semantic_role_element } from '../utils/a11y';
-import SvelteDirective from './SvelteDirective';
 
 const aria_attributes = 'activedescendant atomic autocomplete busy checked colcount colindex colspan controls current describedby description details disabled dropeffect errormessage expanded flowto grabbed haspopup hidden invalid keyshortcuts label labelledby level live modal multiline multiselectable orientation owns placeholder posinset pressed readonly relevant required roledescription rowcount rowindex rowspan selected setsize sort valuemax valuemin valuenow valuetext'.split(' ');
 const aria_attribute_set = new Set(aria_attributes);
@@ -266,7 +265,6 @@ export default class Element extends Node {
 	intro?: Transition = null;
 	outro?: Transition = null;
 	animation?: Animation = null;
-	display? : SvelteDirective = null;
 	children: INode[];
 	namespace: string;
 	needs_manual_style_scoping: boolean;
@@ -407,22 +405,6 @@ export default class Element extends Node {
 					this.animation = new Animation(component, this, scope, node);
 					break;
 
-				case 'SvelteDirective':
-					switch (node.name) {
-					case 'display':
-						if (this.display) {
-							component.error(node,
-								compiler_errors.duplicate_directive('svelte:' + node.name));
-						} else {
-							this.display = new SvelteDirective(component, this, scope, node);
-						}
-						break;
-					default:
-						component.error(node,
-							compiler_errors.invalid_directive('svelte:' + node.name));
-					}
-					break;
-
 				default:
 					throw new Error(`Not implemented: ${node.type}`);
 			}
@@ -453,7 +435,7 @@ export default class Element extends Node {
 			this.validate_bindings();
 			this.validate_content();
 		}
-		this.validate_display_directive();
+
 	}
 
 	validate_attributes() {
@@ -1042,16 +1024,6 @@ export default class Element extends Node {
 		this.handlers.forEach(h => h.validate());
 	}
 
-	validate_display_directive() {
-		if (!this.display) {
-			return;
-		}
-		if (this.styles.find(d => d.name === 'display')) {
-			this.component.error(this.display,
-				compiler_errors.directive_conflict('svelte:display', 'style:display'));
-		}
-	}
-
 	is_media_node() {
 		return this.name === 'audio' || this.name === 'video';
 	}

src/compiler/compile/nodes/InlineComponent.ts

@@ -78,9 +78,6 @@ export default class InlineComponent extends Node {
 				case 'StyleDirective':
 					return component.error(node, compiler_errors.invalid_component_style_directive);
 
-				case 'SvelteDirective':
-					return component.error(node, compiler_errors.invalid_component_svelte_directive(node.name));
-
 				default:
 					throw new Error(`Not implemented: ${node.type}`);
 			}

src/compiler/compile/nodes/SvelteDirective.ts

@@ -1,22 +0,0 @@
-import Node from './shared/Node';
-import Expression from './shared/Expression';
-import Component from '../Component';
-import TemplateScope from './shared/TemplateScope';
-import { TemplateNode } from '../../interfaces';
-import Element from './Element';
-import compiler_errors from '../compiler_errors';
-
-export default class SvelteDirective extends Node {
-	type: 'SvelteDirective';
-	expression: Expression;
-
-	constructor(component: Component, parent: Element, scope: TemplateScope, info: TemplateNode) {
-		super(component, parent, scope, info);
-
-		this.expression = new Expression(component, this, scope, info.expression);
-
-		if (info.modifiers && info.modifiers.length) {
-			component.error(info, compiler_errors.invalid_modifier);
-		}
-	}
-}

src/compiler/compile/nodes/interfaces.ts

@@ -33,7 +33,6 @@ import ThenBlock from './ThenBlock';
 import Title from './Title';
 import Transition from './Transition';
 import Window from './Window';
-import SvelteDisplayDirective from './SvelteDirective';
 
 // note: to write less types each of types in union below should have type defined as literal
 // https://www.typescriptlang.org/docs/handbook/unions-and-intersections.html#discriminating-unions
@@ -65,7 +64,6 @@ export type INode = Action
 | Slot
 | SlotTemplate
 | StyleDirective
-| SvelteDisplayDirective
 | Tag
 | Text
 | ThenBlock

src/compiler/compile/render_dom/wrappers/Element/index.ts

@@ -191,15 +191,6 @@ export default class ElementWrapper extends Wrapper {
 
 		this.class_dependencies = [];
 
-		this.var = {
-			type: 'Identifier',
-			name: node.name.replace(regex_invalid_variable_identifier_characters, '_')
-		};
-
-		this.void = is_void(node.name);
-
-		this.class_dependencies = [];
-
 		if (node.is_dynamic_element && block.type !== CHILD_DYNAMIC_ELEMENT_BLOCK) {
 			this.child_dynamic_element_block = block.child({
 				comment: create_debugging_comment(node, renderer.component),
@@ -312,12 +303,11 @@ export default class ElementWrapper extends Wrapper {
 		const is_tag_dynamic = this.node.tag_expr.dynamic_dependencies().length > 0;
 		const tag = this.node.tag_expr.manipulate(block);
 
-		if (this.renderer.options.dev) {
-			block.chunks.init.push(b`
-				@validate_dynamic_element(${tag});
-				@validate_void_dynamic_element(${tag});
-			`);
-		}
+		block.chunks.init.push(b`
+			${this.renderer.options.dev && b`@validate_dynamic_element(${tag});`}
+			${this.renderer.options.dev && this.node.children.length > 0 && b`@validate_void_dynamic_element(${tag});`}
+			let ${this.var} = ${tag} && ${this.child_dynamic_element_block.name}(#ctx);
+		`);
 
 		block.chunks.create.push(b`
 			if (${this.var}) ${this.var}.c();
@@ -547,7 +537,6 @@ export default class ElementWrapper extends Wrapper {
 		this.add_animation(block);
 		this.add_classes(block);
 		this.add_styles(block);
-		this.add_display(block);
 		this.add_manual_style_scoping(block);
 
 		if (nodes && this.renderer.options.hydratable && !this.void) {
@@ -1216,43 +1205,6 @@ export default class ElementWrapper extends Wrapper {
 		});
 	}
 
-	add_display(block: Block) {
-		const display = this.node.display;
-		if (display === null) {
-			return;
-		}
-
-		const snippet = display.expression.manipulate(block);
-		const dependencies = display.expression.dynamic_dependencies();
-		const has_dependancies = dependencies.length > 0;
-
-		const update_display = b`@set_display(${this.var}, ${snippet})`;
-		block.chunks.hydrate.push(update_display);
-
-		if (has_dependancies) {
-			const update_current = (this.node.intro || this.node.outro)
-				? x`#current = false`
-				: null;
-
-			const dirty = block.renderer.dirty(Array.from(dependencies));
-			block.chunks.update.push(b`
-				if (${dirty}) {
-					if (${snippet}) {
-						${update_current}
-						${update_display}
-						@transition_in(this, 1);
-					} else {
-						@group_outros();
-						@transition_out(this, 1, 0, () => {
-							${update_display}
-						});
-						@check_outros();
-					}
-				}
-			`);
-		}
-	}
-
 	add_manual_style_scoping(block: Block) {
 		if (this.node.needs_manual_style_scoping) {
 			const updater = b`@toggle_class(${this.var}, "${this.node.component.stylesheet.id}", true);`;

src/compiler/compile/render_ssr/handlers/Element.ts

@@ -51,11 +51,6 @@ export default function (node: Element, renderer: Renderer, options: RenderOptio
 		return p`"${name}": ${expression}`;
 	});
 
-	if (node.display) {
-		const snippet = node.display.expression.node;
-		style_expression_list.push(p`"display": (${snippet} ? "none !important" : null)`);
-	}
-
 	const style_expression =
 		style_expression_list.length > 0 &&
 		x`{ ${style_expression_list} }`;

src/compiler/interfaces.ts

@@ -48,8 +48,7 @@ export type DirectiveType = 'Action'
 | 'EventHandler'
 | 'Let'
 | 'Ref'
-| 'Transition'
-| 'SvelteDirective';
+| 'Transition';
 
 interface BaseDirective extends BaseNode {
 	type: DirectiveType;

src/compiler/parse/state/tag.ts

@@ -294,15 +294,6 @@ function read_tag_name(parser: Parser) {
 	return name;
 }
 
-function use_name_as_expression(type:string, name:string):boolean {
-	if (type === 'Binding' || type === 'Class') {
-		return true;
-	} else if (type === 'SvelteDirective') {
-		return name === 'display';
-	}
-	return false;
-}
-
 // eslint-disable-next-line no-useless-escape
 const regex_token_ending_character = /[\s=\/>"']/;
 const regex_starts_with_quote_characters = /^["']/;
@@ -440,7 +431,7 @@ function read_attribute(parser: Parser, unique_names: Set<string>) {
 		}
 
 		// Directive name is expression, e.g. <p class:isRed />
-		if (!directive.expression && use_name_as_expression(type, directive_name)) {
+		if (!directive.expression && (type === 'Binding' || type === 'Class')) {
 			directive.expression = {
 				start: directive.start + colon_index + 1,
 				end: directive.end,
@@ -473,7 +464,6 @@ function get_directive_type(name: string): DirectiveType {
 	if (name === 'let') return 'Let';
 	if (name === 'ref') return 'Ref';
 	if (name === 'in' || name === 'out' || name === 'transition') return 'Transition';
-	if (name === 'svelte') return 'SvelteDirective';
 }
 
 function read_attribute_value(parser: Parser) {

src/runtime/internal/dom.ts

@@ -638,10 +638,6 @@ export function set_style(node, key, value, important) {
 	}
 }
 
-export function set_display(node, value) {
-	set_style(node, 'display', value ? null : 'none', 1);
-}
-
 export function select_option(select, value) {
 	for (let i = 0; i < select.options.length; i += 1) {
 		const option = select.options[i];