Fix ESM (#5)

Author: cmdcolin

package.json

@@ -2,8 +2,10 @@
   "name": "generic-filehandle2",
   "description": "uniform interface for accessing binary data from local files, remote HTTP resources, and browser Blob data",
   "version": "2.0.3",
-  "main": "dist/index.js",
-  "module": "esm/index.js",
+  "type": "module",
+  "module": "./esm/index.js",
+  "main": "./esm/index.js",
+  "exports": "./esm/index.js",
   "repository": "GMOD/generic-filehandle2",
   "license": "MIT",
   "author": {
@@ -12,7 +14,7 @@
     "url": "https://github.com/cmdcolin"
   },
   "engines": {
-    "node": ">=12"
+    "node": ">=14"
   },
   "files": [
     "dist",
@@ -39,19 +41,17 @@
     "genomics"
   ],
   "devDependencies": {
-    "@types/fetch-mock": "^7.3.8",
     "@types/node": "^22.15.3",
     "@types/range-parser": "^1.2.7",
     "@vitest/coverage-v8": "^3.0.1",
     "eslint": "^9.16.0",
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-unicorn": "^59.0.0",
-    "fetch-mock": "^9.0.0",
     "node-fetch": "^2.0.0",
     "prettier": "^3.4.1",
     "range-parser": "^1.2.1",
     "rimraf": "^6.0.0",
-    "standard-changelog": "^6.0.0",
+    "standard-changelog": "^7.0.1",
     "typescript": "^5.7.0",
     "typescript-eslint": "^8.18.0",
     "vitest": "^3.0.1"
@@ -61,6 +61,8 @@
   },
   "browser": {
     "./dist/localFile.js": false,
-    "./esm/localFile.js": false
+    "./esm/localFile.js": false,
+    "fs": false,
+    "fs/promises": false
   }
 }

src/index.ts

@@ -1,35 +1,5 @@
-import LocalFile from './localFile.ts'
-import RemoteFile from './remoteFile.ts'
-
-import type { FilehandleOptions, GenericFilehandle } from './filehandle.ts'
-
 export * from './filehandle.ts'
 
-function fromUrl(
-  source: string,
-  opts: FilehandleOptions = {},
-): GenericFilehandle {
-  return new RemoteFile(source, opts)
-}
-function open(
-  maybeUrl?: string,
-  maybePath?: string,
-  maybeFilehandle?: GenericFilehandle,
-  opts: FilehandleOptions = {},
-): GenericFilehandle {
-  if (maybeFilehandle !== undefined) {
-    return maybeFilehandle
-  }
-  if (maybeUrl !== undefined) {
-    return fromUrl(maybeUrl, opts)
-  }
-  if (maybePath !== undefined) {
-    return new LocalFile(maybePath, opts)
-  }
-  throw new Error('no url, path, or filehandle provided, cannot open')
-}
-
-export { fromUrl, open }
 export { default as BlobFile } from './blobFile.ts'
 export { default as RemoteFile } from './remoteFile.ts'
 export { default as LocalFile } from './localFile.ts'

src/mockLocalFile.ts

@@ -0,0 +1,40 @@
+import type { FilehandleOptions, GenericFilehandle, Stats } from './filehandle'
+
+export default class LocalFile implements GenericFilehandle {
+  public constructor(_source: string, _opts: FilehandleOptions = {}) {
+    throw new Error('unimplemented')
+  }
+
+  read(): Promise<Uint8Array<ArrayBuffer>> {
+    throw new Error('unimplemented')
+  }
+
+  public async readFile(): Promise<Uint8Array<ArrayBuffer>>
+  public async readFile(options: BufferEncoding): Promise<string>
+  public async readFile<T extends undefined>(
+    options:
+      | Omit<FilehandleOptions, 'encoding'>
+      | (Omit<FilehandleOptions, 'encoding'> & { encoding: T }),
+  ): Promise<Uint8Array<ArrayBuffer>>
+  public async readFile<T extends BufferEncoding>(
+    options: Omit<FilehandleOptions, 'encoding'> & { encoding: T },
+  ): Promise<string>
+  readFile<T extends BufferEncoding>(
+    options: Omit<FilehandleOptions, 'encoding'> & { encoding: T },
+  ): T extends BufferEncoding
+    ? Promise<Uint8Array<ArrayBuffer>>
+    : Promise<Uint8Array<ArrayBuffer> | string>
+  public async readFile(
+    _options: FilehandleOptions | BufferEncoding = {},
+  ): Promise<Uint8Array<ArrayBuffer> | string> {
+    throw new Error('unimplemented')
+  }
+
+  stat(): Promise<Stats> {
+    throw new Error('unimplemented')
+  }
+
+  close(): Promise<void> {
+    throw new Error('unimplemented')
+  }
+}

test/auth.test.ts

@@ -1,29 +1,66 @@
 import { TextDecoder } from 'util'
 
-import fetchMock from 'fetch-mock'
-import { afterEach, expect, test } from 'vitest'
+import { afterEach, beforeEach, expect, test, vi } from 'vitest'
 
 import { RemoteFile } from '../src/'
 
-fetchMock.config.sendAsJson = false
-
 function toString(a: Uint8Array<ArrayBuffer>) {
   return new TextDecoder('utf8').decode(a)
 }
-afterEach(() => fetchMock.restore())
+
+// Create a Response object from a buffer or string
+function createResponse(
+  body: Uint8Array<ArrayBuffer> | string,
+  status: number,
+  headers: Record<string, string> = {},
+) {
+  return {
+    ok: status >= 200 && status < 300,
+    status,
+    headers: {
+      get(name: string) {
+        return headers[name] || null
+      },
+    },
+    arrayBuffer: async () => {
+      if (typeof body === 'string') {
+        const encoder = new TextEncoder()
+        return encoder.encode(body).buffer
+      }
+      return body.buffer
+    },
+    text: async () => {
+      if (typeof body === 'string') {
+        return body
+      }
+      return toString(body)
+    },
+  }
+}
+
+// Mock implementation for fetch
+let mockFetch: (input: RequestInfo, init?: RequestInit) => Promise<Response>
+
+beforeEach(() => {
+  // Reset the mock fetch implementation before each test
+  mockFetch = vi.fn().mockImplementation(async (url: string) => {
+    throw new Error(`Unhandled fetch request to ${url}`)
+  })
+})
+
+afterEach(() => {
+  vi.resetAllMocks()
+})
 
 test('auth token', async () => {
-  fetchMock.mock('http://fakehost/test.txt', (url: string, args: any) => {
+  mockFetch = vi.fn().mockImplementation(async (_url: string, args: any) => {
     return args.headers.Authorization
-      ? {
-          status: 200,
-          body: 'hello world',
-        }
-      : {
-          status: 403,
-        }
+      ? createResponse('hello world', 200)
+      : createResponse('Unauthorized', 403)
   })
+
   const f = new RemoteFile('http://fakehost/test.txt', {
+    fetch: mockFetch,
     overrides: {
       headers: {
         Authorization: 'Basic YWxhZGRpbjpvcGVuc2VzYW1l',
@@ -33,20 +70,21 @@ test('auth token', async () => {
   const stat = await f.readFile('utf8')
   expect(stat).toBe('hello world')
 })
+
 test('auth token with range request', async () => {
-  fetchMock.mock('http://fakehost/test.txt', (url: string, args: any) => {
+  mockFetch = vi.fn().mockImplementation(async (_url: string, args: any) => {
     if (args.headers.Authorization && args.headers.range) {
-      return {
-        status: 206,
-        body: 'hello',
-      }
+      return createResponse('hello', 206)
     } else if (!args.headers.Authorization) {
-      return { status: 403 }
+      return createResponse('Unauthorized', 403)
     } else if (!args.headers.Range) {
-      return { status: 400 }
+      return createResponse('Bad Request', 400)
     }
+    return createResponse('Unknown error', 500)
   })
+
   const f = new RemoteFile('http://fakehost/test.txt', {
+    fetch: mockFetch,
     overrides: {
       headers: {
         Authorization: 'Basic YWxhZGRpbjpvcGVuc2VzYW1l',