fix(fs): fs.source should never return null

blacha · Sep 16, 2021 · 4c22b84 · 4c22b84
1 parent 3564902
commit 4c22b84
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/packages/core/src/fs.ts b/packages/core/src/fs.ts
@@ -42,5 +42,5 @@ export interface FileSystem<T extends ChunkSource = ChunkSource> {
  /** Get information about the path */
  head(filePath: string): Promise<FileInfo | null>;
  /** Create a file source to read chunks out of */
- source(filePath: string): T | null;
+ source(filePath: string): T;
 }
diff --git a/packages/source-aws/src/s3.fs.ts b/packages/source-aws/src/s3.fs.ts
@@ -61,8 +61,10 @@ export class FsAwsS3 implements FileSystem<SourceAwsS3> {
  constructor(s3: S3Like) {
  this.s3 = s3;
  }
- source(filePath: string): SourceAwsS3 | null {
- return SourceAwsS3.fromUri(filePath, this.s3);
+ source(filePath: string): SourceAwsS3 {
+ const source = SourceAwsS3.fromUri(filePath, this.s3);
+ if (source == null) throw new Error(`Failed to create aws s3 source from uri: ${filePath}`);
+ return source;
  }
 
  /** Is this file system a s3 file system */

diff --git a/packages/source-file/src/file.fs.ts b/packages/source-file/src/file.fs.ts
@@ -20,7 +20,7 @@ export class FsFile implements FileSystem<SourceFile> {
  return fs.protocol === FsFile.protocol;
  }
 
- source(filePath: string): SourceFile | null {
+ source(filePath: string): SourceFile {
  return new SourceFile(filePath);
  }