make some code style adjustments

Author: Conduitry

src/mapping.js

@@ -12,7 +12,7 @@ class GeneratedFragmentMapper {
 	}
 
 	offset_in_fragment(offset) {
-		return offset - this.diff.generated_start
+		return offset - this.diff.generated_start;
 	}
 }
 
@@ -91,7 +91,7 @@ export class DocumentMapper {
 				generated_fragment_mapper: new GeneratedFragmentMapper(generated_code, diff),
 				source_mapper: new SourceMapper(diff.map),
 				original_fragment_mapper: new OriginalFragmentMapper(original_code, diff)
-			}
+			};
 		});
 	}
 

src/postprocess.js

@@ -57,7 +57,7 @@ const transform_message = ({ transformed_code }, { unoffsets, dedent, indentatio
 			// We need the offset at the line relative to dedent's total_offsets. The dedents
 			// start at the point in the total transformed code where a subset of the code was transformed.
 			// Therefore substract (unoffsets.lines + 1) which marks the start of that transformation.
-			// Add +1 afterwards because total_offsets are 1-index-based. 
+			// Add +1 afterwards because total_offsets are 1-index-based.
 			message.fix.range[0] += total_offsets[fix_pos_start.line - unoffsets.lines + 2];
 			message.fix.range[1] += total_offsets[fix_pos_end.line - unoffsets.lines + 2];
 		}
@@ -120,9 +120,9 @@ const is_valid_message = (block, message, translation) => {
 		case 'no-restricted-syntax': return message.nodeType !== 'LabeledStatement' || get_identifier(get_referenced_string(block, message)) !== '$';
 		case 'no-self-assign': return !state.var_names.has(get_identifier(get_referenced_string(block, message)));
 		case 'no-undef': return get_referenced_string(block, message) !== '$$Generic';
+		case 'no-unused-labels': return get_referenced_string(block, message) !== '$';
 		case '@typescript-eslint/no-unused-vars':
 		case 'no-unused-vars': return !['$$Props', '$$Slots', '$$Events'].includes(get_referenced_string(block, message));
-		case 'no-unused-labels': return get_referenced_string(block, message) !== '$';
 		case '@typescript-eslint/quotes':
 		case 'quotes': return !translation.options.in_quoted_attribute;
 	}

src/preprocess.js

@@ -22,20 +22,20 @@ const find_contextual_names = (compiler, node) => {
 		}
 	}
 };
-// let-declaration when using TypeScript which is able to infer the type value of a autosubscribed store
-const tsLet = (name) =>
-	name[0] === '$' ?
+// let-declaration that (when using TypeScript) is able to infer the type value of a autosubscribed store
+const make_let = (name, is_typescript) =>
+	is_typescript && name[0] === '$' ?
 	// Disable eslint on that line because it may result in a "used before defined" error
 	`declare let ${name}:Parameters<Parameters<typeof ${name.slice(1)}.subscribe>[0]>[0]; // eslint-disable-line\n` :
 	`let ${name};`;
-// ignore_styles when a `lang=` or `type=` attribute is present on the <style> tag
-const ignoreStylesFallback = ({ type, lang }) => !!type || !!lang;
 
+	// ignore_styles when a `lang=` or `type=` attribute is present on the <style> tag
+const ignore_styles_fallback = ({ type, lang }) => !!type || !!lang;
 
 // extract scripts to lint from component definition
 export const preprocess = text => {
 	const compiler = processor_options.custom_compiler || default_compiler || (default_compiler = require('svelte/compiler'));
-	const ignore_styles = processor_options.ignore_styles ? processor_options.ignore_styles : ignoreStylesFallback;
+	const ignore_styles = processor_options.ignore_styles ? processor_options.ignore_styles : ignore_styles_fallback;
 	if (ignore_styles) {
 		// wipe the appropriate <style> tags in the file
 		text = text.replace(/<style(\s[^]*?)?>[^]*?<\/style>/gi, (match, attributes = '') => {
@@ -121,15 +121,9 @@ export const preprocess = text => {
 		const block = new_block();
 		state.blocks.set(with_file_ending('instance'), block);
 
+		block.transformed_code = vars.filter(v => v.injected || !processor_options.typescript && v.module).map(v => make_let(v.name, processor_options.typescript)).join('');
 		if (ast.module && processor_options.typescript) {
-			block.transformed_code = vars.filter(v => v.injected).map(v => tsLet(v.name)).join('');
 			block.transformed_code += text.slice(ast.module.content.start, ast.module.content.end);
-		} else {
-			if (processor_options.typescript) {
-				block.transformed_code = vars.filter(v => v.injected || v.module).map(v => tsLet(v.name)).join('');
-			} else {
-				block.transformed_code = vars.filter(v => v.injected || v.module).map(v => `let ${v.name};`).join('');
-			}
 		}
 
 		get_translation(text, block, ast.instance.content);
@@ -150,7 +144,7 @@ export const preprocess = text => {
 			if (ast.instance || vars.length) {
 				block.transformed_code += '\n';
 			}
-			block.transformed_code += vars.filter(v => v.injected).map(v => tsLet(v.name)).join('');
+			block.transformed_code += vars.filter(v => v.injected).map(v => make_let(v.name, true)).join('');
 			if (ast.instance) {
 				block.transformed_code += text.slice(ast.instance.content.start, ast.instance.content.end);
 			}
@@ -257,10 +251,10 @@ function compile_code(text, compiler, processor_options) {
 			transformers: {
 				before: [ts_import_transformer]
 			}
-		}
+		};
 
 		// See if we can use `preserveValueImports` instead of the transformer (TS >= 4.5)
-		const ts_version = ts.version.split(".").map(str => parseInt(str, 10));
+		const ts_version = ts.version.split('.').map(str => parseInt(str, 10));
 		if (ts_version[0] > 4 || (ts_version[0] === 4 && ts_version[1] >= 5)) {
 			ts_options.compilerOptions.preserveValueImports = true;
 			ts_options.transformers = {};
@@ -307,7 +301,7 @@ function compile_code(text, compiler, processor_options) {
 		// if we do a full recompile Svelte can fail due to the blank script tag not declaring anything
 		// so instead we just parse for the AST (which is likely faster, anyways)
 		const ast = compiler.parse(text, { ...processor_options.compiler_options });
-		const{ warnings, vars } = ts_result;
+		const { warnings, vars } = ts_result;
 		return { ast, warnings, vars, mapper };
 	}
 }

src/processor_options.js

@@ -8,7 +8,7 @@ if (!linter_paths.length) {
 // There may be more than one instance of the linter when we're in a workspace with multiple directories.
 // We first try to find the one that's inside the same node_modules directory as this plugin.
 // If that can't be found for some reason, we assume the one we want is the last one in the array.
-const current_node_modules_path = __dirname.replace(/(?<=[/\\]node_modules[/\\]).*$/, '')
+const current_node_modules_path = __dirname.replace(/(?<=[/\\]node_modules[/\\]).*$/, '');
 const linter_path = linter_paths.find(path => path.startsWith(current_node_modules_path)) || linter_paths.pop();
 const { Linter } = require(linter_path);
 

test/index.js

@@ -35,7 +35,7 @@ async function run() {
 
 		assert.equal(actual.length, expected.length);
 		assert.deepStrictEqual(actual, actual.map((msg, i) => ({ ...msg, ...expected[i] })));
-		
+
 		if (fs.existsSync(path_fixed)) {
 			const fixed = SourceCodeFixer.applyFixes(fs.readFileSync(path_input, 'utf-8'), actual).output;
 			assert.deepStrictEqual(fixed, fs.readFileSync(path_fixed, 'utf-8'))