shuffle some stuff around

src/generators/Generator.ts

@@ -17,7 +17,7 @@ import getName from '../utils/getName';
 import Stylesheet from '../css/Stylesheet';
 import { test } from '../config';
 import Fragment from './nodes/Fragment';
-import shared from './dom/shared'; // TODO move this file
+import shared from './shared';
 import { Node, GenerateOptions, ShorthandImport, Ast, CompileOptions, CustomElementOptions } from '../interfaces';
 
 interface Computation {
@@ -193,6 +193,8 @@ export default class Generator {
 		this.fragment = new Fragment(this, ast.html);
 		// this.walkTemplate();
 		if (!this.customElement) this.stylesheet.reify();
+
+		stylesheet.warnOnUnusedSelectors(options.onwarn);
 	}
 
 	addSourcemapLocations(node: Node) {
@@ -212,9 +214,29 @@ export default class Generator {
 		return this.aliases.get(name);
 	}
 
-	generate(result: string, options: CompileOptions, { banner = '', helpers, name, format }: GenerateOptions ) {
+	generate(result: string, options: CompileOptions, { banner = '', name, format }: GenerateOptions ) {
 		const pattern = /\[✂(\d+)-(\d+)$/;
 
+		const helpers = new Set();
+
+		// TODO use same regex for both
+		result = result.replace(options.generate === 'ssr' ? /(@+|#+|%+)(\w*(?:-\w*)?)/g : /(%+|@+)(\w*(?:-\w*)?)/g, (match: string, sigil: string, name: string) => {
+			if (sigil === '@') {
+				if (name in shared) {
+					if (options.dev && `${name}Dev` in shared) name = `${name}Dev`;
+					helpers.add(name);
+				}
+
+				return this.alias(name);
+			}
+
+			if (sigil === '%') {
+				return this.templateVars.get(name);
+			}
+
+			return sigil.slice(1) + name;
+		});
+
 		let importedHelpers;
 
 		if (options.shared) {
@@ -233,8 +255,8 @@ export default class Generator {
 
 			importedHelpers = [];
 
-			helpers.forEach(key => {
-				const str = shared[key];
+			helpers.forEach(name => {
+				const str = shared[name];
 				const code = new MagicString(str);
 				const expression = parseExpressionAt(str, 0);
 
@@ -267,14 +289,14 @@ export default class Generator {
 					},
 				});
 
-				if (key === 'transitionManager') {
+				if (name === 'transitionManager') {
 					// special case
 					const global = `_svelteTransitionManager`;
 
 					inlineHelpers += `\n\nvar ${this.alias('transitionManager')} = window.${global} || (window.${global} = ${code});\n\n`;
-				} else if (key === 'escaped' || key === 'missingComponent') {
+				} else if (name === 'escaped' || name === 'missingComponent') {
 					// vars are an awkward special case... would be nice to avoid this
-					const alias = this.alias(key);
+					const alias = this.alias(name);
 					inlineHelpers += `\n\nconst ${alias} = ${code};`
 				} else {
 					const alias = this.alias(expression.id.name);

src/generators/dom/Block.ts

@@ -3,7 +3,6 @@ import deindent from '../../utils/deindent';
 import { escape } from '../../utils/stringify';
 import { DomGenerator } from './index';
 import { Node } from '../../interfaces';
-import shared from './shared';
 
 export interface BlockOptions {
 	name: string;

src/generators/dom/index.ts

@@ -76,8 +76,6 @@ export default function dom(
 	// prevent fragment being created twice (#1063)
 	if (options.customElement) block.builders.create.addLine(`this.c = @noop;`);
 
-	generator.stylesheet.warnOnUnusedSelectors(options.onwarn);
-
 	const builder = new CodeBuilder();
 	const computationBuilder = new CodeBuilder();
 	const computationDeps = new Set();
@@ -361,26 +359,7 @@ export default function dom(
 		${immutable && `${name}.prototype._differs = @_differsImmutable;`}
 	`);
 
-	const helpers = new Set();
-
-	let result = builder
-		.toString()
-		.replace(/(%+|@+)(\w*(?:-\w*)?)/g, (match: string, sigil: string, name: string) => {
-			if (sigil === '@') {
-				if (name in shared) {
-					if (options.dev && `${name}Dev` in shared) name = `${name}Dev`;
-					helpers.add(name);
-				}
-
-				return generator.alias(name);
-			}
-
-			if (sigil === '%') {
-				return generator.templateVars.get(name);
-			}
-
-			return sigil.slice(1) + name;
-		});
+	let result = builder.toString();
 
 	const filename = options.filename && (
 		typeof process !== 'undefined' ? options.filename.replace(process.cwd(), '').replace(/^[\/\\]/, '') : options.filename
@@ -389,7 +368,6 @@ export default function dom(
 	return generator.generate(result, options, {
 		banner: `/* ${filename ? `${filename} ` : ``}generated by Svelte v${"__VERSION__"} */`,
 		sharedPath,
-		helpers,
 		name,
 		format,
 	});

src/generators/nodes/EachBlock.ts

@@ -5,7 +5,7 @@ import Block from '../dom/Block';
 import createDebuggingComment from '../../utils/createDebuggingComment';
 import Expression from './shared/Expression';
 import mapChildren from './shared/mapChildren';
-import TemplateScope from '../dom/TemplateScope';
+import TemplateScope from './shared/TemplateScope';
 
 export default class EachBlock extends Node {
 	type: 'EachBlock';

src/generators/nodes/Fragment.ts

@@ -3,7 +3,7 @@ import { DomGenerator } from '../dom/index';
 import Generator from '../Generator';
 import mapChildren from './shared/mapChildren';
 import Block from '../dom/Block';
-import TemplateScope from '../dom/TemplateScope';
+import TemplateScope from './shared/TemplateScope';
 
 export default class Fragment extends Node {
 	block: Block;

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

@@ -27,8 +27,6 @@ export class SsrGenerator extends Generator {
 		this.bindings = [];
 		this.renderCode = '';
 		this.appendTargets = [];
-
-		this.stylesheet.warnOnUnusedSelectors(options.onwarn);
 	}
 
 	append(code: string) {
@@ -157,17 +155,9 @@ export default function ssr(
 		var warned = false;
 
 		${templateProperties.preload && `${name}.preload = %preload;`}
-	`.replace(/(@+|#+|%+)(\w*(?:-\w*)?)/g, (match: string, sigil: string, name: string) => {
-		if (sigil === '@') {
-			helpers.add(name);
-			return generator.alias(name);
-		}
-
-		if (sigil === '%') return generator.templateVars.get(name);
-		return sigil.slice(1) + name;
-	});
+	`;
 
-	return generator.generate(result, options, { name, format, helpers });
+	return generator.generate(result, options, { name, format });
 }
 
 function trim(nodes) {

src/interfaces.ts

@@ -71,7 +71,6 @@ export interface GenerateOptions {
 	format: ModuleFormat;
 	banner?: string;
 	sharedPath?: string;
-	helpers: Set<string>;
 }
 
 export interface ShorthandImport {

src/shared/_build.js

@@ -32,7 +32,7 @@ fs.readdirSync(__dirname).forEach(file => {
 });
 
 fs.writeFileSync(
-	'src/generators/dom/shared.ts',
+	'src/generators/shared.ts',
 	`// this file is auto-generated, do not edit it
 const shared: Record<string, string> = ${JSON.stringify(declarations, null, '\t')};