move vars out of stats

src/Stats.ts

@@ -1,5 +1,3 @@
-import Component from './compile/Component';
-
 const now = (typeof process !== 'undefined' && process.hrtime)
 	? () => {
 		const t = process.hrtime();
@@ -63,41 +61,13 @@ export default class Stats {
 		this.currentChildren = this.currentTiming ? this.currentTiming.children : this.timings;
 	}
 
-	render(component: Component) {
+	render() {
 		const timings = Object.assign({
 			total: now() - this.startTime
 		}, collapseTimings(this.timings));
 
-		// TODO would be good to have this info even
-		// if options.generate is false
-		const imports = component && component.imports.map(node => {
-			return {
-				source: node.source.value,
-				specifiers: node.specifiers.map(specifier => {
-					return {
-						name: (
-							specifier.type === 'ImportDefaultSpecifier' ? 'default' :
-							specifier.type === 'ImportNamespaceSpecifier' ? '*' :
-							specifier.imported.name
-						),
-						as: specifier.local.name
-					};
-				})
-			}
-		});
-
 		return {
-			timings,
+			timings
-			vars: component.vars.filter(variable => !variable.global && !variable.implicit && !variable.internal).map(variable => ({
-				name: variable.name,
-				export_name: variable.export_name || null,
-				injected: variable.injected || false,
-				module: variable.module || false,
-				mutated: variable.mutated || false,
-				reassigned: variable.reassigned || false,
-				referenced: variable.referenced || false,
-				writable: variable.writable || false
-			}))
 		};
 	}
 }

src/compile/Component.ts

@@ -217,106 +217,121 @@ export default class Component {
 	}
 
 	generate(result: string) {
-		const { compileOptions, name } = this;
+		let js = null;
-		const { format = 'esm' } = compileOptions;
+		let css = null;
 
-		const banner = `/* ${this.file ? `${this.file} ` : ``}generated by Svelte v${"__VERSION__"} */`;
+		if (result) {
+			const { compileOptions, name } = this;
+			const { format = 'esm' } = compileOptions;
 
-		// TODO use same regex for both
+			const banner = `/* ${this.file ? `${this.file} ` : ``}generated by Svelte v${"__VERSION__"} */`;
-		result = result.replace(compileOptions.generate === 'ssr' ? /(@+|#+)(\w*(?:-\w*)?)/g : /(@+)(\w*(?:-\w*)?)/g, (match: string, sigil: string, name: string) => {
-			if (sigil === '@') {
-				if (internal_exports.has(name)) {
-					if (compileOptions.dev && internal_exports.has(`${name}Dev`)) name = `${name}Dev`;
-					this.helpers.add(name);
-				}
 
-				return this.alias(name);
+			// TODO use same regex for both
-			}
+			result = result.replace(compileOptions.generate === 'ssr' ? /(@+|#+)(\w*(?:-\w*)?)/g : /(@+)(\w*(?:-\w*)?)/g, (match: string, sigil: string, name: string) => {
+				if (sigil === '@') {
+					if (internal_exports.has(name)) {
+						if (compileOptions.dev && internal_exports.has(`${name}Dev`)) name = `${name}Dev`;
+						this.helpers.add(name);
+					}
 
-			return sigil.slice(1) + name;
+					return this.alias(name);
-		});
+				}
 
-		const importedHelpers = Array.from(this.helpers)
+				return sigil.slice(1) + name;
-			.sort()
-			.map(name => {
-				const alias = this.alias(name);
-				return { name, alias };
 			});
 
-		const module = wrapModule(
+			const importedHelpers = Array.from(this.helpers)
-			result,
+				.sort()
-			format,
+				.map(name => {
-			name,
+					const alias = this.alias(name);
-			compileOptions,
+					return { name, alias };
-			banner,
+				});
-			compileOptions.sveltePath,
-			importedHelpers,
-			this.imports,
-			this.vars.filter(variable => variable.module && variable.export_name).map(variable => ({
-				name: variable.name,
-				as: variable.export_name
-			})),
-			this.source
-		);
 
-		const parts = module.split('✂]');
+			const module = wrapModule(
-		const finalChunk = parts.pop();
+				result,
+				format,
+				name,
+				compileOptions,
+				banner,
+				compileOptions.sveltePath,
+				importedHelpers,
+				this.imports,
+				this.vars.filter(variable => variable.module && variable.export_name).map(variable => ({
+					name: variable.name,
+					as: variable.export_name
+				})),
+				this.source
+			);
 
-		const compiled = new Bundle({ separator: '' });
+			const parts = module.split('✂]');
+			const finalChunk = parts.pop();
 
-		function addString(str: string) {
+			const compiled = new Bundle({ separator: '' });
-			compiled.addSource({
-				content: new MagicString(str),
-			});
-		}
 
-		const { filename } = compileOptions;
+			function addString(str: string) {
+				compiled.addSource({
+					content: new MagicString(str),
+				});
+			}
 
-		// special case — the source file doesn't actually get used anywhere. we need
+			const { filename } = compileOptions;
-		// to add an empty file to populate map.sources and map.sourcesContent
+
-		if (!parts.length) {
+			// special case — the source file doesn't actually get used anywhere. we need
-			compiled.addSource({
+			// to add an empty file to populate map.sources and map.sourcesContent
-				filename,
+			if (!parts.length) {
-				content: new MagicString(this.source).remove(0, this.source.length),
+				compiled.addSource({
-			});
+					filename,
-		}
+					content: new MagicString(this.source).remove(0, this.source.length),
+				});
+			}
 
-		const pattern = /\[✂(\d+)-(\d+)$/;
+			const pattern = /\[✂(\d+)-(\d+)$/;
 
-		parts.forEach((str: string) => {
+			parts.forEach((str: string) => {
-			const chunk = str.replace(pattern, '');
+				const chunk = str.replace(pattern, '');
-			if (chunk) addString(chunk);
+				if (chunk) addString(chunk);
 
-			const match = pattern.exec(str);
+				const match = pattern.exec(str);
 
-			const snippet = this.code.snip(+match[1], +match[2]);
+				const snippet = this.code.snip(+match[1], +match[2]);
 
-			compiled.addSource({
+				compiled.addSource({
-				filename,
+					filename,
-				content: snippet,
+					content: snippet,
+				});
 			});
-		});
 
-		addString(finalChunk);
+			addString(finalChunk);
 
-		const css = compileOptions.customElement ?
+			css = compileOptions.customElement ?
-			{ code: null, map: null } :
+				{ code: null, map: null } :
-			this.stylesheet.render(compileOptions.cssOutputFilename, true);
+				this.stylesheet.render(compileOptions.cssOutputFilename, true);
 
-		const js = {
+			js = {
-			code: compiled.toString(),
+				code: compiled.toString(),
-			map: compiled.generateMap({
+				map: compiled.generateMap({
-				includeContent: true,
+					includeContent: true,
-				file: compileOptions.outputFilename,
+					file: compileOptions.outputFilename,
-			})
+				})
-		};
+			};
+		}
 
 		return {
 			js,
 			css,
 			ast: this.ast,
 			warnings: this.warnings,
-			stats: this.stats.render(this)
+			vars: this.vars.filter(v => !v.global && !v.implicit && !v.internal).map(v => ({
+				name: v.name,
+				export_name: v.export_name || null,
+				injected: v.injected || false,
+				module: v.module || false,
+				mutated: v.mutated || false,
+				reassigned: v.reassigned || false,
+				referenced: v.referenced || false,
+				writable: v.writable || false
+			})),
+			stats: this.stats.render()
 		};
 	}
 

src/compile/index.ts

@@ -95,13 +95,11 @@ export default function compile(source: string, options: CompileOptions = {}) {
 	);
 	stats.stop('create component');
 
-	if (options.generate === false) {
+	const js = options.generate === false
-		return { ast, warnings, stats: stats.render(component), js: null, css: null };
+		? null
-	}
+		: options.generate === 'ssr'
-
+			? renderSSR(component, options)
-	const js = options.generate === 'ssr'
+			: renderDOM(component, options);
-		? renderSSR(component, options)
-		: renderDOM(component, options);
 
 	return component.generate(js);
 }

test/stats/samples/duplicate-globals/_config.js

@@ -1,5 +0,0 @@
-export default {
-	test(assert, stats) {
-		assert.deepEqual(stats.vars, []);
-	},
-};

test/stats/samples/implicit-action/_config.js

@@ -1,5 +0,0 @@
-export default {
-	test(assert, stats) {
-		assert.deepEqual(stats.vars, []);
-	},
-};

test/stats/samples/implicit/_config.js

@@ -1,5 +0,0 @@
-export default {
-	test(assert, stats) {
-		assert.deepEqual(stats.vars, []);
-	},
-};

test/stats/samples/template-references/_config.js

@@ -1,5 +0,0 @@
-export default {
-	test(assert, stats) {
-		assert.deepEqual(stats.vars, []);
-	},
-};

test/stats/samples/undeclared/_config.js

@@ -1,5 +0,0 @@
-export default {
-	test(assert, stats) {
-		assert.deepEqual(stats.vars, []);
-	},
-};

test/vars/index.js

@@ -0,0 +1,60 @@
+import * as fs from 'fs';
+import * as assert from 'assert';
+import { svelte, loadConfig, tryToLoadJson } from '../helpers.js';
+
+describe('vars', () => {
+	fs.readdirSync('test/vars/samples').forEach(dir => {
+		if (dir[0] === '.') return;
+
+		// add .solo to a sample directory name to only run that test
+		const solo = /\.solo/.test(dir);
+		const skip = /\.skip/.test(dir);
+
+		if (solo && process.env.CI) {
+			throw new Error('Forgot to remove `solo: true` from test');
+		}
+
+		(solo ? it.only : skip ? it.skip : it)(dir, () => {
+			const config = loadConfig(`./vars/samples/${dir}/_config.js`);
+			const filename = `test/vars/samples/${dir}/input.svelte`;
+			const input = fs.readFileSync(filename, 'utf-8').replace(/\s+$/, '');
+
+			const expectedError = tryToLoadJson(
+				`test/vars/samples/${dir}/error.json`
+			);
+
+			let result;
+			let error;
+
+			try {
+				result = svelte.compile(input, config.options);
+				config.test(assert, result.vars);
+			} catch (e) {
+				error = e;
+			}
+
+			if (error || expectedError) {
+				if (error && !expectedError) {
+					throw error;
+				}
+
+				if (expectedError && !error) {
+					throw new Error(`Expected an error: ${expectedError.message}`);
+				}
+
+				assert.equal(error.message, expectedError.message);
+				assert.deepEqual(error.start, expectedError.start);
+				assert.deepEqual(error.end, expectedError.end);
+				assert.equal(error.pos, expectedError.pos);
+			}
+		});
+	});
+
+	it('returns a vars object when options.generate is false', () => {
+		const { vars } = svelte.compile('', {
+			generate: false
+		});
+
+		assert.ok(Array.isArray(vars));
+	});
+});

test/vars/samples/duplicate-globals/_config.js

@@ -0,0 +1,5 @@
+export default {
+	test(assert, vars) {
+		assert.deepEqual(vars, []);
+	},
+};

test/vars/samples/duplicate-non-hoistable/_config.js

@@ -1,6 +1,6 @@
 export default {
-	test(assert, stats) {
+	test(assert, vars) {
-		assert.deepEqual(stats.vars, [
+		assert.deepEqual(vars, [
 			{
 				name: 'console',
 				injected: false,

test/vars/samples/duplicate-vars/_config.js

@@ -1,6 +1,6 @@
 export default {
-	test(assert, stats) {
+	test(assert, vars) {
-		assert.deepEqual(stats.vars, [
+		assert.deepEqual(vars, [
 			{
 				name: 'foo',
 				injected: false,

test/vars/samples/implicit-action/_config.js

@@ -0,0 +1,5 @@
+export default {
+	test(assert, vars) {
+		assert.deepEqual(vars, []);
+	},
+};

test/vars/samples/implicit-reactive/_config.js

@@ -1,6 +1,6 @@
 export default {
-	test(assert, stats) {
+	test(assert, vars) {
-		assert.deepEqual(stats.vars, [
+		assert.deepEqual(vars, [
 			{
 				name: 'a',
 				injected: false,

test/vars/samples/implicit/_config.js

@@ -0,0 +1,5 @@
+export default {
+	test(assert, vars) {
+		assert.deepEqual(vars, []);
+	},
+};

test/vars/samples/imports/_config.js

@@ -1,6 +1,6 @@
 export default {
-	test(assert, stats) {
+	test(assert, vars) {
-		assert.deepEqual(stats.vars, [
+		assert.deepEqual(vars, [
 			{
 				name: 'x',
 				export_name: null,

test/vars/samples/mutated-vs-reassigned-bindings/_config.js

@@ -1,6 +1,6 @@
 export default {
-	test(assert, stats) {
+	test(assert, vars) {
-		assert.deepEqual(stats.vars, [
+		assert.deepEqual(vars, [
 			{
 				name: 'count',
 				export_name: null,

test/vars/samples/mutated-vs-reassigned/_config.js

@@ -1,6 +1,6 @@
 export default {
-	test(assert, stats) {
+	test(assert, vars) {
-		assert.deepEqual(stats.vars, [
+		assert.deepEqual(vars, [
 			{
 				name: 'count',
 				export_name: null,

test/vars/samples/props/_config.js

@@ -1,6 +1,6 @@
 export default {
-	test(assert, stats) {
+	test(assert, vars) {
-		assert.deepEqual(stats.vars, [
+		assert.deepEqual(vars, [
 			{
 				name: 'name',
 				export_name: 'name',

test/vars/samples/store-referenced/_config.js

@@ -1,6 +1,6 @@
 export default {
-	test(assert, stats) {
+	test(assert, vars) {
-		assert.deepEqual(stats.vars, [
+		assert.deepEqual(vars, [
 			{
 				name: 'foo',
 				export_name: null,

test/vars/samples/store-unreferenced/_config.js

@@ -1,6 +1,6 @@
 export default {
-	test(assert, stats) {
+	test(assert, vars) {
-		assert.deepEqual(stats.vars, [
+		assert.deepEqual(vars, [
 			{
 				name: 'foo',
 				export_name: null,

test/vars/samples/template-references/_config.js

@@ -0,0 +1,5 @@
+export default {
+	test(assert, vars) {
+		assert.deepEqual(vars, []);
+	},
+};

test/vars/samples/undeclared/_config.js

@@ -0,0 +1,5 @@
+export default {
+	test(assert, vars) {
+		assert.deepEqual(vars, []);
+	},
+};