From a4fe3663af7b9804f41c5c27fb0798e828e275f1 Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Tue, 14 Mar 2023 08:28:12 -0700 Subject: [PATCH] chore: remove locate_1 helper --- test/sourcemaps/helpers.ts | 6 +++--- test/sourcemaps/index.ts | 9 +-------- test/sourcemaps/samples/attached-sourcemap/test.js | 10 +++++----- test/sourcemaps/samples/compile-option-dev/test.js | 13 ++++++------- test/sourcemaps/samples/sourcemap-sources/test.js | 4 ++-- test/sourcemaps/samples/typescript/test.js | 2 +- 6 files changed, 18 insertions(+), 26 deletions(-) diff --git a/test/sourcemaps/helpers.ts b/test/sourcemaps/helpers.ts index f546566a95..e589deaa03 100644 --- a/test/sourcemaps/helpers.ts +++ b/test/sourcemaps/helpers.ts @@ -24,7 +24,7 @@ export function assert_mapped( `failed to locate "${input_code}" in "${filename}"` ); - const transformed_loc = preprocessed.locate_1(code); + const transformed_loc = preprocessed.locate(code); assert.notEqual( transformed_loc, undefined, @@ -36,7 +36,7 @@ export function assert_mapped( { source: filename, name: null, - line: source_loc.line + 1, + line: source_loc.line, column: source_loc.column }, `incorrect mappings for "${input_code}" in "${filename}"` @@ -54,7 +54,7 @@ export function assert_not_mapped( ) { if (filename === undefined) filename = 'input.svelte'; - const transformed_loc = preprocessed.locate_1(code); + const transformed_loc = preprocessed.locate(code); assert.notEqual( transformed_loc, undefined, diff --git a/test/sourcemaps/index.ts b/test/sourcemaps/index.ts index fc021cd6a7..fc47c35f4a 100644 --- a/test/sourcemaps/index.ts +++ b/test/sourcemaps/index.ts @@ -31,8 +31,7 @@ describe('sourcemaps', () => { const inputCode = fs.readFileSync(inputFile, 'utf-8'); const input = { code: inputCode, - locate: getLocator(inputCode), - locate_1: getLocator(inputCode, { offsetLine: 1 }) + locate: getLocator(inputCode) }; const preprocessed = await svelte.preprocess( @@ -100,20 +99,14 @@ describe('sourcemaps', () => { ); } - // use locate_1 with mapConsumer: - // lines are one-based, columns are zero-based - preprocessed.mapConsumer = preprocessed.map && await new SourceMapConsumer(preprocessed.map); preprocessed.locate = getLocator(preprocessed.code); - preprocessed.locate_1 = getLocator(preprocessed.code, { offsetLine: 1 }); js.mapConsumer = js.map && await new SourceMapConsumer(js.map); js.locate = getLocator(js.code); - js.locate_1 = getLocator(js.code, { offsetLine: 1 }); css.mapConsumer = css.map && await new SourceMapConsumer(css.map); css.locate = getLocator(css.code || ''); - css.locate_1 = getLocator(css.code || '', { offsetLine: 1 }); await test({ assert, input, preprocessed, js, css }); }); }); diff --git a/test/sourcemaps/samples/attached-sourcemap/test.js b/test/sourcemaps/samples/attached-sourcemap/test.js index ecb88ab11d..b5b02f3896 100644 --- a/test/sourcemaps/samples/attached-sourcemap/test.js +++ b/test/sourcemaps/samples/attached-sourcemap/test.js @@ -9,10 +9,10 @@ export function test({ input, css, js }) { out_obj = js; // we need the second occurrence of 'done_replace_script_2' in output.js // the first occurrence is mapped back to markup '{done_replace_script_2}' - loc_output = out_obj.locate_1('done_replace_script_2'); - loc_output = out_obj.locate_1('done_replace_script_2', loc_output.character + 1); + loc_output = out_obj.locate('done_replace_script_2'); + loc_output = out_obj.locate('done_replace_script_2', loc_output.character + 1); actual = out_obj.mapConsumer.originalPositionFor(loc_output); - loc_input = input.locate_1('replace_me_script'); + loc_input = input.locate('replace_me_script'); expected = { source: 'input.svelte', name: 'replace_me_script', @@ -21,9 +21,9 @@ export function test({ input, css, js }) { assert.deepEqual(actual, expected); out_obj = css; - loc_output = out_obj.locate_1('.done_replace_style_2'); + loc_output = out_obj.locate('.done_replace_style_2'); actual = out_obj.mapConsumer.originalPositionFor(loc_output); - loc_input = input.locate_1('.replace_me_style'); + loc_input = input.locate('.replace_me_style'); expected = { source: 'input.svelte', name: '.replace_me_style', diff --git a/test/sourcemaps/samples/compile-option-dev/test.js b/test/sourcemaps/samples/compile-option-dev/test.js index eec81fc93e..3e8282c213 100644 --- a/test/sourcemaps/samples/compile-option-dev/test.js +++ b/test/sourcemaps/samples/compile-option-dev/test.js @@ -19,17 +19,16 @@ export async function test({ assert, css, js }) { const sourcefile = 'input.svelte'; [ // TODO: get line and col num from input.svelte rather than hardcoding here - [css, '--keep-me', 13, 2], - // TODO: these should be 7, 2 and 10, 2 - // we use locate_1 which means lines are 1-indexed and cols are 0-indexed - // each tab is 1 col - [css, '--done-replace-once', 6, 4], - [css, '--done-replace-twice', 9, 4] + [css, '--keep-me', 12, 2], + // TODO: these should be 6, 2 and 9, 2 + // source maps are 0-indexed. each tab is 1 col + [css, '--done-replace-once', 5, 4], + [css, '--done-replace-twice', 8, 4] ] .forEach(([where, content, line, column]) => { assert.deepEqual( where.mapConsumer.originalPositionFor( - where.locate_1(content) + where.locate(content) ), { source: sourcefile, diff --git a/test/sourcemaps/samples/sourcemap-sources/test.js b/test/sourcemaps/samples/sourcemap-sources/test.js index 78a4c80a17..8b3e558209 100644 --- a/test/sourcemaps/samples/sourcemap-sources/test.js +++ b/test/sourcemaps/samples/sourcemap-sources/test.js @@ -14,12 +14,12 @@ export function test({ assert, preprocessed, js }) { assert.deepEqual( where.mapConsumer.originalPositionFor( - where.locate_1(content) + where.locate(content) ), { source: sourcefile, name: null, - line: 1, + line: 0, column }, `failed to locate "${content}" from "${sourcefile}"` diff --git a/test/sourcemaps/samples/typescript/test.js b/test/sourcemaps/samples/typescript/test.js index bec397e33c..a9d8065a7e 100644 --- a/test/sourcemaps/samples/typescript/test.js +++ b/test/sourcemaps/samples/typescript/test.js @@ -17,5 +17,5 @@ export function test({ input, preprocessed }) { }); // TS types, removed - assert_not_located('ITimeoutDestroyer', preprocessed.locate_1); + assert_not_located('ITimeoutDestroyer', preprocessed.locate); }