From c3a22bf5f0431183973614510927cdf741c2aa28 Mon Sep 17 00:00:00 2001 From: Leonardo Lemos Date: Wed, 28 Oct 2026 02:58:39 +0100 Subject: [PATCH] fix(grabkit): add exports map with .mjs ESM build; treat empty 2xx as success Without an exports map, Node ESM consumers resolved the CJS build and got a non-callable default import. Ship the ESM build as .mjs and route import/require through exports. An empty body on 200/201/202 was a GrabkitTransportError, so fire-and- forget endpoints (e.g. 202 Accepted) always looked failed. Treat any empty 2xx like 204: success with null data. Empty non-2xx still fails. Note: exports blocks deep imports such as grabkit/build/esm/grabkit.js. Co-Authored-By: Claude Opus 5.5 --- packages/grabkit/package.json | 10 +++++++++- packages/grabkit/rollup.config.js | 2 +- packages/grabkit/src/Call.ts | 4 ++++ packages/grabkit/src/grabkit.test.ts | 21 +++++++++++++++++++++ packages/grabkit/src/publishBundle.test.ts | 12 ++++++++++++ 5 files changed, 47 insertions(+), 2 deletions(-) diff --git a/packages/grabkit/package.json b/packages/grabkit/package.json index bca5b52..0260d16 100644 --- a/packages/grabkit/package.json +++ b/packages/grabkit/package.json @@ -4,7 +4,15 @@ "description": "TypeScript HTTP client for explicit METHOD /path calls. JSON:API by default.", "main": "build/cjs/grabkit.js", "types": "build/types/grabkit.d.ts", - "module": "build/esm/grabkit.js", + "module": "build/esm/grabkit.mjs", + "exports": { + ".": { + "types": "./build/types/grabkit.d.ts", + "import": "./build/esm/grabkit.mjs", + "require": "./build/cjs/grabkit.js" + }, + "./package.json": "./package.json" + }, "repository": "https://github.com/mrlemoos/grabkit", "author": "Leonardo Lemos ", "license": "Apache-2.0", diff --git a/packages/grabkit/rollup.config.js b/packages/grabkit/rollup.config.js index 13783c5..f34d2ff 100644 --- a/packages/grabkit/rollup.config.js +++ b/packages/grabkit/rollup.config.js @@ -10,7 +10,7 @@ const require = createRequire(import.meta.url); const tslibPath = require.resolve('tslib'); const projectRoot = 'packages/grabkit'; -const ESM_FILENAME = `${projectRoot}/build/esm/grabkit.js`; +const ESM_FILENAME = `${projectRoot}/build/esm/grabkit.mjs`; const CJS_FILENAME = `${projectRoot}/build/cjs/grabkit.js`; const TYPES_FILENAME = `${projectRoot}/build/types/grabkit.d.ts`; diff --git a/packages/grabkit/src/Call.ts b/packages/grabkit/src/Call.ts index 6b392f1..c178244 100644 --- a/packages/grabkit/src/Call.ts +++ b/packages/grabkit/src/Call.ts @@ -79,6 +79,10 @@ class Call { const text = await response.text(); if (text.length === 0) { + // An empty 2xx (e.g. `202 Accepted` with no body) is success, like 204. + if (response.ok) { + return { ok: true, status: response.status, parsed: null, empty: true }; + } return { ok: false, error: new GrabkitTransportError('Grabkit: empty response body'), diff --git a/packages/grabkit/src/grabkit.test.ts b/packages/grabkit/src/grabkit.test.ts index 4680d02..39d928c 100644 --- a/packages/grabkit/src/grabkit.test.ts +++ b/packages/grabkit/src/grabkit.test.ts @@ -90,6 +90,27 @@ describe('grabkit', () => { expect(meta).toEqual({ statusCode: 204 }); }); + it.each([200, 201, 202])('treats an empty %i body as success with null data', async (status) => { + vi.stubGlobal('fetch', vi.fn(async () => new Response(null, { status }))); + const grab = grabkit('https://api.example.com', { format: 'json' }); + + const [data, error, meta] = await grab('POST /events', { body: { name: 'signup' } }); + + expect(error).toBeNull(); + expect(data).toBeNull(); + expect(meta).toEqual({ statusCode: status }); + }); + + it('still reports an empty non-2xx body as a failure', async () => { + vi.stubGlobal('fetch', vi.fn(async () => new Response(null, { status: 500 }))); + const grab = grabkit('https://api.example.com', { format: 'json' }); + + const [data, error] = await grab('POST /events', { body: { name: 'signup' } }); + + expect(data).toBeNull(); + expect(error).not.toBeNull(); + }); + it('serialises JSON:API write bodies and sets media type headers by default', async () => { const fetchMock = vi.fn(async () => new Response(null, { status: 204 })); vi.stubGlobal('fetch', fetchMock); diff --git a/packages/grabkit/src/publishBundle.test.ts b/packages/grabkit/src/publishBundle.test.ts index e9823fb..47a1a19 100644 --- a/packages/grabkit/src/publishBundle.test.ts +++ b/packages/grabkit/src/publishBundle.test.ts @@ -35,4 +35,16 @@ describe('publish bundle', () => { it('includes LICENSE in the npm tarball', () => { expect(listPackFiles()).toContain('LICENSE'); }); + + it.each([ + { runtime: 'Node ESM', args: ['--input-type=module', '-e', "const m = await import('grabkit'); console.log(typeof m.default)"] }, + { runtime: 'Node CJS', args: ['-e', "console.log(typeof require('grabkit').default)"] }, + ])('exposes a callable default export to $runtime consumers', ({ args }) => { + // Self-reference by package name resolves through `exports`, like a real install. + const { stdout, stderr, status } = spawnSync(process.execPath, args, { cwd: packageRoot, encoding: 'utf8' }); + + expect(stderr).toBe(''); + expect(status).toBe(0); + expect(stdout.trim()).toBe('function'); + }); });