From 1c81f85c11e0bb2472ab4796420d32a18e3a4e79 Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Mon, 26 Nov 2018 22:34:44 -0500
Subject: [PATCH] fix parser tests

---
 src/compile/nodes/Binding.ts                  |  10 +-
 src/parse/index.ts                            |  10 +
 src/parse/state/tag.ts                        |   2 +-
 test/hydration/index.js                       |   2 +-
 test/parser/index.js                          |   2 +-
 .../samples/action-with-call/input.html       |   2 +-
 .../samples/action-with-call/output.json      |  22 +--
 .../samples/action-with-identifier/input.html |   2 +-
 .../action-with-identifier/output.json        |   4 +-
 .../samples/action-with-literal/input.html    |   2 +-
 .../samples/action-with-literal/output.json   |  14 +-
 test/parser/samples/action/output.json        |   4 +-
 test/parser/samples/animation/output.json     |   4 +-
 .../attribute-containing-solidus/output.json  |   4 +-
 .../attribute-dynamic-boolean/output.json     |   4 +-
 .../attribute-dynamic-reserved/output.json    |   4 +-
 .../samples/attribute-dynamic/output.json     |   4 +-
 .../samples/attribute-escaped/output.json     |   4 +-
 .../samples/attribute-multiple/output.json    |   4 +-
 .../samples/attribute-shorthand/output.json   |   4 +-
 .../attribute-static-boolean/output.json      |   4 +-
 .../samples/attribute-static/output.json      |   4 +-
 .../samples/attribute-unquoted/output.json    |   4 +-
 .../samples/await-then-catch/output.json      |   4 +-
 .../samples/binding-shorthand/output.json     |   8 +-
 test/parser/samples/binding/output.json       |   6 +-
 test/parser/samples/comment/output.json       |   4 +-
 .../samples/component-dynamic/output.json     |   4 +-
 .../convert-entities-in-element/output.json   |   4 +-
 .../samples/convert-entities/output.json      |   4 +-
 .../samples/css-ref-selector/output.json      | 119 ++++++------
 test/parser/samples/css/output.json           | 116 +++++------
 test/parser/samples/dynamic-import/input.html |  14 +-
 .../parser/samples/dynamic-import/output.json | 180 ++++++++++--------
 .../each-block-destructured/output.json       |   4 +-
 .../samples/each-block-else/output.json       |   4 +-
 .../samples/each-block-indexed/output.json    |   4 +-
 .../samples/each-block-keyed/output.json      |   4 +-
 test/parser/samples/each-block/output.json    |   4 +-
 .../samples/element-with-mustache/output.json |   4 +-
 .../samples/element-with-text/output.json     |   4 +-
 test/parser/samples/elements/output.json      |   4 +-
 .../error-binding-mustaches/error.json        |  10 -
 .../error-binding-mustaches/input.html        |   1 -
 .../samples/error-binding-rvalue/error.json   |  10 -
 .../samples/error-binding-rvalue/input.html   |   1 -
 .../samples/error-event-handler/error.json    |  10 -
 .../samples/error-event-handler/input.html    |   1 -
 .../parser/samples/error-ref-value/error.json |  10 -
 .../parser/samples/error-ref-value/input.html |   1 -
 test/parser/samples/event-handler/input.html  |   2 +-
 test/parser/samples/event-handler/output.json |  80 ++++----
 test/parser/samples/if-block-else/output.json |   4 +-
 .../samples/if-block-elseif/output.json       |   4 +-
 test/parser/samples/if-block/output.json      |   4 +-
 .../samples/implicitly-closed-li/output.json  |   4 +-
 test/parser/samples/nbsp/output.json          |   4 +-
 test/parser/samples/raw-mustaches/output.json |   4 +-
 test/parser/samples/refs/output.json          |   7 +-
 .../samples/script-comment-only/input.html    |   6 +-
 .../samples/script-comment-only/output.json   |  26 +--
 .../input.html                                |  10 +-
 .../output.json                               | 146 ++++++--------
 .../script-comment-trailing/input.html        |  10 +-
 .../script-comment-trailing/output.json       | 146 ++++++--------
 test/parser/samples/script/input.html         |  10 +-
 test/parser/samples/script/output.json        | 146 ++++++--------
 .../samples/self-closing-element/output.json  |   4 +-
 .../parser/samples/self-reference/output.json |   4 +-
 .../space-between-mustaches/output.json       |   4 +-
 test/parser/samples/spread/output.json        |   4 +-
 .../samples/textarea-children/output.json     |   4 +-
 .../transition-intro-no-params/output.json    |   4 +-
 .../samples/transition-intro/input.html       |   2 +-
 .../samples/transition-intro/output.json      |  30 +--
 .../samples/unusual-identifier/output.json    |   4 +-
 .../whitespace-leading-trailing/output.json   |   4 +-
 .../samples/whitespace-normal/output.json     |   4 +-
 test/parser/samples/yield/output.json         |   4 +-
 79 files changed, 605 insertions(+), 739 deletions(-)
 delete mode 100644 test/parser/samples/error-binding-mustaches/error.json
 delete mode 100644 test/parser/samples/error-binding-mustaches/input.html
 delete mode 100644 test/parser/samples/error-binding-rvalue/error.json
 delete mode 100644 test/parser/samples/error-binding-rvalue/input.html
 delete mode 100644 test/parser/samples/error-event-handler/error.json
 delete mode 100644 test/parser/samples/error-event-handler/input.html
 delete mode 100644 test/parser/samples/error-ref-value/error.json
 delete mode 100644 test/parser/samples/error-ref-value/input.html

diff --git a/src/compile/nodes/Binding.ts b/src/compile/nodes/Binding.ts
index ffd729431f..a4dcab3244 100644
--- a/src/compile/nodes/Binding.ts
+++ b/src/compile/nodes/Binding.ts
@@ -1,6 +1,7 @@
 import Node from './shared/Node';
 import getObject from '../../utils/getObject';
 import Expression from './shared/Expression';
+import Component from '../Component';
 
 export default class Binding extends Node {
 	name: string;
@@ -10,9 +11,16 @@ export default class Binding extends Node {
 	obj: string;
 	prop: string;
 
-	constructor(component, parent, scope, info) {
+	constructor(component: Component, parent, scope, info) {
 		super(component, parent, scope, info);
 
+		if (info.expression.type !== 'Identifier' && info.expression.node.type !== 'MemberExpression') {
+			component.error(info, {
+				code: 'invalid-directive-value',
+				message: 'Can only bind to an identifier (e.g. `foo`) or a member expression (e.g. `foo.bar` or `foo[baz]`)'
+			});
+		}
+
 		this.name = info.name;
 		this.expression = new Expression(component, this, scope, info.expression);
 
diff --git a/src/parse/index.ts b/src/parse/index.ts
index 891fe0841d..3ae97f2ccf 100644
--- a/src/parse/index.ts
+++ b/src/parse/index.ts
@@ -220,6 +220,16 @@ export default function parse(
 	options: ParserOptions = {}
 ): Ast {
 	const parser = new Parser(template, options);
+
+	// TODO we way want to allow multiple <style> tags —
+	// one scoped, one global. for now, only allow one
+	if (parser.css.length > 1) {
+		parser.error({
+			code: 'duplicate-style',
+			message: 'You can only have one top-level <style> tag per component'
+		}, parser.css[1].start);
+	}
+
 	return {
 		html: parser.html,
 		css: parser.css,
diff --git a/src/parse/state/tag.ts b/src/parse/state/tag.ts
index 3b46c617c4..be39fb37ad 100644
--- a/src/parse/state/tag.ts
+++ b/src/parse/state/tag.ts
@@ -392,7 +392,7 @@ function readAttribute(parser: Parser, uniqueNames: Set<string>) {
 			end,
 			type,
 			name: directive_name,
-			expression: value[0] && value[0].expression
+			expression: (value[0] && value[0].expression) || null
 		};
 
 		if (type === 'Transition') {
diff --git a/test/hydration/index.js b/test/hydration/index.js
index 303e6ab8d6..73c2fd5500 100644
--- a/test/hydration/index.js
+++ b/test/hydration/index.js
@@ -17,7 +17,7 @@ function getName(filename) {
 	return base[0].toUpperCase() + base.slice(1);
 }
 
-describe.only('hydration', () => {
+describe('hydration', () => {
 	before(() => {
 		const svelte = loadSvelte();
 
diff --git a/test/parser/index.js b/test/parser/index.js
index 1cf0bc29ab..437bd152b6 100644
--- a/test/parser/index.js
+++ b/test/parser/index.js
@@ -2,7 +2,7 @@ import * as assert from 'assert';
 import * as fs from 'fs';
 import { svelte, tryToLoadJson } from '../helpers.js';
 
-describe('parse', () => {
+describe.only('parse', () => {
 	fs.readdirSync('test/parser/samples').forEach(dir => {
 		if (dir[0] === '.') return;
 
diff --git a/test/parser/samples/action-with-call/input.html b/test/parser/samples/action-with-call/input.html
index 246bf02c59..15c9173b02 100644
--- a/test/parser/samples/action-with-call/input.html
+++ b/test/parser/samples/action-with-call/input.html
@@ -1 +1 @@
-<input use:tooltip="t('tooltip msg')">
+<input use:tooltip="{t('tooltip msg')}">
diff --git a/test/parser/samples/action-with-call/output.json b/test/parser/samples/action-with-call/output.json
index a29bc5f1d0..91f961453c 100644
--- a/test/parser/samples/action-with-call/output.json
+++ b/test/parser/samples/action-with-call/output.json
@@ -1,35 +1,35 @@
 {
 	"html": {
 		"start": 0,
-		"end": 38,
+		"end": 40,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 38,
+				"end": 40,
 				"type": "Element",
 				"name": "input",
 				"attributes": [
 					{
 						"start": 7,
-						"end": 37,
+						"end": 39,
 						"type": "Action",
 						"name": "tooltip",
 						"expression": {
 							"type": "CallExpression",
-							"start": 20,
-							"end": 36,
+							"start": 21,
+							"end": 37,
 							"callee": {
 								"type": "Identifier",
-								"start": 20,
-								"end": 21,
+								"start": 21,
+								"end": 22,
 								"name": "t"
 							},
 							"arguments": [
 								{
 									"type": "Literal",
-									"start": 22,
-									"end": 35,
+									"start": 23,
+									"end": 36,
 									"value": "tooltip msg",
 									"raw": "'tooltip msg'"
 								}
@@ -41,6 +41,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/action-with-identifier/input.html b/test/parser/samples/action-with-identifier/input.html
index 14a65e83ed..ce1076d181 100644
--- a/test/parser/samples/action-with-identifier/input.html
+++ b/test/parser/samples/action-with-identifier/input.html
@@ -1 +1 @@
-<input use:tooltip="message">
+<input use:tooltip={message}>
diff --git a/test/parser/samples/action-with-identifier/output.json b/test/parser/samples/action-with-identifier/output.json
index a76071e03b..dda412882a 100644
--- a/test/parser/samples/action-with-identifier/output.json
+++ b/test/parser/samples/action-with-identifier/output.json
@@ -27,6 +27,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/action-with-literal/input.html b/test/parser/samples/action-with-literal/input.html
index 60e16eacfc..2f968eb510 100644
--- a/test/parser/samples/action-with-literal/input.html
+++ b/test/parser/samples/action-with-literal/input.html
@@ -1 +1 @@
-<input use:tooltip="'tooltip msg'">
+<input use:tooltip="{'tooltip msg'}">
diff --git a/test/parser/samples/action-with-literal/output.json b/test/parser/samples/action-with-literal/output.json
index a31d191c88..0a4d167898 100644
--- a/test/parser/samples/action-with-literal/output.json
+++ b/test/parser/samples/action-with-literal/output.json
@@ -1,24 +1,24 @@
 {
 	"html": {
 		"start": 0,
-		"end": 35,
+		"end": 37,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 35,
+				"end": 37,
 				"type": "Element",
 				"name": "input",
 				"attributes": [
 					{
 						"start": 7,
-						"end": 34,
+						"end": 36,
 						"type": "Action",
 						"name": "tooltip",
 						"expression": {
 							"type": "Literal",
-							"start": 20,
-							"end": 33,
+							"start": 21,
+							"end": 34,
 							"value": "tooltip msg",
 							"raw": "'tooltip msg'"
 						}
@@ -28,6 +28,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/action/output.json b/test/parser/samples/action/output.json
index b4f0bce920..5b4ca10aa4 100644
--- a/test/parser/samples/action/output.json
+++ b/test/parser/samples/action/output.json
@@ -22,6 +22,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/animation/output.json b/test/parser/samples/animation/output.json
index d6c30846c0..b9013d2eba 100644
--- a/test/parser/samples/animation/output.json
+++ b/test/parser/samples/animation/output.json
@@ -54,6 +54,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/attribute-containing-solidus/output.json b/test/parser/samples/attribute-containing-solidus/output.json
index 2927ae1d72..920a9420c8 100644
--- a/test/parser/samples/attribute-containing-solidus/output.json
+++ b/test/parser/samples/attribute-containing-solidus/output.json
@@ -36,6 +36,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/attribute-dynamic-boolean/output.json b/test/parser/samples/attribute-dynamic-boolean/output.json
index ac3fbc8631..e50640f279 100644
--- a/test/parser/samples/attribute-dynamic-boolean/output.json
+++ b/test/parser/samples/attribute-dynamic-boolean/output.json
@@ -34,6 +34,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/attribute-dynamic-reserved/output.json b/test/parser/samples/attribute-dynamic-reserved/output.json
index 2659c650af..042712b872 100644
--- a/test/parser/samples/attribute-dynamic-reserved/output.json
+++ b/test/parser/samples/attribute-dynamic-reserved/output.json
@@ -34,6 +34,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/attribute-dynamic/output.json b/test/parser/samples/attribute-dynamic/output.json
index 6aa95428da..f3099f6e62 100644
--- a/test/parser/samples/attribute-dynamic/output.json
+++ b/test/parser/samples/attribute-dynamic/output.json
@@ -58,6 +58,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/attribute-escaped/output.json b/test/parser/samples/attribute-escaped/output.json
index db1bd5a5e9..979b54d713 100644
--- a/test/parser/samples/attribute-escaped/output.json
+++ b/test/parser/samples/attribute-escaped/output.json
@@ -29,6 +29,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/attribute-multiple/output.json b/test/parser/samples/attribute-multiple/output.json
index a6a7586714..5864363cdf 100644
--- a/test/parser/samples/attribute-multiple/output.json
+++ b/test/parser/samples/attribute-multiple/output.json
@@ -43,6 +43,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/attribute-shorthand/output.json b/test/parser/samples/attribute-shorthand/output.json
index 04fa0cadd0..69f9329ed1 100644
--- a/test/parser/samples/attribute-shorthand/output.json
+++ b/test/parser/samples/attribute-shorthand/output.json
@@ -34,6 +34,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/attribute-static-boolean/output.json b/test/parser/samples/attribute-static-boolean/output.json
index 5bdf63c58d..79ea9e9d11 100644
--- a/test/parser/samples/attribute-static-boolean/output.json
+++ b/test/parser/samples/attribute-static-boolean/output.json
@@ -22,6 +22,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/attribute-static/output.json b/test/parser/samples/attribute-static/output.json
index 722e6f2e5f..cb0d7684da 100644
--- a/test/parser/samples/attribute-static/output.json
+++ b/test/parser/samples/attribute-static/output.json
@@ -29,6 +29,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/attribute-unquoted/output.json b/test/parser/samples/attribute-unquoted/output.json
index 57e25498df..940ac5b01d 100644
--- a/test/parser/samples/attribute-unquoted/output.json
+++ b/test/parser/samples/attribute-unquoted/output.json
@@ -29,6 +29,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/await-then-catch/output.json b/test/parser/samples/await-then-catch/output.json
index 2ab57a95b6..1ab557f99d 100644
--- a/test/parser/samples/await-then-catch/output.json
+++ b/test/parser/samples/await-then-catch/output.json
@@ -155,6 +155,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/binding-shorthand/output.json b/test/parser/samples/binding-shorthand/output.json
index e421eb4602..97b531ae98 100644
--- a/test/parser/samples/binding-shorthand/output.json
+++ b/test/parser/samples/binding-shorthand/output.json
@@ -15,10 +15,10 @@
 						"end": 16,
 						"type": "Binding",
 						"name": "foo",
-						"value": {
-							"type": "Identifier",
+						"expression": {
 							"start": 13,
 							"end": 16,
+							"type": "Identifier",
 							"name": "foo"
 						}
 					}
@@ -27,6 +27,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/binding/output.json b/test/parser/samples/binding/output.json
index 7ebdab6683..8021378b05 100644
--- a/test/parser/samples/binding/output.json
+++ b/test/parser/samples/binding/output.json
@@ -15,7 +15,7 @@
 						"end": 24,
 						"type": "Binding",
 						"name": "value",
-						"value": {
+						"expression": {
 							"type": "Identifier",
 							"start": 19,
 							"end": 23,
@@ -27,6 +27,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/comment/output.json b/test/parser/samples/comment/output.json
index d794cfb2ab..10d85bf422 100644
--- a/test/parser/samples/comment/output.json
+++ b/test/parser/samples/comment/output.json
@@ -12,6 +12,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/component-dynamic/output.json b/test/parser/samples/component-dynamic/output.json
index 5525f1603b..9b08732c38 100644
--- a/test/parser/samples/component-dynamic/output.json
+++ b/test/parser/samples/component-dynamic/output.json
@@ -37,6 +37,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/convert-entities-in-element/output.json b/test/parser/samples/convert-entities-in-element/output.json
index fcc131df14..f481345a02 100644
--- a/test/parser/samples/convert-entities-in-element/output.json
+++ b/test/parser/samples/convert-entities-in-element/output.json
@@ -21,6 +21,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/convert-entities/output.json b/test/parser/samples/convert-entities/output.json
index 56cb380e09..b3e66a9007 100644
--- a/test/parser/samples/convert-entities/output.json
+++ b/test/parser/samples/convert-entities/output.json
@@ -12,6 +12,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/css-ref-selector/output.json b/test/parser/samples/css-ref-selector/output.json
index 61d4709099..25864b22bd 100644
--- a/test/parser/samples/css-ref-selector/output.json
+++ b/test/parser/samples/css-ref-selector/output.json
@@ -14,7 +14,8 @@
 						"start": 5,
 						"end": 12,
 						"type": "Ref",
-						"name": "foo"
+						"name": "foo",
+						"expression": null
 					}
 				],
 				"children": []
@@ -27,69 +28,71 @@
 			}
 		]
 	},
-	"css": {
-		"start": 16,
-		"end": 60,
-		"attributes": [],
-		"children": [
-			{
-				"type": "Rule",
-				"selector": {
-					"type": "SelectorList",
-					"children": [
-						{
-							"type": "Selector",
-							"children": [
-								{
-									"type": "RefSelector",
-									"start": 25,
-									"end": 32,
-									"name": "foo"
-								}
-							],
-							"start": 25,
-							"end": 32
-						}
-					],
-					"start": 25,
-					"end": 32
-				},
-				"block": {
-					"type": "Block",
-					"children": [
-						{
-							"type": "Declaration",
-							"important": false,
-							"property": "color",
-							"value": {
-								"type": "Value",
+	"css": [
+		{
+			"start": 16,
+			"end": 60,
+			"attributes": [],
+			"children": [
+				{
+					"type": "Rule",
+					"selector": {
+						"type": "SelectorList",
+						"children": [
+							{
+								"type": "Selector",
 								"children": [
 									{
-										"type": "Identifier",
-										"name": "red",
-										"start": 44,
-										"end": 47
+										"type": "RefSelector",
+										"start": 25,
+										"end": 32,
+										"name": "foo"
 									}
 								],
-								"start": 43,
+								"start": 25,
+								"end": 32
+							}
+						],
+						"start": 25,
+						"end": 32
+					},
+					"block": {
+						"type": "Block",
+						"children": [
+							{
+								"type": "Declaration",
+								"important": false,
+								"property": "color",
+								"value": {
+									"type": "Value",
+									"children": [
+										{
+											"type": "Identifier",
+											"name": "red",
+											"start": 44,
+											"end": 47
+										}
+									],
+									"start": 43,
+									"end": 47
+								},
+								"start": 37,
 								"end": 47
-							},
-							"start": 37,
-							"end": 47
-						}
-					],
-					"start": 33,
+							}
+						],
+						"start": 33,
+						"end": 51
+					},
+					"start": 25,
 					"end": 51
-				},
-				"start": 25,
-				"end": 51
+				}
+			],
+			"content": {
+				"start": 23,
+				"end": 52,
+				"styles": "\n\tref:foo {\n\t\tcolor: red;\n\t}\n"
 			}
-		],
-		"content": {
-			"start": 23,
-			"end": 52,
-			"styles": "\n\tref:foo {\n\t\tcolor: red;\n\t}\n"
 		}
-	},
-	"js": null
+	],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/css/output.json b/test/parser/samples/css/output.json
index 971f803481..e91c31a71a 100644
--- a/test/parser/samples/css/output.json
+++ b/test/parser/samples/css/output.json
@@ -27,69 +27,71 @@
 			}
 		]
 	},
-	"css": {
-		"start": 16,
-		"end": 56,
-		"attributes": [],
-		"children": [
-			{
-				"type": "Rule",
-				"selector": {
-					"type": "SelectorList",
-					"children": [
-						{
-							"type": "Selector",
-							"children": [
-								{
-									"type": "TypeSelector",
-									"name": "div",
-									"start": 25,
-									"end": 28
-								}
-							],
-							"start": 25,
-							"end": 28
-						}
-					],
-					"start": 25,
-					"end": 28
-				},
-				"block": {
-					"type": "Block",
-					"children": [
-						{
-							"type": "Declaration",
-							"important": false,
-							"property": "color",
-							"value": {
-								"type": "Value",
+	"css": [
+		{
+			"start": 16,
+			"end": 56,
+			"attributes": [],
+			"children": [
+				{
+					"type": "Rule",
+					"selector": {
+						"type": "SelectorList",
+						"children": [
+							{
+								"type": "Selector",
 								"children": [
 									{
-										"type": "Identifier",
-										"name": "red",
-										"start": 40,
-										"end": 43
+										"type": "TypeSelector",
+										"name": "div",
+										"start": 25,
+										"end": 28
 									}
 								],
-								"start": 39,
+								"start": 25,
+								"end": 28
+							}
+						],
+						"start": 25,
+						"end": 28
+					},
+					"block": {
+						"type": "Block",
+						"children": [
+							{
+								"type": "Declaration",
+								"important": false,
+								"property": "color",
+								"value": {
+									"type": "Value",
+									"children": [
+										{
+											"type": "Identifier",
+											"name": "red",
+											"start": 40,
+											"end": 43
+										}
+									],
+									"start": 39,
+									"end": 43
+								},
+								"start": 33,
 								"end": 43
-							},
-							"start": 33,
-							"end": 43
-						}
-					],
-					"start": 29,
+							}
+						],
+						"start": 29,
+						"end": 47
+					},
+					"start": 25,
 					"end": 47
-				},
-				"start": 25,
-				"end": 47
+				}
+			],
+			"content": {
+				"start": 23,
+				"end": 48,
+				"styles": "\n\tdiv {\n\t\tcolor: red;\n\t}\n"
 			}
-		],
-		"content": {
-			"start": 23,
-			"end": 48,
-			"styles": "\n\tdiv {\n\t\tcolor: red;\n\t}\n"
 		}
-	},
-	"js": null
+	],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/dynamic-import/input.html b/test/parser/samples/dynamic-import/input.html
index 553ca6c38c..5c29afe2fa 100644
--- a/test/parser/samples/dynamic-import/input.html
+++ b/test/parser/samples/dynamic-import/input.html
@@ -1,9 +1,9 @@
 <script>
-	export default {
-		oncreate() {
-			import('./foo.js').then(foo => {
-				console.log(foo.default);
-			});
-		}
-	}
+	import { onMount } from 'svelte';
+
+	onMount(() => {
+		import('./foo.js').then(foo => {
+			console.log(foo.default);
+		});
+	});
 </script>
\ No newline at end of file
diff --git a/test/parser/samples/dynamic-import/output.json b/test/parser/samples/dynamic-import/output.json
index 4c250327e7..55c1bdf756 100644
--- a/test/parser/samples/dynamic-import/output.json
+++ b/test/parser/samples/dynamic-import/output.json
@@ -5,43 +5,67 @@
 		"type": "Fragment",
 		"children": []
 	},
-	"css": null,
-	"js": {
-		"start": 0,
-		"end": 131,
-		"attributes": [],
-		"content": {
-			"type": "Program",
-			"start": 8,
-			"end": 122,
-			"body": [
-				{
-					"type": "ExportDefaultDeclaration",
-					"start": 10,
-					"end": 121,
-					"declaration": {
-						"type": "ObjectExpression",
-						"start": 25,
-						"end": 121,
-						"properties": [
+	"css": [],
+	"js": [
+		{
+			"start": 0,
+			"end": 146,
+			"attributes": [],
+			"content": {
+				"type": "Program",
+				"start": 8,
+				"end": 137,
+				"body": [
+					{
+						"type": "ImportDeclaration",
+						"start": 10,
+						"end": 43,
+						"specifiers": [
 							{
-								"type": "Property",
-								"start": 29,
-								"end": 118,
-								"method": true,
-								"shorthand": false,
-								"computed": false,
-								"key": {
+								"type": "ImportSpecifier",
+								"start": 19,
+								"end": 26,
+								"imported": {
 									"type": "Identifier",
-									"start": 29,
-									"end": 37,
-									"name": "oncreate"
+									"start": 19,
+									"end": 26,
+									"name": "onMount"
 								},
-								"kind": "init",
-								"value": {
-									"type": "FunctionExpression",
-									"start": 37,
-									"end": 118,
+								"local": {
+									"type": "Identifier",
+									"start": 19,
+									"end": 26,
+									"name": "onMount"
+								}
+							}
+						],
+						"source": {
+							"type": "Literal",
+							"start": 34,
+							"end": 42,
+							"value": "svelte",
+							"raw": "'svelte'"
+						}
+					},
+					{
+						"type": "ExpressionStatement",
+						"start": 46,
+						"end": 136,
+						"expression": {
+							"type": "CallExpression",
+							"start": 46,
+							"end": 135,
+							"callee": {
+								"type": "Identifier",
+								"start": 46,
+								"end": 53,
+								"name": "onMount"
+							},
+							"arguments": [
+								{
+									"type": "ArrowFunctionExpression",
+									"start": 54,
+									"end": 134,
 									"id": null,
 									"generator": false,
 									"expression": false,
@@ -49,35 +73,35 @@
 									"params": [],
 									"body": {
 										"type": "BlockStatement",
-										"start": 40,
-										"end": 118,
+										"start": 60,
+										"end": 134,
 										"body": [
 											{
 												"type": "ExpressionStatement",
-												"start": 45,
-												"end": 114,
+												"start": 64,
+												"end": 131,
 												"expression": {
 													"type": "CallExpression",
-													"start": 45,
-													"end": 113,
+													"start": 64,
+													"end": 130,
 													"callee": {
 														"type": "MemberExpression",
-														"start": 45,
-														"end": 68,
+														"start": 64,
+														"end": 87,
 														"object": {
 															"type": "CallExpression",
-															"start": 45,
-															"end": 63,
+															"start": 64,
+															"end": 82,
 															"callee": {
 																"type": "Import",
-																"start": 45,
-																"end": 51
+																"start": 64,
+																"end": 70
 															},
 															"arguments": [
 																{
 																	"type": "Literal",
-																	"start": 52,
-																	"end": 62,
+																	"start": 71,
+																	"end": 81,
 																	"value": "./foo.js",
 																	"raw": "'./foo.js'"
 																}
@@ -85,8 +109,8 @@
 														},
 														"property": {
 															"type": "Identifier",
-															"start": 64,
-															"end": 68,
+															"start": 83,
+															"end": 87,
 															"name": "then"
 														},
 														"computed": false
@@ -94,8 +118,8 @@
 													"arguments": [
 														{
 															"type": "ArrowFunctionExpression",
-															"start": 69,
-															"end": 112,
+															"start": 88,
+															"end": 129,
 															"id": null,
 															"generator": false,
 															"expression": false,
@@ -103,38 +127,38 @@
 															"params": [
 																{
 																	"type": "Identifier",
-																	"start": 69,
-																	"end": 72,
+																	"start": 88,
+																	"end": 91,
 																	"name": "foo"
 																}
 															],
 															"body": {
 																"type": "BlockStatement",
-																"start": 76,
-																"end": 112,
+																"start": 95,
+																"end": 129,
 																"body": [
 																	{
 																		"type": "ExpressionStatement",
-																		"start": 82,
-																		"end": 107,
+																		"start": 100,
+																		"end": 125,
 																		"expression": {
 																			"type": "CallExpression",
-																			"start": 82,
-																			"end": 106,
+																			"start": 100,
+																			"end": 124,
 																			"callee": {
 																				"type": "MemberExpression",
-																				"start": 82,
-																				"end": 93,
+																				"start": 100,
+																				"end": 111,
 																				"object": {
 																					"type": "Identifier",
-																					"start": 82,
-																					"end": 89,
+																					"start": 100,
+																					"end": 107,
 																					"name": "console"
 																				},
 																				"property": {
 																					"type": "Identifier",
-																					"start": 90,
-																					"end": 93,
+																					"start": 108,
+																					"end": 111,
 																					"name": "log"
 																				},
 																				"computed": false
@@ -142,18 +166,18 @@
 																			"arguments": [
 																				{
 																					"type": "MemberExpression",
-																					"start": 94,
-																					"end": 105,
+																					"start": 112,
+																					"end": 123,
 																					"object": {
 																						"type": "Identifier",
-																						"start": 94,
-																						"end": 97,
+																						"start": 112,
+																						"end": 115,
 																						"name": "foo"
 																					},
 																					"property": {
 																						"type": "Identifier",
-																						"start": 98,
-																						"end": 105,
+																						"start": 116,
+																						"end": 123,
 																						"name": "default"
 																					},
 																					"computed": false
@@ -170,12 +194,12 @@
 										]
 									}
 								}
-							}
-						]
+							]
+						}
 					}
-				}
-			],
-			"sourceType": "module"
+				],
+				"sourceType": "module"
+			}
 		}
-	}
+	]
 }
\ No newline at end of file
diff --git a/test/parser/samples/each-block-destructured/output.json b/test/parser/samples/each-block-destructured/output.json
index eba70b8750..fdca5f82a2 100644
--- a/test/parser/samples/each-block-destructured/output.json
+++ b/test/parser/samples/each-block-destructured/output.json
@@ -75,6 +75,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/each-block-else/output.json b/test/parser/samples/each-block-else/output.json
index 283b0f0418..be0ac6d550 100644
--- a/test/parser/samples/each-block-else/output.json
+++ b/test/parser/samples/each-block-else/output.json
@@ -67,6 +67,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/each-block-indexed/output.json b/test/parser/samples/each-block-indexed/output.json
index 1039e67b7c..bda5f86a89 100644
--- a/test/parser/samples/each-block-indexed/output.json
+++ b/test/parser/samples/each-block-indexed/output.json
@@ -63,6 +63,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/each-block-keyed/output.json b/test/parser/samples/each-block-keyed/output.json
index e627c5c8c9..a00694fc4e 100644
--- a/test/parser/samples/each-block-keyed/output.json
+++ b/test/parser/samples/each-block-keyed/output.json
@@ -63,6 +63,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/each-block/output.json b/test/parser/samples/each-block/output.json
index a92f3410d1..a24c32e9ad 100644
--- a/test/parser/samples/each-block/output.json
+++ b/test/parser/samples/each-block/output.json
@@ -45,6 +45,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/element-with-mustache/output.json b/test/parser/samples/element-with-mustache/output.json
index b0b410000b..a56cd27967 100644
--- a/test/parser/samples/element-with-mustache/output.json
+++ b/test/parser/samples/element-with-mustache/output.json
@@ -38,6 +38,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/element-with-text/output.json b/test/parser/samples/element-with-text/output.json
index 6bb7ee0470..1ae33df94f 100644
--- a/test/parser/samples/element-with-text/output.json
+++ b/test/parser/samples/element-with-text/output.json
@@ -21,6 +21,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/elements/output.json b/test/parser/samples/elements/output.json
index c0b9b7c220..219799df3e 100644
--- a/test/parser/samples/elements/output.json
+++ b/test/parser/samples/elements/output.json
@@ -22,6 +22,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/error-binding-mustaches/error.json b/test/parser/samples/error-binding-mustaches/error.json
deleted file mode 100644
index b2a5c1c564..0000000000
--- a/test/parser/samples/error-binding-mustaches/error.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"code": "invalid-directive-value",
-	"message": "directive values should not be wrapped — use 'foo', not '{foo}'",
-	"start": {
-		"line": 1,
-		"column": 19,
-		"character": 19
-	},
-	"pos": 19
-}
\ No newline at end of file
diff --git a/test/parser/samples/error-binding-mustaches/input.html b/test/parser/samples/error-binding-mustaches/input.html
deleted file mode 100644
index 2629696c9e..0000000000
--- a/test/parser/samples/error-binding-mustaches/input.html
+++ /dev/null
@@ -1 +0,0 @@
-<input bind:value='{foo}'>
diff --git a/test/parser/samples/error-binding-rvalue/error.json b/test/parser/samples/error-binding-rvalue/error.json
deleted file mode 100644
index 2d081afac5..0000000000
--- a/test/parser/samples/error-binding-rvalue/error.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"code": "invalid-directive-value",
-	"message": "Can only bind to an identifier (e.g. `foo`) or a member expression (e.g. `foo.bar` or `foo[baz]`)",
-	"pos": 19,
-	"start": {
-		"line": 1,
-		"column": 19,
-		"character": 19
-	}
-}
\ No newline at end of file
diff --git a/test/parser/samples/error-binding-rvalue/input.html b/test/parser/samples/error-binding-rvalue/input.html
deleted file mode 100644
index 0b1f716c23..0000000000
--- a/test/parser/samples/error-binding-rvalue/input.html
+++ /dev/null
@@ -1 +0,0 @@
-<input bind:value='a + b'>
\ No newline at end of file
diff --git a/test/parser/samples/error-event-handler/error.json b/test/parser/samples/error-event-handler/error.json
deleted file mode 100644
index 8ccfa1c881..0000000000
--- a/test/parser/samples/error-event-handler/error.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"code": "invalid-directive-value",
-	"message": "Expected a method call",
-	"start": {
-		"line": 1,
-		"column": 15,
-		"character": 15
-	},
-	"pos": 15
-}
\ No newline at end of file
diff --git a/test/parser/samples/error-event-handler/input.html b/test/parser/samples/error-event-handler/input.html
deleted file mode 100644
index 612b5ba399..0000000000
--- a/test/parser/samples/error-event-handler/input.html
+++ /dev/null
@@ -1 +0,0 @@
-<div on:click='foo'></div>
\ No newline at end of file
diff --git a/test/parser/samples/error-ref-value/error.json b/test/parser/samples/error-ref-value/error.json
deleted file mode 100644
index 5352eb4722..0000000000
--- a/test/parser/samples/error-ref-value/error.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"code": "invalid-directive-value",
-	"message": "ref directives cannot have a value",
-	"start": {
-		"line": 1,
-		"column": 14,
-		"character": 14
-	},
-	"pos": 14
-}
\ No newline at end of file
diff --git a/test/parser/samples/error-ref-value/input.html b/test/parser/samples/error-ref-value/input.html
deleted file mode 100644
index 8ad19958e3..0000000000
--- a/test/parser/samples/error-ref-value/input.html
+++ /dev/null
@@ -1 +0,0 @@
-<div ref:foo='bar'></div>
\ No newline at end of file
diff --git a/test/parser/samples/event-handler/input.html b/test/parser/samples/event-handler/input.html
index 731fe32e75..b3b467480e 100644
--- a/test/parser/samples/event-handler/input.html
+++ b/test/parser/samples/event-handler/input.html
@@ -1,4 +1,4 @@
-<button on:click='set({ visible: !visible })'>toggle</button>
+<button on:click="{() => visible = !visible}">toggle</button>
 
 {#if visible}
 	<p>hello!</p>
diff --git a/test/parser/samples/event-handler/output.json b/test/parser/samples/event-handler/output.json
index 617c2fde71..326b5a642c 100644
--- a/test/parser/samples/event-handler/output.json
+++ b/test/parser/samples/event-handler/output.json
@@ -15,54 +15,40 @@
 						"end": 45,
 						"type": "EventHandler",
 						"name": "click",
-						"modifiers": [],
 						"expression": {
-							"type": "CallExpression",
-							"start": 18,
-							"end": 44,
-							"callee": {
-								"type": "Identifier",
-								"start": 18,
-								"end": 21,
-								"name": "set"
-							},
-							"arguments": [
-								{
-									"type": "ObjectExpression",
-									"start": 22,
+							"type": "ArrowFunctionExpression",
+							"start": 19,
+							"end": 43,
+							"id": null,
+							"generator": false,
+							"expression": true,
+							"async": false,
+							"params": [],
+							"body": {
+								"type": "AssignmentExpression",
+								"start": 25,
+								"end": 43,
+								"operator": "=",
+								"left": {
+									"type": "Identifier",
+									"start": 25,
+									"end": 32,
+									"name": "visible"
+								},
+								"right": {
+									"type": "UnaryExpression",
+									"start": 35,
 									"end": 43,
-									"properties": [
-										{
-											"type": "Property",
-											"start": 24,
-											"end": 41,
-											"method": false,
-											"shorthand": false,
-											"computed": false,
-											"key": {
-												"type": "Identifier",
-												"start": 24,
-												"end": 31,
-												"name": "visible"
-											},
-											"value": {
-												"type": "UnaryExpression",
-												"start": 33,
-												"end": 41,
-												"operator": "!",
-												"prefix": true,
-												"argument": {
-													"type": "Identifier",
-													"start": 34,
-													"end": 41,
-													"name": "visible"
-												}
-											},
-											"kind": "init"
-										}
-									]
+									"operator": "!",
+									"prefix": true,
+									"argument": {
+										"type": "Identifier",
+										"start": 36,
+										"end": 43,
+										"name": "visible"
+									}
 								}
-							]
+							}
 						}
 					}
 				],
@@ -111,6 +97,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/if-block-else/output.json b/test/parser/samples/if-block-else/output.json
index ea239771c1..8e96c34efc 100644
--- a/test/parser/samples/if-block-else/output.json
+++ b/test/parser/samples/if-block-else/output.json
@@ -56,6 +56,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/if-block-elseif/output.json b/test/parser/samples/if-block-elseif/output.json
index 77f437277b..257eb1e7d2 100644
--- a/test/parser/samples/if-block-elseif/output.json
+++ b/test/parser/samples/if-block-elseif/output.json
@@ -96,6 +96,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/if-block/output.json b/test/parser/samples/if-block/output.json
index 3fc65c6172..ba734c0e56 100644
--- a/test/parser/samples/if-block/output.json
+++ b/test/parser/samples/if-block/output.json
@@ -25,6 +25,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/implicitly-closed-li/output.json b/test/parser/samples/implicitly-closed-li/output.json
index ffa3950e32..69def7a9a2 100644
--- a/test/parser/samples/implicitly-closed-li/output.json
+++ b/test/parser/samples/implicitly-closed-li/output.json
@@ -66,6 +66,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/nbsp/output.json b/test/parser/samples/nbsp/output.json
index e7b36f1a68..7373bc9673 100644
--- a/test/parser/samples/nbsp/output.json
+++ b/test/parser/samples/nbsp/output.json
@@ -21,6 +21,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/raw-mustaches/output.json b/test/parser/samples/raw-mustaches/output.json
index 2ffcd918c8..41dab885e0 100644
--- a/test/parser/samples/raw-mustaches/output.json
+++ b/test/parser/samples/raw-mustaches/output.json
@@ -55,6 +55,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/refs/output.json b/test/parser/samples/refs/output.json
index 1aa2a8a283..128ca17529 100644
--- a/test/parser/samples/refs/output.json
+++ b/test/parser/samples/refs/output.json
@@ -14,13 +14,14 @@
 						"start": 8,
 						"end": 15,
 						"type": "Ref",
-						"name": "foo"
+						"name": "foo",
+						"expression": null
 					}
 				],
 				"children": []
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/script-comment-only/input.html b/test/parser/samples/script-comment-only/input.html
index 334e686c30..32f0911030 100644
--- a/test/parser/samples/script-comment-only/input.html
+++ b/test/parser/samples/script-comment-only/input.html
@@ -1,5 +1,5 @@
-<div></div>
-
 <script>
 	// TODO write some code
-</script>
\ No newline at end of file
+</script>
+
+<div></div>
\ No newline at end of file
diff --git a/test/parser/samples/script-comment-only/output.json b/test/parser/samples/script-comment-only/output.json
index c86b4e60ee..badcce4de9 100644
--- a/test/parser/samples/script-comment-only/output.json
+++ b/test/parser/samples/script-comment-only/output.json
@@ -1,25 +1,27 @@
 {
 	"html": {
-		"start": 0,
-		"end": 11,
+		"start": 45,
+		"end": 56,
 		"type": "Fragment",
 		"children": [
 			{
-				"start": 0,
-				"end": 11,
+				"start": 43,
+				"end": 45,
+				"type": "Text",
+				"data": "\n\n"
+			},
+			{
+				"start": 45,
+				"end": 56,
 				"type": "Element",
 				"name": "div",
 				"attributes": [],
 				"children": []
-			},
-			{
-				"start": 11,
-				"end": 13,
-				"type": "Text",
-				"data": "\n\n"
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": [
+		null
+	]
 }
\ No newline at end of file
diff --git a/test/parser/samples/script-comment-trailing-multiline/input.html b/test/parser/samples/script-comment-trailing-multiline/input.html
index dff2dc428f..736509cbab 100644
--- a/test/parser/samples/script-comment-trailing-multiline/input.html
+++ b/test/parser/samples/script-comment-trailing-multiline/input.html
@@ -1,13 +1,9 @@
-<h1>Hello {name}!</h1>
-
 <script>
-	export default {
-		data: () => ({
-			name: 'world'
-		})
-	};
+	let name = 'world';
 
 	/*
 		trailing multiline comment
 	*/
 </script>
+
+<h1>Hello {name}!</h1>
diff --git a/test/parser/samples/script-comment-trailing-multiline/output.json b/test/parser/samples/script-comment-trailing-multiline/output.json
index 322bf1cebb..a32ff799f7 100644
--- a/test/parser/samples/script-comment-trailing-multiline/output.json
+++ b/test/parser/samples/script-comment-trailing-multiline/output.json
@@ -1,127 +1,89 @@
 {
 	"html": {
-		"start": 0,
-		"end": 22,
+		"start": 79,
+		"end": 101,
 		"type": "Fragment",
 		"children": [
 			{
-				"start": 0,
-				"end": 22,
+				"start": 77,
+				"end": 79,
+				"type": "Text",
+				"data": "\n\n"
+			},
+			{
+				"start": 79,
+				"end": 101,
 				"type": "Element",
 				"name": "h1",
 				"attributes": [],
 				"children": [
 					{
-						"start": 4,
-						"end": 10,
+						"start": 83,
+						"end": 89,
 						"type": "Text",
 						"data": "Hello "
 					},
 					{
-						"start": 10,
-						"end": 16,
+						"start": 89,
+						"end": 95,
 						"type": "MustacheTag",
 						"expression": {
 							"type": "Identifier",
-							"start": 11,
-							"end": 15,
+							"start": 90,
+							"end": 94,
 							"name": "name"
 						}
 					},
 					{
-						"start": 16,
-						"end": 17,
+						"start": 95,
+						"end": 96,
 						"type": "Text",
 						"data": "!"
 					}
 				]
-			},
-			{
-				"start": 22,
-				"end": 24,
-				"type": "Text",
-				"data": "\n\n"
 			}
 		]
 	},
-	"css": null,
-	"js": {
-		"start": 24,
-		"end": 141,
-		"attributes": [],
-		"content": {
-			"type": "Program",
-			"start": 32,
-			"end": 132,
-			"body": [
-				{
-					"type": "ExportDefaultDeclaration",
-					"start": 34,
-					"end": 93,
-					"declaration": {
-						"type": "ObjectExpression",
-						"start": 49,
-						"end": 92,
-						"properties": [
+	"css": [],
+	"js": [
+		{
+			"start": 0,
+			"end": 77,
+			"attributes": [],
+			"content": {
+				"type": "Program",
+				"start": 8,
+				"end": 68,
+				"body": [
+					{
+						"type": "VariableDeclaration",
+						"start": 10,
+						"end": 29,
+						"declarations": [
 							{
-								"type": "Property",
-								"start": 53,
-								"end": 89,
-								"method": false,
-								"shorthand": false,
-								"computed": false,
-								"key": {
+								"type": "VariableDeclarator",
+								"start": 14,
+								"end": 28,
+								"id": {
 									"type": "Identifier",
-									"start": 53,
-									"end": 57,
-									"name": "data"
-								},
-								"value": {
-									"type": "ArrowFunctionExpression",
-									"start": 59,
-									"end": 89,
-									"id": null,
-									"generator": false,
-									"expression": true,
-									"async": false,
-									"params": [],
-									"body": {
-										"type": "ObjectExpression",
-										"start": 66,
-										"end": 88,
-										"properties": [
-											{
-												"type": "Property",
-												"start": 71,
-												"end": 84,
-												"method": false,
-												"shorthand": false,
-												"computed": false,
-												"key": {
-													"type": "Identifier",
-													"start": 71,
-													"end": 75,
-													"name": "name"
-												},
-												"value": {
-													"type": "Literal",
-													"start": 77,
-													"end": 84,
-													"value": "world",
-													"raw": "'world'"
-												},
-												"kind": "init"
-											}
-										]
-									}
+									"start": 14,
+									"end": 18,
+									"name": "name"
 								},
-								"kind": "init"
+								"init": {
+									"type": "Literal",
+									"start": 21,
+									"end": 28,
+									"value": "world",
+									"raw": "'world'"
+								}
 							}
-						]
+						],
+						"kind": "let"
 					}
-				}
-			],
-			"sourceType": "module"
+				],
+				"sourceType": "module"
+			}
 		}
-	}
+	]
 }
\ No newline at end of file
diff --git a/test/parser/samples/script-comment-trailing/input.html b/test/parser/samples/script-comment-trailing/input.html
index d126aad2fb..7b97ec980a 100644
--- a/test/parser/samples/script-comment-trailing/input.html
+++ b/test/parser/samples/script-comment-trailing/input.html
@@ -1,11 +1,7 @@
-<h1>Hello {name}!</h1>
-
 <script>
-	export default {
-		data: () => ({
-			name: 'world'
-		})
-	};
+	let name = 'world';
 
 	// trailing line comment
 </script>
+
+<h1>Hello {name}!</h1>
diff --git a/test/parser/samples/script-comment-trailing/output.json b/test/parser/samples/script-comment-trailing/output.json
index 00d6a0988d..78012d4438 100644
--- a/test/parser/samples/script-comment-trailing/output.json
+++ b/test/parser/samples/script-comment-trailing/output.json
@@ -1,127 +1,89 @@
 {
 	"html": {
-		"start": 0,
-		"end": 22,
+		"start": 68,
+		"end": 90,
 		"type": "Fragment",
 		"children": [
 			{
-				"start": 0,
-				"end": 22,
+				"start": 66,
+				"end": 68,
+				"type": "Text",
+				"data": "\n\n"
+			},
+			{
+				"start": 68,
+				"end": 90,
 				"type": "Element",
 				"name": "h1",
 				"attributes": [],
 				"children": [
 					{
-						"start": 4,
-						"end": 10,
+						"start": 72,
+						"end": 78,
 						"type": "Text",
 						"data": "Hello "
 					},
 					{
-						"start": 10,
-						"end": 16,
+						"start": 78,
+						"end": 84,
 						"type": "MustacheTag",
 						"expression": {
 							"type": "Identifier",
-							"start": 11,
-							"end": 15,
+							"start": 79,
+							"end": 83,
 							"name": "name"
 						}
 					},
 					{
-						"start": 16,
-						"end": 17,
+						"start": 84,
+						"end": 85,
 						"type": "Text",
 						"data": "!"
 					}
 				]
-			},
-			{
-				"start": 22,
-				"end": 24,
-				"type": "Text",
-				"data": "\n\n"
 			}
 		]
 	},
-	"css": null,
-	"js": {
-		"start": 24,
-		"end": 130,
-		"attributes": [],
-		"content": {
-			"type": "Program",
-			"start": 32,
-			"end": 121,
-			"body": [
-				{
-					"type": "ExportDefaultDeclaration",
-					"start": 34,
-					"end": 93,
-					"declaration": {
-						"type": "ObjectExpression",
-						"start": 49,
-						"end": 92,
-						"properties": [
+	"css": [],
+	"js": [
+		{
+			"start": 0,
+			"end": 66,
+			"attributes": [],
+			"content": {
+				"type": "Program",
+				"start": 8,
+				"end": 57,
+				"body": [
+					{
+						"type": "VariableDeclaration",
+						"start": 10,
+						"end": 29,
+						"declarations": [
 							{
-								"type": "Property",
-								"start": 53,
-								"end": 89,
-								"method": false,
-								"shorthand": false,
-								"computed": false,
-								"key": {
+								"type": "VariableDeclarator",
+								"start": 14,
+								"end": 28,
+								"id": {
 									"type": "Identifier",
-									"start": 53,
-									"end": 57,
-									"name": "data"
-								},
-								"value": {
-									"type": "ArrowFunctionExpression",
-									"start": 59,
-									"end": 89,
-									"id": null,
-									"generator": false,
-									"expression": true,
-									"async": false,
-									"params": [],
-									"body": {
-										"type": "ObjectExpression",
-										"start": 66,
-										"end": 88,
-										"properties": [
-											{
-												"type": "Property",
-												"start": 71,
-												"end": 84,
-												"method": false,
-												"shorthand": false,
-												"computed": false,
-												"key": {
-													"type": "Identifier",
-													"start": 71,
-													"end": 75,
-													"name": "name"
-												},
-												"value": {
-													"type": "Literal",
-													"start": 77,
-													"end": 84,
-													"value": "world",
-													"raw": "'world'"
-												},
-												"kind": "init"
-											}
-										]
-									}
+									"start": 14,
+									"end": 18,
+									"name": "name"
 								},
-								"kind": "init"
+								"init": {
+									"type": "Literal",
+									"start": 21,
+									"end": 28,
+									"value": "world",
+									"raw": "'world'"
+								}
 							}
-						]
+						],
+						"kind": "let"
 					}
-				}
-			],
-			"sourceType": "module"
+				],
+				"sourceType": "module"
+			}
 		}
-	}
+	]
 }
\ No newline at end of file
diff --git a/test/parser/samples/script/input.html b/test/parser/samples/script/input.html
index afd9e23a73..22b3c84db0 100644
--- a/test/parser/samples/script/input.html
+++ b/test/parser/samples/script/input.html
@@ -1,9 +1,5 @@
-<h1>Hello {name}!</h1>
-
 <script>
-	export default {
-		data: () => ({
-			name: 'world'
-		})
-	};
+	let name = 'world';
 </script>
+
+<h1>Hello {name}!</h1>
\ No newline at end of file
diff --git a/test/parser/samples/script/output.json b/test/parser/samples/script/output.json
index e8cbed7326..bf89a0ff02 100644
--- a/test/parser/samples/script/output.json
+++ b/test/parser/samples/script/output.json
@@ -1,127 +1,89 @@
 {
 	"html": {
-		"start": 0,
-		"end": 22,
+		"start": 41,
+		"end": 63,
 		"type": "Fragment",
 		"children": [
 			{
-				"start": 0,
-				"end": 22,
+				"start": 39,
+				"end": 41,
+				"type": "Text",
+				"data": "\n\n"
+			},
+			{
+				"start": 41,
+				"end": 63,
 				"type": "Element",
 				"name": "h1",
 				"attributes": [],
 				"children": [
 					{
-						"start": 4,
-						"end": 10,
+						"start": 45,
+						"end": 51,
 						"type": "Text",
 						"data": "Hello "
 					},
 					{
-						"start": 10,
-						"end": 16,
+						"start": 51,
+						"end": 57,
 						"type": "MustacheTag",
 						"expression": {
 							"type": "Identifier",
-							"start": 11,
-							"end": 15,
+							"start": 52,
+							"end": 56,
 							"name": "name"
 						}
 					},
 					{
-						"start": 16,
-						"end": 17,
+						"start": 57,
+						"end": 58,
 						"type": "Text",
 						"data": "!"
 					}
 				]
-			},
-			{
-				"start": 22,
-				"end": 24,
-				"type": "Text",
-				"data": "\n\n"
 			}
 		]
 	},
-	"css": null,
-	"js": {
-		"start": 24,
-		"end": 103,
-		"attributes": [],
-		"content": {
-			"type": "Program",
-			"start": 32,
-			"end": 94,
-			"body": [
-				{
-					"type": "ExportDefaultDeclaration",
-					"start": 34,
-					"end": 93,
-					"declaration": {
-						"type": "ObjectExpression",
-						"start": 49,
-						"end": 92,
-						"properties": [
+	"css": [],
+	"js": [
+		{
+			"start": 0,
+			"end": 39,
+			"attributes": [],
+			"content": {
+				"type": "Program",
+				"start": 8,
+				"end": 30,
+				"body": [
+					{
+						"type": "VariableDeclaration",
+						"start": 10,
+						"end": 29,
+						"declarations": [
 							{
-								"type": "Property",
-								"start": 53,
-								"end": 89,
-								"method": false,
-								"shorthand": false,
-								"computed": false,
-								"key": {
+								"type": "VariableDeclarator",
+								"start": 14,
+								"end": 28,
+								"id": {
 									"type": "Identifier",
-									"start": 53,
-									"end": 57,
-									"name": "data"
-								},
-								"value": {
-									"type": "ArrowFunctionExpression",
-									"start": 59,
-									"end": 89,
-									"id": null,
-									"generator": false,
-									"expression": true,
-									"async": false,
-									"params": [],
-									"body": {
-										"type": "ObjectExpression",
-										"start": 66,
-										"end": 88,
-										"properties": [
-											{
-												"type": "Property",
-												"start": 71,
-												"end": 84,
-												"method": false,
-												"shorthand": false,
-												"computed": false,
-												"key": {
-													"type": "Identifier",
-													"start": 71,
-													"end": 75,
-													"name": "name"
-												},
-												"value": {
-													"type": "Literal",
-													"start": 77,
-													"end": 84,
-													"value": "world",
-													"raw": "'world'"
-												},
-												"kind": "init"
-											}
-										]
-									}
+									"start": 14,
+									"end": 18,
+									"name": "name"
 								},
-								"kind": "init"
+								"init": {
+									"type": "Literal",
+									"start": 21,
+									"end": 28,
+									"value": "world",
+									"raw": "'world'"
+								}
 							}
-						]
+						],
+						"kind": "let"
 					}
-				}
-			],
-			"sourceType": "module"
+				],
+				"sourceType": "module"
+			}
 		}
-	}
+	]
 }
\ No newline at end of file
diff --git a/test/parser/samples/self-closing-element/output.json b/test/parser/samples/self-closing-element/output.json
index fc7cdc8ba8..f7475b41d7 100644
--- a/test/parser/samples/self-closing-element/output.json
+++ b/test/parser/samples/self-closing-element/output.json
@@ -14,6 +14,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/self-reference/output.json b/test/parser/samples/self-reference/output.json
index b82e96407b..ff111e17ba 100644
--- a/test/parser/samples/self-reference/output.json
+++ b/test/parser/samples/self-reference/output.json
@@ -73,6 +73,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/space-between-mustaches/output.json b/test/parser/samples/space-between-mustaches/output.json
index 8aabf02c70..d66735213d 100644
--- a/test/parser/samples/space-between-mustaches/output.json
+++ b/test/parser/samples/space-between-mustaches/output.json
@@ -72,6 +72,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/spread/output.json b/test/parser/samples/spread/output.json
index 70ee68f2da..a632dc89ab 100644
--- a/test/parser/samples/spread/output.json
+++ b/test/parser/samples/spread/output.json
@@ -26,6 +26,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/textarea-children/output.json b/test/parser/samples/textarea-children/output.json
index 919163b70c..5d345f9bfa 100644
--- a/test/parser/samples/textarea-children/output.json
+++ b/test/parser/samples/textarea-children/output.json
@@ -38,6 +38,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/transition-intro-no-params/output.json b/test/parser/samples/transition-intro-no-params/output.json
index d4af0bb746..58e25db776 100644
--- a/test/parser/samples/transition-intro-no-params/output.json
+++ b/test/parser/samples/transition-intro-no-params/output.json
@@ -31,6 +31,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/transition-intro/input.html b/test/parser/samples/transition-intro/input.html
index db14cfcb2f..b9830609d0 100644
--- a/test/parser/samples/transition-intro/input.html
+++ b/test/parser/samples/transition-intro/input.html
@@ -1 +1 @@
-<div in:style='{opacity: 0}'>fades in</div>
\ No newline at end of file
+<div in:style="{{opacity: 0}}">fades in</div>
\ No newline at end of file
diff --git a/test/parser/samples/transition-intro/output.json b/test/parser/samples/transition-intro/output.json
index d8bc4503c8..c811e132a3 100644
--- a/test/parser/samples/transition-intro/output.json
+++ b/test/parser/samples/transition-intro/output.json
@@ -1,42 +1,42 @@
 {
 	"html": {
 		"start": 0,
-		"end": 43,
+		"end": 45,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 43,
+				"end": 45,
 				"type": "Element",
 				"name": "div",
 				"attributes": [
 					{
 						"start": 5,
-						"end": 28,
+						"end": 30,
 						"type": "Transition",
 						"name": "style",
 						"expression": {
 							"type": "ObjectExpression",
-							"start": 15,
-							"end": 27,
+							"start": 16,
+							"end": 28,
 							"properties": [
 								{
 									"type": "Property",
-									"start": 16,
-									"end": 26,
+									"start": 17,
+									"end": 27,
 									"method": false,
 									"shorthand": false,
 									"computed": false,
 									"key": {
 										"type": "Identifier",
-										"start": 16,
-										"end": 23,
+										"start": 17,
+										"end": 24,
 										"name": "opacity"
 									},
 									"value": {
 										"type": "Literal",
-										"start": 25,
-										"end": 26,
+										"start": 26,
+										"end": 27,
 										"value": 0,
 										"raw": "0"
 									},
@@ -50,8 +50,8 @@
 				],
 				"children": [
 					{
-						"start": 29,
-						"end": 37,
+						"start": 31,
+						"end": 39,
 						"type": "Text",
 						"data": "fades in"
 					}
@@ -59,6 +59,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/unusual-identifier/output.json b/test/parser/samples/unusual-identifier/output.json
index 64fbd4902b..fe9b175128 100644
--- a/test/parser/samples/unusual-identifier/output.json
+++ b/test/parser/samples/unusual-identifier/output.json
@@ -45,6 +45,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/whitespace-leading-trailing/output.json b/test/parser/samples/whitespace-leading-trailing/output.json
index 4e74743def..7dbf259721 100644
--- a/test/parser/samples/whitespace-leading-trailing/output.json
+++ b/test/parser/samples/whitespace-leading-trailing/output.json
@@ -27,6 +27,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/whitespace-normal/output.json b/test/parser/samples/whitespace-normal/output.json
index 369b26843d..c150b53f04 100644
--- a/test/parser/samples/whitespace-normal/output.json
+++ b/test/parser/samples/whitespace-normal/output.json
@@ -62,6 +62,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file
diff --git a/test/parser/samples/yield/output.json b/test/parser/samples/yield/output.json
index 43d9cecbb5..b16ab436f6 100644
--- a/test/parser/samples/yield/output.json
+++ b/test/parser/samples/yield/output.json
@@ -17,6 +17,6 @@
 			}
 		]
 	},
-	"css": null,
-	"js": null
+	"css": [],
+	"js": []
 }
\ No newline at end of file