@niledatabase/express 5.0.0-alpha.15 → 5.0.0-alpha.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@niledatabase/express",
-  "version": "5.0.0-alpha.15",
+  "version": "5.0.0-alpha.16",
   "license": "MIT",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -17,6 +17,9 @@
     "singleQuote": true,
     "trailingComma": "es5"
   },
+  "files": [
+    "dist"
+  ],
   "scripts": {
     "build": "tsup src/index.ts",
     "test": "jest"
@@ -40,5 +43,5 @@
     "ts-jest": "^29.3.4",
     "tsup": "^8.5.0"
   },
-  "gitHead": "5838393fd8739e388754a43b0efcd8430d6d6027"
+  "gitHead": "b96e22d67b78a2a0d6d8027dea4973272a1ce94e"
 }

package/CHANGELOG.md

@@ -1,58 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-# [5.0.0-alpha.15](https://github.com/niledatabase/nile-js/compare/v5.0.0-alpha.14...v5.0.0-alpha.15) (2025-06-25)
-
-### Bug Fixes
-
-- **server:** add better extensions ([2dd7417](https://github.com/niledatabase/nile-js/commit/2dd741726e2336b042d06a36ad091e6749098454))
-
-# [5.0.0-alpha.14](https://github.com/niledatabase/nile-js/compare/v5.0.0-alpha.13...v5.0.0-alpha.14) (2025-06-16)
-
-**Note:** Version bump only for package @niledatabase/express
-
-# [5.0.0-alpha.13](https://github.com/niledatabase/nile-js/compare/v5.0.0-alpha.12...v5.0.0-alpha.13) (2025-06-16)
-
-**Note:** Version bump only for package @niledatabase/express
-
-# [5.0.0-alpha.12](https://github.com/niledatabase/nile-js/compare/v5.0.0-alpha.11...v5.0.0-alpha.12) (2025-06-16)
-
-**Note:** Version bump only for package @niledatabase/express
-
-# [5.0.0-alpha.11](https://github.com/niledatabase/nile-js/compare/v5.0.0-alpha.10...v5.0.0-alpha.11) (2025-06-16)
-
-**Note:** Version bump only for package @niledatabase/express
-
-# [5.0.0-alpha.10](https://github.com/niledatabase/nile-js/compare/v5.0.0-alpha.9...v5.0.0-alpha.10) (2025-06-16)
-
-**Note:** Version bump only for package @niledatabase/express
-
-# [5.0.0-alpha.9](https://github.com/niledatabase/nile-js/compare/v5.0.0-alpha.8...v5.0.0-alpha.9) (2025-06-16)
-
-**Note:** Version bump only for package @niledatabase/express
-
-# [5.0.0-alpha.8](https://github.com/niledatabase/nile-js/compare/v5.0.0-alpha.7...v5.0.0-alpha.8) (2025-06-12)
-
-**Note:** Version bump only for package @niledatabase/express
-
-# [5.0.0-alpha.7](https://github.com/niledatabase/nile-js/compare/v5.0.0-alpha.6...v5.0.0-alpha.7) (2025-06-11)
-
-**Note:** Version bump only for package @niledatabase/express
-
-# [5.0.0-alpha.6](https://github.com/niledatabase/nile-js/compare/v5.0.0-alpha.5...v5.0.0-alpha.6) (2025-06-11)
-
-### Bug Fixes
-
-- **server:** move logging to the config object ([6e3e380](https://github.com/niledatabase/nile-js/commit/6e3e38014f5b9795552af0a7b97e2d3fe6cd1a88))
-
-# [5.0.0-alpha.5](https://github.com/niledatabase/nile-js/compare/v5.0.0-alpha.4...v5.0.0-alpha.5) (2025-06-10)
-
-**Note:** Version bump only for package @niledatabase/express
-
-# [5.0.0-alpha.4](https://github.com/niledatabase/nile-js/compare/v5.0.0-alpha.3...v5.0.0-alpha.4) (2025-06-10)
-
-### Features
-
-- **server:** invites ([c10f598](https://github.com/niledatabase/nile-js/commit/c10f5980bcbc55ed436ce8cceca4111aa8e6a276))

package/jest.config.js

@@ -1,6 +0,0 @@
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-
-module.exports = {
-  preset: 'ts-jest',
-  testEnvironment: 'node',
-};

package/src/express.test.ts

@@ -1,166 +0,0 @@
-import express from 'express';
-import { ExtensionState, Server } from '@niledatabase/server';
-import type {
-  Request as ExpressRequest,
-  Response as ExpressResponse,
-} from 'express';
-
-import { express as expressExtension, cleaner } from '.';
-
-describe('express extension', () => {
-  let app;
-  let instance: Server;
-
-  beforeEach(() => {
-    app = express();
-    app.use(express.json());
-
-    instance = {
-      logger: () => ({
-        error: jest.fn(),
-        debug: jest.fn(),
-        warn: jest.fn(),
-        info: jest.fn(),
-      }),
-      handlers: {
-        GET: jest
-          .fn()
-          .mockResolvedValue(
-            new Response(JSON.stringify({ msg: 'GET OK' }), { status: 200 })
-          ),
-        POST: jest
-          .fn()
-          .mockResolvedValue(
-            new Response(JSON.stringify({ msg: 'POST OK' }), { status: 201 })
-          ),
-      },
-      setContext: jest.fn(),
-      paths: {
-        get: ['/test/{id}'],
-        post: ['/submit/{formId}'],
-        put: [],
-        delete: [],
-      },
-    } as unknown as Server;
-  });
-
-  describe('cleaner()', () => {
-    it('replaces {param} with :param', () => {
-      expect(cleaner('/api/{tenantId}/resource')).toBe(
-        '/api/:tenantId/resource'
-      );
-    });
-  });
-
-  describe('onSetContext', () => {
-    it('sets context from params and headers', () => {
-      const ext = expressExtension(instance);
-      const req = {
-        params: { tenantId: 'abc' },
-        headers: { 'x-foo': 'bar' },
-      } as unknown as ExpressRequest;
-      const res = {} as unknown as ExpressResponse;
-      const next = jest.fn();
-
-      ext.onSetContext(req, res, next);
-
-      expect(instance.setContext).toHaveBeenCalledWith({ tenantId: 'abc' });
-      expect(instance.setContext).toHaveBeenCalledWith(req.headers);
-      expect(next).toHaveBeenCalled();
-    });
-  });
-
-  describe('onConfigure', () => {
-    it('cleans up path params and updates instance.paths', () => {
-      const ext = expressExtension(instance);
-      ext.onConfigure();
-      expect(instance.paths).toEqual({
-        get: ['/test/:id'],
-        post: ['/submit/:formId'],
-        put: [],
-        delete: [],
-      });
-    });
-  });
-
-  describe('onHandleRequest', () => {
-    it('proxies GET request with JSON response', async () => {
-      const ext = expressExtension(instance);
-      const req = {
-        method: 'GET',
-        protocol: 'http',
-        get: () => 'localhost',
-        originalUrl: '/api/test',
-        headers: { cookie: 'a=b' },
-        body: {},
-      } as unknown as ExpressRequest;
-      const res = {
-        headersSent: false,
-        status: jest.fn().mockReturnThis(),
-        set: jest.fn().mockReturnThis(),
-        json: jest.fn(),
-        send: jest.fn(),
-      } as unknown as ExpressResponse;
-
-      const result = await ext.onHandleRequest(req, res);
-
-      expect(instance.setContext).toHaveBeenCalledWith(req.headers);
-      expect(instance.handlers.GET).toHaveBeenCalled();
-      expect(res.status).toHaveBeenCalledWith(200);
-      expect(res.json).toHaveBeenCalledWith({ msg: 'GET OK' });
-      expect(result).toBe(ExtensionState.onHandleRequest);
-    });
-
-    it('handles non-JSON response fallback', async () => {
-      (instance.handlers.GET as jest.Mock).mockResolvedValue(
-        new Response('Plain text body', { status: 200 })
-      );
-      const ext = expressExtension(instance);
-
-      const req = {
-        method: 'GET',
-        protocol: 'http',
-        get: () => 'localhost',
-        originalUrl: '/api/test',
-        headers: {},
-        body: {},
-      } as unknown as ExpressRequest;
-      const res = {
-        headersSent: false,
-        status: jest.fn().mockReturnThis(),
-        set: jest.fn().mockReturnThis(),
-        json: jest.fn(),
-        send: jest.fn(),
-      } as unknown as ExpressResponse;
-
-      await ext.onHandleRequest(req, res);
-
-      expect(res.send).toHaveBeenCalledWith('Plain text body');
-    });
-
-    it('does not re-send headers if already sent', async () => {
-      const ext = expressExtension(instance);
-
-      const req = {
-        method: 'GET',
-        protocol: 'http',
-        get: () => 'localhost',
-        originalUrl: '/api/test',
-        headers: {},
-        body: {},
-      } as unknown as ExpressRequest;
-      const res = {
-        headersSent: true,
-        status: jest.fn(),
-        set: jest.fn(),
-        json: jest.fn(),
-        send: jest.fn(),
-      } as unknown as ExpressResponse;
-
-      const result = await ext.onHandleRequest(req, res);
-
-      expect(res.status).not.toHaveBeenCalled();
-      expect(result).toBe(ExtensionState.onHandleRequest);
-    });
-  });
-});

package/src/index.ts

@@ -1,147 +0,0 @@
-import { ExtensionState, Server } from '@niledatabase/server';
-import type {
-  Request as ExpressRequest,
-  Response as ExpressResponse,
-  NextFunction,
-} from 'express';
-
-export function cleaner(val: string) {
-  return val.replaceAll(/\{([^}]+)\}/g, ':$1');
-}
-
-export const express = (instance: Server) => {
-  const { error, debug } = instance.logger('[EXTENSION][express]');
-  return {
-    id: 'express',
-    onSetContext: (
-      req: ExpressRequest,
-      res: ExpressResponse,
-      next: NextFunction
-    ) => {
-      // do this first, since `cookies` does not persist across context set
-      if (req.params.tenantId) {
-        instance.setContext({ tenantId: req.params.tenantId });
-      }
-
-      if (req.headers) {
-        instance.setContext(req.headers);
-      }
-      if (req instanceof Headers) {
-        instance.setContext(req);
-      }
-
-      if (typeof next === 'function') {
-        next();
-      }
-    },
-    onConfigure: () => {
-      const { paths: nilePaths } = instance;
-      const paths = {
-        get: nilePaths.get.map(cleaner),
-        post: nilePaths.post.map(cleaner),
-        put: nilePaths.put.map(cleaner),
-        delete: nilePaths.delete.map(cleaner),
-      };
-      debug(`paths configured ${JSON.stringify(paths)}`);
-      instance.paths = paths;
-    },
-    onHandleRequest: async (req: ExpressRequest, res: ExpressResponse) => {
-      // handle standard request objects
-      if (req instanceof Request) {
-        debug('using default response');
-        const response = await instance.handlers[
-          req.method as 'GET' | 'POST' | 'PUT' | 'DELETE'
-          // disable the extension so we don't re-handle
-        ](req, { disableExtensions: ['express'] });
-        return response;
-      }
-
-      debug('handling response');
-      instance.setContext(req.headers);
-
-      const reqUrl = req.protocol + '://' + req.get('host') + req.originalUrl;
-
-      // be sure its a valid url
-      try {
-        new URL(reqUrl);
-      } catch (e) {
-        throw new Error(
-          'Invalid URL sent for handle request. Are you running express?'
-        );
-      }
-      const { method } = req;
-      const init: RequestInit = { method, headers: new Headers() };
-      // seems like this should work without this, since `get/set context should do the things we think it should.
-      if (
-        'headers' in req &&
-        typeof req.headers === 'object' &&
-        req.headers &&
-        'cookie' in req.headers &&
-        typeof req.headers.cookie === 'string'
-      ) {
-        (init.headers as Headers).set('cookie', req.headers.cookie);
-      }
-
-      if ('body' in req) {
-        if (method === 'POST' || method === 'PUT') {
-          init.body = JSON.stringify(req.body);
-        }
-      }
-
-      const proxyRequest = new Request(reqUrl, init);
-      debug(
-        `[${method.toUpperCase()}]proxy request converted to ${reqUrl} with ${JSON.stringify(
-          init
-        )}`
-      );
-
-      let response: Response = null as unknown as Response;
-
-      try {
-        response = (await instance.handlers[
-          req.method as 'GET' | 'POST' | 'PUT' | 'DELETE'
-        ](proxyRequest, { disableExtensions: ['express'] })) as Response;
-      } catch (e) {
-        error(e);
-      }
-
-      let body;
-      try {
-        const tryJson = await response.clone();
-        body = await tryJson.json();
-      } catch (e) {
-        body = await response.text();
-      }
-
-      const newHeaders: Record<string, string | string[]> = {};
-      response.headers.forEach((value, key) => {
-        if (
-          !['content-length', 'transfer-encoding'].includes(key.toLowerCase())
-        ) {
-          if (newHeaders[key]) {
-            const prev = newHeaders[key];
-            if (Array.isArray(prev)) {
-              newHeaders[key] = [...prev, value];
-            } else {
-              newHeaders[key] = [prev, value];
-            }
-          } else {
-            newHeaders[key] = value;
-          }
-        }
-      });
-
-      if (!res.headersSent) {
-        debug('sending response');
-        res.status(response.status).set(newHeaders);
-        if (typeof body === 'string') {
-          res.send(body);
-        } else {
-          res.json(body ?? {});
-        }
-      }
-      // always return to prevent infinite loop
-      return ExtensionState.onHandleRequest;
-    },
-  };
-};

package/tsup.config.js

@@ -1,9 +0,0 @@
-import { defineConfig } from 'tsup';
-
-export default defineConfig({
-  minify: true,
-  target: 'es2022',
-  sourcemap: true,
-  dts: true,
-  format: ['esm', 'cjs'],
-});