upgrade magic-string, fix sourcemaps

compiler/generate/index.js

@@ -86,7 +86,7 @@ export default function generate ( parsed, source, options ) {
 						const { name } = flattenReference( node );
 
 						if ( parent && parent.type === 'CallExpression' && node === parent.callee ) {
-							if ( generator.helpers[ name ] ) generator.code.insertRight( node.start, `template.helpers.` );
+							if ( generator.helpers[ name ] ) generator.code.prependRight( node.start, `template.helpers.` );
 							return;
 						}
 
@@ -102,7 +102,7 @@ export default function generate ( parsed, source, options ) {
 							if ( !~usedContexts.indexOf( context ) ) usedContexts.push( context );
 						} else {
 							dependencies.push( node.name );
-							generator.code.insertRight( node.start, `root.` );
+							generator.code.prependRight( node.start, `root.` );
 							if ( !~usedContexts.indexOf( 'root' ) ) usedContexts.push( 'root' );
 						}
 
@@ -204,19 +204,19 @@ export default function generate ( parsed, source, options ) {
 				while ( /\s/.test( source[ i - 1 ] ) ) i--;
 
 				const indentation = source.slice( i, defaultExport.start );
-				generator.code.insertLeft( finalNode.end, `\n\n${indentation}return template;` );
+				generator.code.appendLeft( finalNode.end, `\n\n${indentation}return template;` );
 			}
 
 			defaultExport.declaration.properties.forEach( prop => {
 				templateProperties[ prop.key.name ] = prop.value;
 			});
 
-			generator.code.insertRight( parsed.js.content.start, 'var template = (function () {' );
+			generator.code.prependRight( parsed.js.content.start, 'var template = (function () {' );
 		} else {
-			generator.code.insertRight( parsed.js.content.start, '(function () {' );
+			generator.code.prependRight( parsed.js.content.start, '(function () {' );
 		}
 
-		generator.code.insertLeft( parsed.js.content.end, '}());' );
+		generator.code.appendLeft( parsed.js.content.end, '}());' );
 
 		[ 'helpers', 'events', 'components' ].forEach( key => {
 			if ( templateProperties[ key ] ) {
@@ -512,24 +512,27 @@ export default function generate ( parsed, source, options ) {
 		});
 	}
 
-	addString( getIntro( format, options, imports ) );
+	const intro = getIntro( format, options, imports );
+	if ( intro ) addString( intro );
 
 	// a filename is necessary for sourcemap generation
 	const filename = options.filename || 'SvelteComponent.html';
 
 	parts.forEach( str => {
+		const chunk = str.replace( pattern, '' );
+		if ( chunk ) addString( chunk );
+
 		const match = pattern.exec( str );
 
-		addString( str.replace( pattern, '' ) );
+		const snippet = generator.code.snip( +match[1], +match[2] );
 
 		compiled.addSource({
 			filename,
-			content: generator.code.snip( +match[1], +match[2] )
+			content: snippet
 		});
 	});
 
-	compiled.append( finalChunk );
-
+	addString( finalChunk );
 	addString( '\n\n' + getOutro( format, constructorName, options, imports ) );
 
 	return {

compiler/generate/visitors/attributes/addComponentAttributes.js

@@ -80,7 +80,7 @@ export default function addComponentAttributes ( generator, node, local ) {
 		else if ( attribute.type === 'EventHandler' ) {
 			// TODO verify that it's a valid callee (i.e. built-in or declared method)
 			generator.addSourcemapLocations( attribute.expression );
-			generator.code.insertRight( attribute.expression.start, 'component.' );
+			generator.code.prependRight( attribute.expression.start, 'component.' );
 
 			const usedContexts = new Set();
 			attribute.expression.arguments.forEach( arg => {

compiler/generate/visitors/attributes/addElementAttributes.js

@@ -116,7 +116,7 @@ export default function addElementAttributes ( generator, node, local ) {
 		else if ( attribute.type === 'EventHandler' ) {
 			// TODO verify that it's a valid callee (i.e. built-in or declared method)
 			generator.addSourcemapLocations( attribute.expression );
-			generator.code.insertRight( attribute.expression.start, 'component.' );
+			generator.code.prependRight( attribute.expression.start, 'component.' );
 
 			const usedContexts = new Set();
 			attribute.expression.arguments.forEach( arg => {

package.json

@@ -47,7 +47,7 @@
     "fuzzyset.js": "0.0.1",
     "jsdom": "^9.8.3",
     "locate-character": "^2.0.0",
-    "magic-string": "^0.16.0",
+    "magic-string": "^0.19.0",
     "mocha": "^3.1.2",
     "node-resolve": "^1.3.3",
     "nyc": "^9.0.1",

test/sourcemaps/basic/input.html

@@ -1,9 +1 @@
 {{foo.bar.baz}}
-
-<script>
-	export default {
-		onrender () {
-			console.log( 42 );
-		}
-	};
-</script>

test/sourcemaps/basic/test.js

@@ -1,8 +1,26 @@
 export function test ({ assert, smc, locateInSource, locateInGenerated }) {
 	const expected = locateInSource( 'foo.bar.baz' );
-	const loc = locateInGenerated( 'foo.bar.baz' );
 
-	const actual = smc.originalPositionFor({
+	let loc;
+	let actual;
+
+	loc = locateInGenerated( 'foo.bar.baz' );
+
+	actual = smc.originalPositionFor({
+		line: loc.line + 1,
+		column: loc.column
+	});
+
+	assert.deepEqual( actual, {
+		source: 'SvelteComponent.html',
+		name: null,
+		line: expected.line + 1,
+		column: expected.column
+	});
+
+	loc = locateInGenerated( 'foo.bar.baz', loc.character + 1 );
+
+	actual = smc.originalPositionFor({
 		line: loc.line + 1,
 		column: loc.column
 	});
@@ -10,7 +28,7 @@ export function test ({ assert, smc, locateInSource, locateInGenerated }) {
 	assert.deepEqual( actual, {
 		source: 'SvelteComponent.html',
 		name: null,
-		line: expected.line,
+		line: expected.line + 1,
 		column: expected.column
 	});
 }

test/sourcemaps/script/input.html

@@ -0,0 +1,9 @@
+<div></div>
+
+<script>
+	export default {
+		onrender () {
+			console.log( 42 );
+		}
+	}
+</script>

test/sourcemaps/script/test.js

@@ -0,0 +1,16 @@
+export function test ({ assert, smc, locateInSource, locateInGenerated }) {
+	const expected = locateInSource( '42' );
+	const loc = locateInGenerated( '42' );
+
+	const actual = smc.originalPositionFor({
+		line: loc.line + 1,
+		column: loc.column
+	});
+
+	assert.deepEqual( actual, {
+		source: 'SvelteComponent.html',
+		name: null,
+		line: expected.line + 1,
+		column: expected.column
+	});
+}