Remove usage of url module

GMOD · Mar 18, 2024 · c7dae63 · c7dae63
1 parent 9021a23
commit c7dae63
Show file tree

Hide file tree

Showing 6 changed files with 454 additions and 357 deletions.
diff --git a/example/index.html b/example/index.html
@@ -44,6 +44,6 @@
   </head>
   <body>
     <h1>Hello world</h1>
-    <pre id="output"></div>
+    <div id="output" />
   </body>
 </html>
diff --git a/src/io/index.ts b/src/io/index.ts
@@ -1,16 +1,6 @@
-import url from 'url'
-import { ensureNotNullish } from '../typescript'
 import { Filehandle } from '../cramFile/filehandle'
 import { LocalFile, RemoteFile } from 'generic-filehandle'
 
-function fromUrl(source: string) {
-  const { protocol, pathname } = url.parse(source)
-  if (protocol === 'file:') {
-    return new LocalFile(unescape(ensureNotNullish(pathname)))
-  }
-  return new RemoteFile(source)
-}
-
 function open(
   maybeUrl?: string,
   maybePath?: string,
@@ -20,14 +10,14 @@ function open(
     return maybeFilehandle
   }
   if (maybeUrl) {
-    return fromUrl(maybeUrl)
+    return new RemoteFile(maybeUrl)
   }
   if (maybePath) {
     return new LocalFile(maybePath)
   }
   throw new Error('no url, path, or filehandle provided, cannot open')
 }
 
-export { fromUrl, open }
+export { open }
 
 export { LocalFile, RemoteFile } from 'generic-filehandle'
diff --git a/src/typescript.ts b/src/typescript.ts
@@ -1,10 +1,3 @@
-export function ensureNotNullish<T>(x: T | null | undefined): T {
-  if (x === null || x === undefined) {
-    throw new Error('Value must not be nullish.')
-  }
-  return x
-}
-
 export type TupleOf<T, N extends number> = N extends N
   ? number extends N
     ? T[]

diff --git a/test/indexedfile.test.ts b/test/indexedfile.test.ts
@@ -234,7 +234,7 @@ test('region not downloading enough records', async () => {
   // entries
   const index = new CraiIndex({
     filehandle: testDataFile(
-      'HG002_ONTrel2_16x_RG_HP10xtrioRTG.chr1.cram.crai ',
+      'HG002_ONTrel2_16x_RG_HP10xtrioRTG.chr1.cram.crai',
     ),
   })
   const entries = await index.getEntriesForRange(0, 75100635, 75125544)

diff --git a/test/lib/util.ts b/test/lib/util.ts
@@ -1,13 +1,8 @@
-import { fromUrl } from '../../src/io'
 import path from 'path'
+import { LocalFile } from 'generic-filehandle'
 
 const dataDir = path.dirname(require.resolve('../data/xx.fa'))
 
-export function testDataUrl(filename: string) {
-  return `file://${dataDir}/${filename}`.replace('#', '%23')
-}
-
 export function testDataFile(filename: string) {
-  const source = testDataUrl(filename)
-  return fromUrl(source)
+  return new LocalFile(`${dataDir}/${filename}`)
 }