various fixes

src/compile/Component.ts

@@ -764,6 +764,8 @@ export default class Component {
 		if (this.hoistable_names.has(name)) return name;
 		if (this.imported_declarations.has(name)) return name;
 		if (this.declarations.indexOf(name) === -1) return name;
+
+		this.template_references.add(name); // TODO we can probably remove most other occurrences of this
 		return `ctx.${name}`;
 	}
 

src/compile/nodes/EventHandler.ts

@@ -8,15 +8,7 @@ export default class EventHandler extends Node {
 	modifiers: Set<string>;
 	expression: Expression;
 	handler_name: string;
-
-	usesComponent: boolean;
 	usesContext: boolean;
-	usesEventObject: boolean;
-	isCustomEvent: boolean;
-
-	insertionPoint: number;
-	args: Expression[];
-	snippet: string;
 
 	constructor(component: Component, parent, template_scope, info) {
 		super(component, parent, template_scope, info);
@@ -42,8 +34,9 @@ export default class EventHandler extends Node {
 	}
 
 	render() {
-		return this.expression
+		if (this.expression) return this.expression.render();
-			? this.expression.render()
+
-			: `ctx.${this.handler_name}`;
+		this.component.template_references.add(this.handler_name);
+		return `ctx.${this.handler_name}`;
 	}
 }

src/compile/nodes/shared/Expression.ts

@@ -219,7 +219,7 @@ export default class Expression {
 							dependencies.add(name);
 							component.template_references.add(name);
 						}
-					} else if (!is_synthetic && !component.hoistable_names.has(name)) {
+					} else if (!is_synthetic && !component.hoistable_names.has(name) && !component.imported_declarations.has(name)) {
 						code.prependRight(node.start, key === 'key' && parent.shorthand
 							? `${name}: ctx.`
 							: 'ctx.');

src/compile/render-dom/wrappers/Element/index.ts

@@ -621,9 +621,10 @@ export default class ElementWrapper extends Wrapper {
 		block: Block
 	) {
 		const { intro, outro } = this.node;
-
 		if (!intro && !outro) return;
 
+		const { component } = this.renderer;
+
 		if (intro === outro) {
 			const name = block.getUniqueName(`${this.var}_transition`);
 			const snippet = intro.expression
@@ -632,7 +633,7 @@ export default class ElementWrapper extends Wrapper {
 
 			block.addVariable(name);
 
-			const fn = `ctx.${intro.name}`;
+			const fn = component.qualify(intro.name);
 
 			block.builders.intro.addConditional(`@intro.enabled`, deindent`
 				if (${name}) ${name}.invalidate();
@@ -662,7 +663,7 @@ export default class ElementWrapper extends Wrapper {
 					? intro.expression.render()
 					: '{}';
 
-				const fn = `ctx.${intro.name}`; // TODO add built-in transitions?
+				const fn = component.qualify(intro.name); // TODO add built-in transitions?
 
 				if (outro) {
 					block.builders.intro.addBlock(deindent`
@@ -685,7 +686,7 @@ export default class ElementWrapper extends Wrapper {
 					? outro.expression.render()
 					: '{}';
 
-				const fn = `ctx.${outro.name}`;
+				const fn = component.qualify(outro.name);
 
 				block.builders.intro.addBlock(deindent`
 					if (${outroName}) ${outroName}.abort(1);

src/compile/render-dom/wrappers/InlineComponent/index.ts

@@ -202,6 +202,7 @@ export default class InlineComponentWrapper extends Wrapper {
 
 			const name = component.getUniqueName(`${this.var}_${binding.name}_binding`);
 			component.declarations.push(name);
+			component.template_references.add(name);
 
 			const updating = block.getUniqueName(`updating_${binding.name}`);
 			block.addVariable(updating);
@@ -293,7 +294,7 @@ export default class InlineComponentWrapper extends Wrapper {
 
 				function ${switch_props}(ctx) {
 					${(this.node.attributes.length || this.node.bindings.length) && deindent`
-					${props && `const ${props} = ${attributeObject};`}`}
+					${props && `let ${props} = ${attributeObject};`}`}
 					${statements}
 					return ${stringifyProps(component_opts)};
 				}
@@ -385,7 +386,7 @@ export default class InlineComponentWrapper extends Wrapper {
 
 			block.builders.init.addBlock(deindent`
 				${(this.node.attributes.length || this.node.bindings.length) && deindent`
-				${props && `const ${props} = ${attributeObject};`}`}
+				${props && `let ${props} = ${attributeObject};`}`}
 				${statements}
 				var ${name} = new ${expression}(${stringifyProps(component_opts)});
 

src/compile/render-dom/wrappers/shared/addActions.ts

@@ -30,6 +30,8 @@ export default function addActions(
 			? action.name
 			: `ctx.${action.name}`;
 
+		component.template_references.add(action.name);
+
 		block.builders.mount.addLine(
 			`${name} = ${fn}.call(null, ${target}${snippet ? `, ${snippet}` : ''}) || {};`
 		);

src/internal/utils.js

@@ -34,7 +34,7 @@ export function exclude(src, prop) {
 }
 
 export function run(fn) {
-	fn();
+	return fn();
 }
 
 export function blankObject() {