Merge pull request #13 from cho45/sourcemaps2

Add sourceMappingURL

Author: cho45

lib/micro-template.js

@@ -23,8 +23,9 @@ const template = function (id, data) {
 					)
 				).join('') +
 				`/*end*/ return __this.ret;` +
-			`} catch (e) { throw new Error('TemplateError: ' + e + ' (on ${name} line ' + __this.line + ')'); }` +
-			`//@ sourceURL=${name}\n`
+			`} catch (e) { throw new Error('TemplateError: '+e+' (on ${name} line ' + __this.line + ')',{cause:e}); }` +
+			`//# sourceURL=${name}\n` + 
+			`//# sourceMappingURL=data:application/json,${encodeURIComponent(JSON.stringify({version:3, file:name, sources:[`${name}.ejs`], sourcesContent:[string], mappings:";;AAAA;"+Array(line-1).fill('AACA').join(';')}))}`
 		);
 		const func = new Function("__this", ...keys, body);
 		return function (stash) { return func.call(null, me.context = { escapeHTML: me.escapeHTML, line: 1, ret : '', stash: stash }, ...keys.map(key => stash[key])) };

test/test.js

@@ -9,6 +9,14 @@ import fs from 'fs';
 // template.get の上書き
 template.get = function (id) { return fs.readFileSync('test/data-' + id + '.tmpl', 'utf-8') };
 
+function templateWithCompiledFunction(stringTemplate, data) {
+	data = Object.assign({}, data);
+	data.__context = {};
+	stringTemplate += `\n<% __context.compiled = arguments.callee; %>`;
+	const result =  template(stringTemplate, data);
+	return [result, data.__context.compiled];
+}
+
 // --- template 基本テスト ---
 test('template renders with data', (t) => {
 	const result = template('<b><%= foo %></b><i><%= bar %></i>', { foo: 'foo', bar: 'bar' });
@@ -252,6 +260,18 @@ test('reference not found throws', (t) => {
 	);
 });
 
+test('TemplateError has correct cause', (t) => {
+	let thrownError;
+	assert.throws(() => {
+		template('<%= notfound %>', {});
+	}, e => {
+		thrownError = e;
+		return e instanceof Error && /TemplateError: ReferenceError: notfound is not defined/.test(e.message);
+	});
+	assert(thrownError.cause instanceof ReferenceError);
+	assert.strictEqual(thrownError.cause.message, 'notfound is not defined');
+});
+
 test('template with explicit throw', (t) => {
 	assert.throws(() => template('<% throw new Error("fail") %>', {}), e => e instanceof Error && /TemplateError: Error: fail/.test(e.message));
 });
@@ -304,3 +324,18 @@ test('template with properties script tags', (t) => {
 	});
 	assert.strictEqual(result, 'foobar');
 });
+
+test('template output includes sourceMappingURL comment', (t) => {
+	const [_, compiledFunction] = templateWithCompiledFunction('foo bar', {});
+	const compiledFunctionString = compiledFunction.toString();
+	console.log(compiledFunctionString);
+	const match = compiledFunctionString.match(/\n\/\/\# sourceMappingURL=data:application\/json,(.+)\n/);
+	assert(match, 'sourceMappingURL comment is present and correctly formatted');
+	const json = decodeURIComponent(match[1]);
+	let sourceMap;
+	assert.doesNotThrow(() => sourceMap = JSON.parse(json), 'sourceMappingURL JSON is valid');
+	console.log(sourceMap);
+	assert.strictEqual(sourceMap.version, 3, 'source map version is 3');
+	assert.ok(sourceMap.sourcesContent, 'source map has sourcesContent');
+	assert.ok(sourceMap.mappings, 'source map has mappings');
+});