merge master -> shared-init

Author: Rich-Harris

src/generators/Generator.ts

@@ -56,6 +56,8 @@ export default class Generator {
 	expectedProperties: Set<string>;
 	usesRefs: boolean;
 
+	locate: (c: number) => { line: number, column: number };
+
 	stylesheet: Stylesheet;
 
 	importedNames: Set<string>;
@@ -86,6 +88,8 @@ export default class Generator {
 		this.bindingGroups = [];
 		this.indirectDependencies = new Map();
 
+		this.locate = getLocator(this.source);
+
 		// track which properties are needed, so we can provide useful info
 		// in dev mode
 		this.expectedProperties = new Set();

src/generators/dom/Block.ts

@@ -1,5 +1,6 @@
 import CodeBuilder from '../../utils/CodeBuilder';
 import deindent from '../../utils/deindent';
+import { escape } from '../../utils/stringify';
 import { DomGenerator } from './index';
 import { Node } from '../../interfaces';
 import shared from './shared';
@@ -9,6 +10,7 @@ export interface BlockOptions {
 	generator?: DomGenerator;
 	expression?: Node;
 	context?: string;
+	comment?: string;
 	key?: string;
 	contexts?: Map<string, string>;
 	indexes?: Map<string, string>;
@@ -27,6 +29,7 @@ export default class Block {
 	name: string;
 	expression: Node;
 	context: string;
+	comment?: string;
 
 	key: string;
 	first: string;
@@ -72,6 +75,7 @@ export default class Block {
 		this.name = options.name;
 		this.expression = options.expression;
 		this.context = options.context;
+		this.comment = options.comment;
 
 		// for keyed each blocks
 		this.key = options.key;
@@ -340,6 +344,7 @@ export default class Block {
 		}
 
 		return deindent`
+			${this.comment && `// ${escape(this.comment)}`}
 			function ${this.name}(${this.params.join(', ')}, #component${this.key ? `, ${localKey}` : ''}) {
 				${this.variables.size > 0 &&
 					`var ${Array.from(this.variables.keys())

src/generators/dom/index.ts

@@ -12,6 +12,7 @@ import Generator from '../Generator';
 import Stylesheet from '../../css/Stylesheet';
 import preprocess from './preprocess';
 import Block from './Block';
+import { version } from '../../../package.json';
 import { Parsed, CompileOptions, Node } from '../../interfaces';
 
 export class DomGenerator extends Generator {
@@ -396,6 +397,8 @@ export default function dom(
 		});
 	}
 
+	result = `/* ${options.filename ? `${options.filename} ` : ``}generated by Svelte v${version} */\n\n${result}`;
+
 	return generator.generate(result, options, {
 		name,
 		format,

src/generators/dom/preprocess.ts

@@ -22,6 +22,25 @@ function getChildState(parent: State, child = {}) {
 	);
 }
 
+function createDebuggingComment(node: Node, generator: DomGenerator) {
+	const { locate, source } = generator;
+
+	let c = node.start;
+	if (node.type === 'ElseBlock') {
+		while (source[c] !== '{') c -= 1;
+		c -= 1;
+	}
+
+	let d = node.expression ? node.expression.end : c;
+	while (source[d] !== '}') d += 1;
+	d += 2;
+
+	const start = locate(c);
+	const loc = `(${start.line + 1}:${start.column})`;
+
+	return `${loc} ${source.slice(c, d)}`.replace(/\n/g, ' ');
+}
+
 // 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)
@@ -107,6 +126,7 @@ const preprocessors = {
 			block.addDependencies(dependencies);
 
 			node._block = block.child({
+				comment: createDebuggingComment(node, generator),
 				name: generator.getUniqueName(`create_if_block`),
 			});
 
@@ -127,6 +147,7 @@ const preprocessors = {
 				attachBlocks(node.else.children[0]);
 			} else if (node.else) {
 				node.else._block = block.child({
+					comment: createDebuggingComment(node.else, generator),
 					name: generator.getUniqueName(`create_if_block`),
 				});
 
@@ -202,6 +223,7 @@ const preprocessors = {
 		contextDependencies.set(node.context, dependencies);
 
 		node._block = block.child({
+			comment: createDebuggingComment(node, generator),
 			name: generator.getUniqueName('create_each_block'),
 			expression: node.expression,
 			context: node.context,
@@ -231,6 +253,7 @@ const preprocessors = {
 
 		if (node.else) {
 			node.else._block = block.child({
+				comment: createDebuggingComment(node.else, generator),
 				name: generator.getUniqueName(`${node._block.name}_else`),
 			});
 

src/generators/server-side-rendering/index.ts

@@ -103,7 +103,7 @@ export default function ssr(
 
 		var ${name} = {};
 
-		${name}.filename = ${stringify(options.filename)};
+		${options.filename && `${name}.filename = ${stringify(options.filename)}`};
 
 		${name}.data = function() {
 			return ${templateProperties.data ? `@template.data()` : `{}`};

src/index.ts

@@ -12,9 +12,6 @@ function normalizeOptions(options: CompileOptions): CompileOptions {
 		{
 			generate: 'dom',
 
-			// a filename is necessary for sourcemap generation
-			filename: 'SvelteComponent.html',
-
 			onwarn: (warning: Warning) => {
 				if (warning.loc) {
 					console.warn(

test/js/index.js

@@ -71,7 +71,7 @@ describe("js", () => {
 					expectedBundle.trim().replace(/^\s+$/gm, "")
 				);
 			}).catch(err => {
-				console.error(err.loc);
+				if (err.loc) console.error(err.loc);
 				throw err;
 			});
 		});

test/js/samples/collapses-text-around-comments/expected-bundle.js

@@ -189,6 +189,8 @@ var proto = {
 	_unmount: _unmount
 };
 
+/* generated by Svelte v1.39.3 */
+
 var template = (function() {
 	return {
 		data: function () {

test/js/samples/collapses-text-around-comments/expected.js

@@ -1,3 +1,5 @@
+/* generated by Svelte v1.39.3 */
+
 import { appendNode, assign, createElement, createText, detachNode, init, insertNode, noop, proto, setAttribute } from "svelte/shared.js";
 
 var template = (function() {

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

@@ -165,6 +165,8 @@ var proto = {
 	_unmount: _unmount
 };
 
+/* generated by Svelte v1.39.3 */
+
 var template = (function() {
 	return {
 		computed: {

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

@@ -1,3 +1,5 @@
+/* generated by Svelte v1.39.3 */
+
 import { assign, differs, init, noop, proto } from "svelte/shared.js";
 
 var template = (function() {

test/js/samples/css-media-query/expected-bundle.js

@@ -185,6 +185,8 @@ var proto = {
 	_unmount: _unmount
 };
 
+/* generated by Svelte v1.39.3 */
+
 function encapsulateStyles(node) {
 	setAttribute(node, "svelte-2363328337", "");
 }

test/js/samples/css-media-query/expected.js

@@ -1,3 +1,5 @@
+/* generated by Svelte v1.39.3 */
+
 import { appendNode, assign, createElement, detachNode, init, insertNode, noop, proto, setAttribute } from "svelte/shared.js";
 
 function encapsulateStyles(node) {

test/js/samples/css-shadow-dom-keyframes/expected-bundle.js

@@ -185,6 +185,8 @@ var proto = {
 	_unmount: _unmount
 };
 
+/* generated by Svelte v1.39.3 */
+
 function create_main_fragment(state, component) {
 	var div, text;
 

test/js/samples/css-shadow-dom-keyframes/expected.js

@@ -1,3 +1,5 @@
+/* generated by Svelte v1.39.3 */
+
 import { appendNode, assign, createElement, createText, detachNode, init, insertNode, noop, proto } from "svelte/shared.js";
 
 function create_main_fragment(state, component) {

test/js/samples/each-block-changed-check/expected-bundle.js

@@ -198,6 +198,8 @@ var proto = {
 	_unmount: _unmount
 };
 
+/* generated by Svelte v1.39.3 */
+
 function create_main_fragment(state, component) {
 	var text, p, text_1;
 
@@ -271,6 +273,7 @@ function create_main_fragment(state, component) {
 	};
 }
 
+// (1:0) {{#each comments as comment, i}}
 function create_each_block(state, each_block_value, comment, i, component) {
 	var div, strong, text, text_1, span, text_2_value = comment.author, text_2, text_3, text_4_value = state.elapsed(comment.time, state.time), text_4, text_5, text_6, raw_value = comment.html, raw_before;
 

test/js/samples/each-block-changed-check/expected.js

@@ -1,3 +1,5 @@
+/* generated by Svelte v1.39.3 */
+
 import { appendNode, assign, createElement, createText, destroyEach, detachAfter, detachNode, init, insertNode, noop, proto } from "svelte/shared.js";
 
 function create_main_fragment(state, component) {
@@ -73,6 +75,7 @@ function create_main_fragment(state, component) {
 	};
 }
 
+// (1:0) {{#each comments as comment, i}}
 function create_each_block(state, each_block_value, comment, i, component) {
 	var div, strong, text, text_1, span, text_2_value = comment.author, text_2, text_3, text_4_value = state.elapsed(comment.time, state.time), text_4, text_5, text_6, raw_value = comment.html, raw_before;
 

test/js/samples/event-handlers-custom/expected-bundle.js

@@ -185,6 +185,8 @@ var proto = {
 	_unmount: _unmount
 };
 
+/* generated by Svelte v1.39.3 */
+
 var template = (function() {
 	return {
 		methods: {

test/js/samples/event-handlers-custom/expected.js

@@ -1,3 +1,5 @@
+/* generated by Svelte v1.39.3 */
+
 import { appendNode, assign, createElement, createText, detachNode, init, insertNode, noop, proto } from "svelte/shared.js";
 
 var template = (function() {

test/js/samples/if-block-no-update/expected-bundle.js

@@ -189,6 +189,8 @@ var proto = {
 	_unmount: _unmount
 };
 
+/* generated by Svelte v1.39.3 */
+
 function create_main_fragment(state, component) {
 	var if_block_anchor;
 
@@ -227,6 +229,7 @@ function create_main_fragment(state, component) {
 	};
 }
 
+// (1:0) {{#if foo}}
 function create_if_block(state, component) {
 	var p, text;
 
@@ -249,6 +252,7 @@ function create_if_block(state, component) {
 	};
 }
 
+// (3:0) {{else}}
 function create_if_block_1(state, component) {
 	var p, text;
 

test/js/samples/if-block-no-update/expected.js

@@ -1,3 +1,5 @@
+/* generated by Svelte v1.39.3 */
+
 import { appendNode, assign, createComment, createElement, createText, detachNode, init, insertNode, noop, proto } from "svelte/shared.js";
 
 function create_main_fragment(state, component) {
@@ -38,6 +40,7 @@ function create_main_fragment(state, component) {
 	};
 }
 
+// (1:0) {{#if foo}}
 function create_if_block(state, component) {
 	var p, text;
 
@@ -60,6 +63,7 @@ function create_if_block(state, component) {
 	};
 }
 
+// (3:0) {{else}}
 function create_if_block_1(state, component) {
 	var p, text;
 

test/js/samples/if-block-simple/expected-bundle.js

@@ -189,6 +189,8 @@ var proto = {
 	_unmount: _unmount
 };
 
+/* generated by Svelte v1.39.3 */
+
 function create_main_fragment(state, component) {
 	var if_block_anchor;
 
@@ -230,6 +232,7 @@ function create_main_fragment(state, component) {
 	};
 }
 
+// (1:0) {{#if foo}}
 function create_if_block(state, component) {
 	var p, text;
 

test/js/samples/if-block-simple/expected.js

@@ -1,3 +1,5 @@
+/* generated by Svelte v1.39.3 */
+
 import { appendNode, assign, createComment, createElement, createText, detachNode, init, insertNode, noop, proto } from "svelte/shared.js";
 
 function create_main_fragment(state, component) {
@@ -41,6 +43,7 @@ function create_main_fragment(state, component) {
 	};
 }
 
+// (1:0) {{#if foo}}
 function create_if_block(state, component) {
 	var p, text;
 

test/js/samples/inline-style-optimized-multiple/expected-bundle.js

@@ -181,6 +181,8 @@ var proto = {
 	_unmount: _unmount
 };
 
+/* generated by Svelte v1.39.3 */
+
 function create_main_fragment(state, component) {
 	var div;
 

test/js/samples/inline-style-optimized-multiple/expected.js

@@ -1,3 +1,5 @@
+/* generated by Svelte v1.39.3 */
+
 import { assign, createElement, detachNode, init, insertNode, noop, proto, setStyle } from "svelte/shared.js";
 
 function create_main_fragment(state, component) {

test/js/samples/inline-style-optimized-url/expected-bundle.js

@@ -181,6 +181,8 @@ var proto = {
 	_unmount: _unmount
 };
 
+/* generated by Svelte v1.39.3 */
+
 function create_main_fragment(state, component) {
 	var div;
 

test/js/samples/inline-style-optimized-url/expected.js

@@ -1,3 +1,5 @@
+/* generated by Svelte v1.39.3 */
+
 import { assign, createElement, detachNode, init, insertNode, noop, proto, setStyle } from "svelte/shared.js";
 
 function create_main_fragment(state, component) {

test/js/samples/inline-style-optimized/expected-bundle.js

@@ -181,6 +181,8 @@ var proto = {
 	_unmount: _unmount
 };
 
+/* generated by Svelte v1.39.3 */
+
 function create_main_fragment(state, component) {
 	var div;
 

test/js/samples/inline-style-optimized/expected.js

@@ -1,3 +1,5 @@
+/* generated by Svelte v1.39.3 */
+
 import { assign, createElement, detachNode, init, insertNode, noop, proto, setStyle } from "svelte/shared.js";
 
 function create_main_fragment(state, component) {

test/js/samples/inline-style-unoptimized/expected-bundle.js

@@ -181,6 +181,8 @@ var proto = {
 	_unmount: _unmount
 };
 
+/* generated by Svelte v1.39.3 */
+
 function create_main_fragment(state, component) {
 	var div, text, div_1, div_1_style_value;