Update to gen-mappings v0.1.0

jridgewell · jridgewell · commit b9f392fd72e9 · 2022-04-26T23:35:50.000-04:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -57,7 +57,7 @@
     "typescript": "4.6.3"
   },
   "dependencies": {
-    "@jridgewell/gen-mapping": "^0.0.0",
+    "@jridgewell/gen-mapping": "^0.1.0",
     "@jridgewell/trace-mapping": "^0.3.9"
   }
 }
diff --git a/src/build-source-map-tree.ts b/src/build-source-map-tree.ts
@@ -2,7 +2,7 @@ import { TraceMap } from '@jridgewell/trace-mapping';
 
 import { OriginalSource, MapSource } from './source-map-tree';
 
-import type { Sources } from './source-map-tree';
+import type { Sources, MapSource as MapSourceType } from './source-map-tree';
 import type { SourceMapInput, SourceMapLoader, LoaderContext } from './types';
 
 function asArray<T>(value: T | T[]): T[] {
@@ -24,7 +24,7 @@ function asArray<T>(value: T | T[]): T[] {
 export default function buildSourceMapTree(
   input: SourceMapInput | SourceMapInput[],
   loader: SourceMapLoader
-): Sources {
+): MapSourceType {
   const maps = asArray(input).map((m) => new TraceMap(m, ''));
   const map = maps.pop()!;
 
@@ -49,7 +49,7 @@ function build(
   loader: SourceMapLoader,
   importer: string,
   importerDepth: number
-): Sources {
+): MapSourceType {
   const { resolvedSources, sourcesContent } = map;
 
   const depth = importerDepth + 1;
diff --git a/src/source-map-tree.ts b/src/source-map-tree.ts
@@ -28,14 +28,14 @@ const SOURCELESS_MAPPING = {
 };
 const EMPTY_SOURCES: Sources[] = [];
 
-type OriginalSource = {
+export type OriginalSource = {
   map: TraceMap;
   sources: Sources[];
   source: string;
   content: string | null;
 };
 
-type MapSource = {
+export type MapSource = {
   map: TraceMap;
   sources: Sources[];
   source: string;
@@ -78,8 +78,8 @@ export function OriginalSource(source: string, content: string | null): Original
  * traceMappings is only called on the root level SourceMapTree, and begins the process of
  * resolving each mapping in terms of the original source files.
  */
-export function traceMappings(tree: Sources): GenMapping {
-  const gen = new GenMapping(tree.map.file);
+export function traceMappings(tree: MapSource): GenMapping {
+  const gen = new GenMapping({ file: tree.map.file });
   const { sources: rootSources, map } = tree;
   const rootNames = map.names;
   const rootMappings = decodedMappings(map);
diff --git a/src/source-map.ts b/src/source-map.ts
@@ -20,13 +20,15 @@ export default class SourceMap {
     const out = options.decodedMappings ? decodedMap(map) : encodedMap(map);
     this.version = out.version; // SourceMap spec says this should be first.
     this.file = out.file;
-    this.mappings = out.mappings;
-    this.names = out.names;
+    this.mappings = out.mappings as SourceMap['mappings'];
+    this.names = out.names as SourceMap['names'];
 
     this.sourceRoot = out.sourceRoot;
 
-    this.sources = out.sources;
-    if (!options.excludeContent) this.sourcesContent = out.sourcesContent;
+    this.sources = out.sources as SourceMap['sources'];
+    if (!options.excludeContent) {
+      this.sourcesContent = out.sourcesContent as SourceMap['sourcesContent'];
+    }
   }
 
   toString(): string {
diff --git a/test/unit/source-map.ts b/test/unit/source-map.ts
@@ -20,7 +20,7 @@ describe('SourceMap', () => {
 
   test('it can include a file', () => {
     const file = 'foobar.js';
-    const traced = new GenMapping(file);
+    const traced = new GenMapping({ file });
     addSegment(traced, 0, 0, 'file.js', 0, 0, '');
 
     const map = new SourceMap(traced, opts);
@@ -30,7 +30,7 @@ describe('SourceMap', () => {
   // TODO: support sourceRoot
   test.skip('it can include a sourceRoot', () => {
     const sourceRoot = 'https://foo.com/';
-    const traced = new GenMapping(undefined, sourceRoot);
+    const traced = new GenMapping({ sourceRoot });
     addSegment(traced, 0, 0, 'file.js', 0, 0, '');
 
     const map = new SourceMap(traced, opts);

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@`
`57`	`57`	`"typescript": "4.6.3"`
`58`	`58`	`},`
`59`	`59`	`"dependencies": {`
`60`		`- "@jridgewell/gen-mapping": "^0.0.0",`
	`60`	`+ "@jridgewell/gen-mapping": "^0.1.0",`
`61`	`61`	`"@jridgewell/trace-mapping": "^0.3.9"`
`62`	`62`	`}`
`63`	`63`	`}`