renamed StringWithSourcemap to MappedCode

Author: ehrencrona

src/compiler/compile/Component.ts

@@ -29,7 +29,7 @@ import add_to_set from './utils/add_to_set';
 import check_graph_for_cycles from './utils/check_graph_for_cycles';
 import { print, x, b } from 'code-red';
 import { is_reserved_keyword } from './utils/reserved_keywords';
-import { apply_preprocessor_sourcemap } from '../utils/string_with_sourcemap';
+import { apply_preprocessor_sourcemap } from '../utils/mapped_code';
 import Element from './nodes/Element';
 import { DecodedSourceMap, RawSourceMap } from '@ampproject/remapping/dist/types/types';
 

src/compiler/compile/render_dom/index.ts

@@ -7,7 +7,7 @@ import { extract_names, Scope } from '../utils/scope';
 import { invalidate } from './invalidate';
 import Block from './Block';
 import { ClassDeclaration, FunctionExpression, Node, Statement, ObjectExpression, Expression } from 'estree';
-import { apply_preprocessor_sourcemap } from '../../utils/string_with_sourcemap';
+import { apply_preprocessor_sourcemap } from '../../utils/mapped_code';
 import { RawSourceMap, DecodedSourceMap } from '@ampproject/remapping/dist/types/types';
 
 export default function dom(

src/compiler/preprocess/index.ts

@@ -1,6 +1,6 @@
 import { RawSourceMap, DecodedSourceMap } from '@ampproject/remapping/dist/types/types';
 import { getLocator } from 'locate-character';
-import { StringWithSourcemap, SourceLocation, sourcemap_add_offset, combine_sourcemaps } from '../utils/string_with_sourcemap';
+import { MappedCode, SourceLocation, sourcemap_add_offset, combine_sourcemaps } from '../utils/mapped_code';
 import { decode_map } from './decode_sourcemap';
 import { replace_in_code, Source } from './replace_in_code';
 import { Preprocessor, PreprocessorGroup, Processed } from './types';
@@ -67,14 +67,14 @@ class PreprocessResult {
 }
 
 /**
- * Convert preprocessor output for the tag content into StringWithSourceMap
+ * Convert preprocessor output for the tag content into MappedCode
  */
-function processed_content_to_sws(
+function processed_content_to_code(
 	processed: Processed,
 	location: SourceLocation,
 	file_basename: string
-): StringWithSourcemap {
-	// Convert the preprocessed code and its sourcemap to a StringWithSourcemap
+): MappedCode {
+	// Convert the preprocessed code and its sourcemap to a MappedCode
 	let decoded_map: DecodedSourceMap;
 	if (processed.map) {
 		decoded_map = decode_map(processed);
@@ -86,30 +86,30 @@ function processed_content_to_sws(
 		}
 	}
 
-	return StringWithSourcemap.from_processed(processed.code, decoded_map);
+	return MappedCode.from_processed(processed.code, decoded_map);
 }
 
 /**
- * Given the whole tag including content, return a `StringWithSourcemap`
+ * Given the whole tag including content, return a `MappedCode`
  * representing the tag content replaced with `processed`.
  */
-function processed_tag_to_sws(
+function processed_tag_to_code(
 	processed: Processed,
 	tag_name: 'style' | 'script',
 	attributes: string,
-	{ source, file_basename, get_location }: Source): StringWithSourcemap {
-	const build_sws = (source: string, offset: number) =>
-		StringWithSourcemap.from_source(file_basename, source, get_location(offset));
+	{ source, file_basename, get_location }: Source): MappedCode {
+	const build_mapped_code = (source: string, offset: number) =>
+		MappedCode.from_source(file_basename, source, get_location(offset));
 
 	const tag_open = `<${tag_name}${attributes || ''}>`;
 	const tag_close = `</${tag_name}>`;
 
-	const tag_open_sws = build_sws(tag_open, 0);
-	const tag_close_sws = build_sws(tag_close, tag_open.length + source.length);
+	const tag_open_code = build_mapped_code(tag_open, 0);
+	const tag_close_code = build_mapped_code(tag_close, tag_open.length + source.length);
 
-	const content_sws = processed_content_to_sws(processed, get_location(tag_open.length), file_basename);
+	const content_code = processed_content_to_code(processed, get_location(tag_open.length), file_basename);
 
-	return tag_open_sws.concat(content_sws).concat(tag_close_sws);
+	return tag_open_code.concat(content_code).concat(tag_close_code);
 }
 
 function parse_tag_attributes(str: string) {
@@ -143,9 +143,9 @@ async function process_tag(
 		attributes = '',
 		content = '',
 		tag_offset: number
-	): Promise<StringWithSourcemap> {
+	): Promise<MappedCode> {
 		const no_change = () =>
-			StringWithSourcemap.from_source(file_basename, tag_with_content, get_location(tag_offset));
+			MappedCode.from_source(file_basename, tag_with_content, get_location(tag_offset));
 
 		if (!attributes && !content) return no_change();
 
@@ -158,7 +158,7 @@ async function process_tag(
 		if (processed && processed.dependencies) dependencies.push(...processed.dependencies);
 		if (!processed || !processed.map && processed.code === content) return no_change();
 
-		return processed_tag_to_sws(processed, tag_name, attributes,
+		return processed_tag_to_code(processed, tag_name, attributes,
 			{source: content, get_location: offset => source.get_location(offset + tag_offset), filename, file_basename});
 	}
 

src/compiler/preprocess/replace_in_code.ts

@@ -1,5 +1,5 @@
 import { getLocator } from 'locate-character';
-import { StringWithSourcemap } from '../utils/string_with_sourcemap';
+import { MappedCode } from '../utils/mapped_code';
 
 export interface Source {
 	source: string;
@@ -11,12 +11,12 @@ export interface Source {
 interface Replacement {
 	offset: number;
 	length: number;
-	replacement: StringWithSourcemap;
+	replacement: MappedCode;
 }
 
 function calculate_replacements(
 	re: RegExp,
-	get_replacement: (...match: any[]) => Promise<StringWithSourcemap>,
+	get_replacement: (...match: any[]) => Promise<MappedCode>,
 	source: string
 ) {
 	const replacements: Array<Promise<Replacement>> = [];
@@ -41,28 +41,28 @@ function calculate_replacements(
 function perform_replacements(
 	replacements: Replacement[],
 	{ file_basename, source, get_location }: Source
-): StringWithSourcemap {
-	const out = new StringWithSourcemap();
+): MappedCode {
+	const out = new MappedCode();
 	let last_end = 0;
 
 	for (const { offset, length, replacement } of replacements) {
-		const unchanged_prefix = StringWithSourcemap.from_source(
+		const unchanged_prefix = MappedCode.from_source(
 			file_basename, source.slice(last_end, offset), get_location(last_end));
 		out.concat(unchanged_prefix).concat(replacement);
 		last_end = offset + length;
 	}
 
-	const unchanged_suffix = StringWithSourcemap.from_source(
+	const unchanged_suffix = MappedCode.from_source(
 		file_basename, source.slice(last_end), get_location(last_end));
 
 	return out.concat(unchanged_suffix);
 }
 
 export async function replace_in_code(
 	regex: RegExp,
-	get_replacement: (...match: any[]) => Promise<StringWithSourcemap>,
+	get_replacement: (...match: any[]) => Promise<MappedCode>,
 	location: Source
-): Promise<StringWithSourcemap> {
+): Promise<MappedCode> {
 	const replacements = await calculate_replacements(regex, get_replacement, location.source);
 
 	return perform_replacements(replacements, location);

src/compiler/utils/string_with_sourcemap.ts renamed to src/compiler/utils/mapped_code.ts

@@ -67,7 +67,7 @@ function pushArray<T>(_this: T[], other: T[]) {
 	}
 }
 
-export class StringWithSourcemap {
+export class MappedCode {
 	string: string;
 	map: DecodedSourceMap;
 
@@ -89,7 +89,7 @@ export class StringWithSourcemap {
 	 * concat in-place (mutable), return this (chainable)
 	 * will also mutate the `other` object
 	 */
-	concat(other: StringWithSourcemap): StringWithSourcemap {
+	concat(other: MappedCode): MappedCode {
 		// noop: if one is empty, return the other
 		if (other.string == '') return this;
 		if (this.string == '') {
@@ -166,7 +166,7 @@ export class StringWithSourcemap {
 		return this;
 	}
 
-	static from_processed(string: string, map?: DecodedSourceMap): StringWithSourcemap {
+	static from_processed(string: string, map?: DecodedSourceMap): MappedCode {
 		const line_count = string.split('\n').length;
 
 		if (map) {
@@ -177,23 +177,23 @@ export class StringWithSourcemap {
 			for (let i = 0; i < missing_lines; i++) {
 				map.mappings.push([]);
 			}
-			return new StringWithSourcemap(string, map);
+			return new MappedCode(string, map);
 		}
 
-		if (string == '') return new StringWithSourcemap();
+		if (string == '') return new MappedCode();
 		map = { version: 3, names: [], sources: [], mappings: [] };
 
 		// add empty SourceMapSegment[] for every line
 		for (let i = 0; i < line_count; i++) map.mappings.push([]);
-		return new StringWithSourcemap(string, map);
+		return new MappedCode(string, map);
 	}
 
 	static from_source(
 		source_file: string, source: string, offset?: SourceLocation
-	): StringWithSourcemap {
+	): MappedCode {
 		if (!offset) offset = { line: 0, column: 0 };
 		const map: DecodedSourceMap = { version: 3, names: [], sources: [source_file], mappings: [] };
-		if (source == '') return new StringWithSourcemap(source, map);
+		if (source == '') return new MappedCode(source, map);
 
 		// we create a high resolution identity map here,
 		// we know that it will eventually be merged with svelte's map,
@@ -213,7 +213,7 @@ export class StringWithSourcemap {
 		for (let segment = 0; segment < segment_list.length; segment++) {
 			segment_list[segment][3] += offset.column;
 		}
-		return new StringWithSourcemap(source, map);
+		return new MappedCode(source, map);
 	}
 }