Fix types

rollup · Oct 13, 2023 · f229597 · f229597
1 parent 192ce1d
commit f229597
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/rollup/types.d.ts b/src/rollup/types.d.ts
@@ -54,7 +54,7 @@ export interface ExistingDecodedSourceMap {
 	names: string[];
 	sourceRoot?: string;
 	sources: string[];
-	sourcesContent?: (string | null)[];
+	sourcesContent?: string[];
 	version: number;
 	x_google_ignoreList?: number[];
 }
@@ -65,7 +65,7 @@ export interface ExistingRawSourceMap {
 	names: string[];
 	sourceRoot?: string;
 	sources: string[];
-	sourcesContent?: (string | null)[];
+	sourcesContent?: string[];
 	version: number;
 	x_google_ignoreList?: number[];
 }
@@ -82,7 +82,7 @@ export interface SourceMap {
 	mappings: string;
 	names: string[];
 	sources: string[];
-	sourcesContent: (string | null)[];
+	sourcesContent?: string[];
 	version: number;
 	toString(): string;
 	toUrl(): string;

diff --git a/src/utils/collapseSourcemaps.ts b/src/utils/collapseSourcemaps.ts
@@ -12,11 +12,11 @@ import { error, logConflictingSourcemapSources, logSourcemapBroken } from './log
 import { basename, dirname, relative, resolve } from './path';
 
 class Source {
-	readonly content: string | null;
+	readonly content: string;
 	readonly filename: string;
 	isOriginal = true;
 
-	constructor(filename: string, content: string | null) {
+	constructor(filename: string, content: string) {
 		this.filename = filename;
 		this.content = content;
 	}
@@ -50,7 +50,7 @@ class Link {
 	traceMappings() {
 		const sources: string[] = [];
 		const sourceIndexMap = new Map<string, number>();
-		const sourcesContent: (string | null)[] = [];
+		const sourcesContent: string[] = [];
 		const names: string[] = [];
 		const nameIndexMap = new Map<string, number>();
 
@@ -194,7 +194,7 @@ function getCollapsedSourcemap(
 
 export function collapseSourcemaps(
 	file: string,
-	map: DecodedSourceMap,
+	map: Omit<DecodedSourceMap, 'sourcesContent'> & { sourcesContent: Array<string | null> },
 	modules: readonly Module[],
 	bundleSourcemapChain: readonly DecodedSourceMapOrMissing[],
 	excludeContent: boolean | undefined,