Fixes

jridgewell · Oct 7, 2022 · 8fe0daa · 8fe0daa
1 parent 16f900b
commit 8fe0daa
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/src/any-map.ts b/src/any-map.ts
@@ -12,6 +12,7 @@ import type {
   SectionedSourceMap,
   DecodedSourceMap,
   SectionedSourceMapInput,
+  Ro,
 } from './types';
 import type { SourceMapSegment } from './sourcemap-segment';
 
@@ -46,7 +47,7 @@ export const AnyMap: AnyMap = function (map, mapUrl) {
 } as AnyMap;
 
 function recurse(
-  input: SectionedSourceMap,
+  input: Ro<SectionedSourceMap>,
   mapUrl: string | null | undefined,
   mappings: SourceMapSegment[][],
   sources: string[],
@@ -90,7 +91,7 @@ function recurse(
 }
 
 function addSection(
-  input: Section['map'],
+  input: Ro<Section['map']>,
   mapUrl: string | null | undefined,
   mappings: SourceMapSegment[][],
   sources: string[],

diff --git a/src/trace-mapping.ts b/src/trace-mapping.ts
@@ -159,7 +159,7 @@ export class TraceMap implements SourceMap {
 
     if (!isString && (map as unknown as { _decodedMemo: any })._decodedMemo) return map as TraceMap;
 
-    const parsed = (isString ? JSON.parse(map) : map) as Exclude<SourceMapInput, string | TraceMap>;
+    const parsed = (isString ? JSON.parse(map) : map) as DecodedSourceMap | EncodedSourceMap;
 
     const { version, file, names, sourceRoot, sources, sourcesContent } = parsed;
     this.version = version;

diff --git a/src/types.ts b/src/types.ts
@@ -57,14 +57,6 @@ export type InvalidGeneratedMapping = {
 
 export type Bias = typeof GREATEST_LOWER_BOUND | typeof LEAST_UPPER_BOUND;
 
-type Ro<T> = T extends Array<infer V>
-  ? V[] | Readonly<V[]> | RoArray<V> | Readonly<RoArray<V>>
-  : T extends object
-  ? T | Readonly<T> | RoObject<T> | Readonly<RoObject<T>>
-  : T;
-type RoArray<T> = Ro<T>[];
-type RoObject<T> = { [K in keyof T]: T[K] | Ro<T[K]> };
-
 export type SourceMapInput = string | Ro<EncodedSourceMap> | Ro<DecodedSourceMap> | TraceMap;
 
 export type SectionedSourceMapInput = SourceMapInput | Ro<SectionedSourceMap>;
@@ -99,3 +91,11 @@ export abstract class SourceMap {
   declare sourcesContent: SourceMapV3['sourcesContent'];
   declare resolvedSources: SourceMapV3['sources'];
 }
+
+export type Ro<T> = T extends Array<infer V>
+  ? V[] | Readonly<V[]> | RoArray<V> | Readonly<RoArray<V>>
+  : T extends object
+  ? T | Readonly<T> | RoObject<T> | Readonly<RoObject<T>>
+  : T;
+type RoArray<T> = Ro<T>[];
+type RoObject<T> = { [K in keyof T]: T[K] | Ro<T[K]> };