From cb14ea819ead6c73e92fea4414dfcabebf86ce69 Mon Sep 17 00:00:00 2001 From: Justin Ridgewell Date: Wed, 27 Apr 2022 15:07:50 -0400 Subject: [PATCH] Upgrade gen-mapping --- package-lock.json | 24 +++++++++++++----------- package.json | 2 +- src/source-map.ts | 4 ++-- test/unit/source-map-tree.ts | 26 +++++++++++++------------- 4 files changed, 29 insertions(+), 27 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9cdf676..36e0ea9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "2.2.0", "license": "Apache-2.0", "dependencies": { - "@jridgewell/gen-mapping": "0.1.0", + "@jridgewell/gen-mapping": "^0.2.0", "@jridgewell/trace-mapping": "^0.3.9" }, "devDependencies": { @@ -970,12 +970,13 @@ } }, "node_modules/@jridgewell/gen-mapping": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.0.tgz", - "integrity": "sha512-YH+BnkvuCiPR+MUOY6JIArdTIGrRtsxnLaIxPRy4CpGJ/V6OO6Gq/1J+FJEc4j5e5h6Bcy3/K7prlMrm93BJoA==", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.2.0.tgz", + "integrity": "sha512-wcKrTKpG3DIUivSPbzsG/YauY77Ljfhe0OnMRvzveOTZ5mJEwT7h2NhquJ9vEIkxMeeyqHz9YnRYXGPbMeriUw==", "dependencies": { - "@jridgewell/set-array": "1.0.0", - "@jridgewell/sourcemap-codec": "^1.4.10" + "@jridgewell/set-array": "^1.0.0", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" }, "engines": { "node": ">=6.0.0" @@ -6711,12 +6712,13 @@ } }, "@jridgewell/gen-mapping": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.0.tgz", - "integrity": "sha512-YH+BnkvuCiPR+MUOY6JIArdTIGrRtsxnLaIxPRy4CpGJ/V6OO6Gq/1J+FJEc4j5e5h6Bcy3/K7prlMrm93BJoA==", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.2.0.tgz", + "integrity": "sha512-wcKrTKpG3DIUivSPbzsG/YauY77Ljfhe0OnMRvzveOTZ5mJEwT7h2NhquJ9vEIkxMeeyqHz9YnRYXGPbMeriUw==", "requires": { - "@jridgewell/set-array": "1.0.0", - "@jridgewell/sourcemap-codec": "^1.4.10" + "@jridgewell/set-array": "^1.0.0", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" }, "dependencies": { "@jridgewell/set-array": { diff --git a/package.json b/package.json index bf97a85..326444c 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "typescript": "4.6.3" }, "dependencies": { - "@jridgewell/gen-mapping": "^0.1.0", + "@jridgewell/gen-mapping": "^0.2.0", "@jridgewell/trace-mapping": "^0.3.9" } } diff --git a/src/source-map.ts b/src/source-map.ts index cb779c6..07039df 100644 --- a/src/source-map.ts +++ b/src/source-map.ts @@ -1,4 +1,4 @@ -import { decodedMap, encodedMap } from '@jridgewell/gen-mapping'; +import { toDecodedMap, toEncodedMap } from '@jridgewell/gen-mapping'; import type { GenMapping } from '@jridgewell/gen-mapping'; import type { DecodedSourceMap, EncodedSourceMap, Options } from './types'; @@ -17,7 +17,7 @@ export default class SourceMap { declare version: 3; constructor(map: GenMapping, options: Options) { - const out = options.decodedMappings ? decodedMap(map) : encodedMap(map); + const out = options.decodedMappings ? toDecodedMap(map) : toEncodedMap(map); this.version = out.version; // SourceMap spec says this should be first. this.file = out.file; this.mappings = out.mappings as SourceMap['mappings']; diff --git a/test/unit/source-map-tree.ts b/test/unit/source-map-tree.ts index 1f489f6..0c53149 100644 --- a/test/unit/source-map-tree.ts +++ b/test/unit/source-map-tree.ts @@ -1,4 +1,4 @@ -import { decodedMap } from '@jridgewell/gen-mapping'; +import { toDecodedMap } from '@jridgewell/gen-mapping'; import { TraceMap } from '@jridgewell/trace-mapping'; import { @@ -44,7 +44,7 @@ describe('MapSource', () => { }; const tree = MapSource(new TraceMap(map), [child]); - const traced = decodedMap(traceMappings(tree)); + const traced = toDecodedMap(traceMappings(tree)); expect(traced.mappings).toEqual([[[0, 0, 1, 1], [5]]]); }); @@ -60,7 +60,7 @@ describe('MapSource', () => { }; const tree = MapSource(new TraceMap(map), [child]); - const traced = decodedMap(traceMappings(tree)); + const traced = toDecodedMap(traceMappings(tree)); expect(traced.mappings).toEqual([[[0, 0, 1, 1], [5]]]); }); @@ -74,7 +74,7 @@ describe('MapSource', () => { }; const tree = MapSource(new TraceMap(map), [child]); - const traced = decodedMap(traceMappings(tree)); + const traced = toDecodedMap(traceMappings(tree)); expect(traced.mappings).toEqual([]); }); @@ -91,7 +91,7 @@ describe('MapSource', () => { }; const tree = MapSource(new TraceMap(map), [child]); - const traced = decodedMap(traceMappings(tree)); + const traced = toDecodedMap(traceMappings(tree)); expect(traced.mappings).toEqual([[[0, 0, 0, 0, 0]]]); expect(traced).toMatchObject({ names: [name], @@ -108,7 +108,7 @@ describe('MapSource', () => { }; const tree = MapSource(new TraceMap(map), [child]); - const traced = decodedMap(traceMappings(tree)); + const traced = toDecodedMap(traceMappings(tree)); expect(traced.mappings).toEqual([[[0, 0, 1, 1]]]); }); @@ -122,7 +122,7 @@ describe('MapSource', () => { }; const tree = MapSource(new TraceMap(map), [child]); - const traced = decodedMap(traceMappings(tree)); + const traced = toDecodedMap(traceMappings(tree)); expect(traced.mappings).toEqual([[[0, 0, 0, 0, 0]]]); expect(traced).toMatchObject({ names: ['child'], @@ -142,7 +142,7 @@ describe('MapSource', () => { }; const tree = MapSource(new TraceMap(map), [child]); - const traced = decodedMap(traceMappings(tree)); + const traced = toDecodedMap(traceMappings(tree)); expect(traced).toMatchObject(extras); }); @@ -153,7 +153,7 @@ describe('MapSource', () => { }; const tree = MapSource(new TraceMap(map), [child]); - const traced = decodedMap(traceMappings(tree)); + const traced = toDecodedMap(traceMappings(tree)); expect(traced).toMatchObject({ // TODO: support sourceRoot sourceRoot: undefined, @@ -169,7 +169,7 @@ describe('MapSource', () => { }; const tree = MapSource(new TraceMap(map), [child]); - const traced = decodedMap(traceMappings(tree)); + const traced = toDecodedMap(traceMappings(tree)); expect(traced.mappings).toEqual([[[0, 0, 0, 0]]]); }); @@ -181,7 +181,7 @@ describe('MapSource', () => { }; const tree = MapSource(new TraceMap(map), [child]); - const traced = decodedMap(traceMappings(tree)); + const traced = toDecodedMap(traceMappings(tree)); expect(traced.mappings).toEqual([]); }); @@ -198,7 +198,7 @@ describe('MapSource', () => { }; const tree = MapSource(new TraceMap(map), [child]); - const traced = decodedMap(traceMappings(tree)); + const traced = toDecodedMap(traceMappings(tree)); expect(traced.mappings).toEqual([[[0, 0, 0, 0]]]); }); @@ -209,7 +209,7 @@ describe('MapSource', () => { }; const tree = MapSource(new TraceMap(map), [child]); - const traced = decodedMap(traceMappings(tree)); + const traced = toDecodedMap(traceMappings(tree)); expect(traced.mappings).toEqual([[[0, 0, 0, 0]], [[0, 0, 0, 0]]]); }); });