@objectstack/express 3.2.7 → 3.2.9

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @objectstack/express@3.2.7 build /home/runner/work/spec/spec/packages/adapters/express
+> @objectstack/express@3.2.9 build /home/runner/work/spec/spec/packages/adapters/express
 > tsup --config ../../../tsup.config.ts
 
 CLI Building entry: src/index.ts
@@ -10,13 +10,13 @@
 CLI Cleaning output folder
 ESM Build start
 CJS Build start
-ESM dist/index.mjs     5.44 KB
-ESM dist/index.mjs.map 11.30 KB
-ESM ⚡️ Build success in 75ms
-CJS dist/index.js     6.51 KB
-CJS dist/index.js.map 11.36 KB
-CJS ⚡️ Build success in 78ms
+CJS dist/index.js     5.78 KB
+CJS dist/index.js.map 10.62 KB
+CJS ⚡️ Build success in 57ms
+ESM dist/index.mjs     4.71 KB
+ESM dist/index.mjs.map 10.57 KB
+ESM ⚡️ Build success in 58ms
 DTS Build start
-DTS ⚡️ Build success in 13301ms
-DTS dist/index.d.mts 934.00 B
-DTS dist/index.d.ts  934.00 B
+DTS ⚡️ Build success in 12433ms
+DTS dist/index.d.mts 1.18 KB
+DTS dist/index.d.ts  1.18 KB

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @objectstack/express
 
+## 3.2.9
+
+### Patch Changes
+
+- @objectstack/runtime@3.2.9
+
+## 3.2.8
+
+### Patch Changes
+
+- @objectstack/runtime@3.2.8
+
+## 3.2.8
+
+### Patch Changes
+
+- fix: unified catch-all dispatch pattern — `createExpressRouter()` now delegates all non-framework-specific routes to `HttpDispatcher.dispatch()`, automatically supporting packages, analytics, automation, i18n, ui, openapi, custom endpoints, and any future routes
+- Only auth (service check), storage (file upload), GraphQL (raw result), and discovery (response wrapper) remain as explicit routes
+
 ## 3.2.7
 
 ### Patch Changes

package/dist/index.d.mts

@@ -7,7 +7,12 @@ interface ExpressAdapterOptions {
 }
 /**
  * Creates an Express Router with all ObjectStack route dispatchers.
- * Provides Auth, GraphQL, Metadata, Data, and Storage routes.
+ *
+ * Only routes that need framework-specific handling (auth service, storage
+ * file upload, GraphQL raw result, discovery wrapper) are registered explicitly.
+ * All other routes are handled by a catch-all that delegates to
+ * `HttpDispatcher.dispatch()`, making the adapter automatically support
+ * new routes added to the dispatcher.
  *
  * @example
  * ```ts

package/dist/index.d.ts

@@ -7,7 +7,12 @@ interface ExpressAdapterOptions {
 }
 /**
  * Creates an Express Router with all ObjectStack route dispatchers.
- * Provides Auth, GraphQL, Metadata, Data, and Storage routes.
+ *
+ * Only routes that need framework-specific handling (auth service, storage
+ * file upload, GraphQL raw result, discovery wrapper) are registered explicitly.
+ * All other routes are handled by a catch-all that delegates to
+ * `HttpDispatcher.dispatch()`, making the adapter automatically support
+ * new routes added to the dispatcher.
  *
  * @example
  * ```ts

package/dist/index.js

@@ -121,44 +121,23 @@ function createExpressRouter(options) {
       return errorResponse(err, res);
     }
   });
-  router.all("/meta/{*path}", async (req, res) => {
-    try {
-      const subPath = "/" + req.params.path;
-      const method = req.method;
-      const body = method === "PUT" || method === "POST" ? req.body : void 0;
-      const result = await dispatcher.handleMetadata(subPath, { request: req }, method, body);
-      return sendResult(result, res);
-    } catch (err) {
-      return errorResponse(err, res);
-    }
-  });
-  router.all("/meta", async (req, res) => {
-    try {
-      const method = req.method;
-      const body = method === "PUT" || method === "POST" ? req.body : void 0;
-      const result = await dispatcher.handleMetadata("", { request: req }, method, body);
-      return sendResult(result, res);
-    } catch (err) {
-      return errorResponse(err, res);
-    }
-  });
-  router.all("/data/{*path}", async (req, res) => {
+  router.all("/storage/{*path}", async (req, res) => {
     try {
       const subPath = "/" + req.params.path;
       const method = req.method;
-      const body = method === "POST" || method === "PATCH" ? req.body : {};
-      const result = await dispatcher.handleData(subPath, method, body, req.query, { request: req });
+      const file = req.file || req.files?.file;
+      const result = await dispatcher.handleStorage(subPath, method, file, { request: req });
       return sendResult(result, res);
     } catch (err) {
       return errorResponse(err, res);
     }
   });
-  router.all("/storage/{*path}", async (req, res) => {
+  router.all("/{*path}", async (req, res) => {
     try {
       const subPath = "/" + req.params.path;
       const method = req.method;
-      const file = req.file || req.files?.file;
-      const result = await dispatcher.handleStorage(subPath, method, file, { request: req });
+      const body = method === "POST" || method === "PUT" || method === "PATCH" ? req.body : void 0;
+      const result = await dispatcher.dispatch(method, subPath, body, req.query, { request: req, response: res });
       return sendResult(result, res);
     } catch (err) {
       return errorResponse(err, res);

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"sourcesContent":["// Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.\n\nimport { type Router, type Request, type Response, type NextFunction, Router as createRouter } from 'express';\nimport { type ObjectKernel, HttpDispatcher, HttpDispatcherResult } from '@objectstack/runtime';\n\nexport interface ExpressAdapterOptions {\n  kernel: ObjectKernel;\n  prefix?: string;\n}\n\n/**\n * Auth service interface with handleRequest method\n */\ninterface AuthService {\n  handleRequest(request: globalThis.Request): Promise<globalThis.Response>;\n}\n\n/**\n * Creates an Express Router with all ObjectStack route dispatchers.\n * Provides Auth, GraphQL, Metadata, Data, and Storage routes.\n *\n * @example\n * ```ts\n * import express from 'express';\n * import { createExpressRouter } from '@objectstack/express';\n *\n * const app = express();\n * app.use('/api', createExpressRouter({ kernel }));\n * app.listen(3000);\n * ```\n */\nexport function createExpressRouter(options: ExpressAdapterOptions): Router {\n  const router = createRouter();\n  const dispatcher = new HttpDispatcher(options.kernel);\n  const prefix = options.prefix || '/api';\n\n  const sendResult = (result: HttpDispatcherResult, res: Response) => {\n    if (result.handled) {\n      if (result.response) {\n        if (result.response.headers) {\n          Object.entries(result.response.headers).forEach(([k, v]) => res.set(k, v as string));\n        }\n        return res.status(result.response.status).json(result.response.body);\n      }\n      if (result.result) {\n        const response = result.result;\n        if (response.type === 'redirect' && response.url) {\n          return res.redirect(response.url);\n        }\n        if (response.type === 'stream' && response.stream) {\n          if (response.headers) {\n            Object.entries(response.headers).forEach(([k, v]) => res.set(k, v as string));\n          }\n          response.stream.pipe(res);\n          return;\n        }\n        return res.status(200).json(response);\n      }\n    }\n    return res.status(404).json({ success: false, error: { message: 'Not Found', code: 404 } });\n  };\n\n  const errorResponse = (err: any, res: Response) => {\n    return res.status(err.statusCode || 500).json({\n      success: false,\n      error: {\n        message: err.message || 'Internal Server Error',\n        code: err.statusCode || 500,\n      },\n    });\n  };\n\n  // --- Discovery ---\n  router.get('/', async (_req: Request, res: Response) => {\n    res.json({ data: await dispatcher.getDiscoveryInfo(prefix) });\n  });\n\n  // --- Auth ---\n  router.all('/auth/{*path}', async (req: Request, res: Response) => {\n    try {\n      const path = (req.params as any).path;\n      const method = req.method;\n\n      // Try AuthPlugin service first (prefer async to support factory-based services)\n      let authService: AuthService | null = null;\n      try {\n        if (typeof options.kernel.getServiceAsync === 'function') {\n          authService = await options.kernel.getServiceAsync<AuthService>('auth');\n        } else if (typeof options.kernel.getService === 'function') {\n          authService = options.kernel.getService<AuthService>('auth');\n        }\n      } catch {\n        // Service not registered — fall through to dispatcher\n        authService = null;\n      }\n\n      if (authService && typeof authService.handleRequest === 'function') {\n        const protocol = req.protocol || 'http';\n        const host = req.get?.('host') || req.headers?.host || 'localhost';\n        const url = `${protocol}://${host}${req.originalUrl || req.url}`;\n        const headers = new Headers();\n        if (req.headers) {\n          Object.entries(req.headers).forEach(([k, v]) => {\n            if (typeof v === 'string') headers.set(k, v);\n            else if (Array.isArray(v)) headers.set(k, v.join(', '));\n          });\n        }\n        const init: RequestInit = { method, headers };\n        if (method !== 'GET' && method !== 'HEAD' && req.body) {\n          init.body = JSON.stringify(req.body);\n          if (!headers.has('content-type')) {\n            headers.set('content-type', 'application/json');\n          }\n        }\n        const webRequest = new Request(url, init);\n        const response = await authService.handleRequest(webRequest);\n        res.status(response.status);\n        response.headers.forEach((v: string, k: string) => res.set(k, v));\n        const text = await response.text();\n        return res.send(text);\n      }\n\n      // Fallback to dispatcher\n      const body = method === 'GET' || method === 'HEAD' ? {} : req.body || {};\n      const result = await dispatcher.handleAuth(path, method, body, { request: req, response: res });\n      return sendResult(result, res);\n    } catch (err: any) {\n      return errorResponse(err, res);\n    }\n  });\n\n  // --- GraphQL ---\n  router.post('/graphql', async (req: Request, res: Response) => {\n    try {\n      const result = await dispatcher.handleGraphQL(req.body, { request: req });\n      return res.json(result);\n    } catch (err: any) {\n      return errorResponse(err, res);\n    }\n  });\n\n  // --- Metadata ---\n  router.all('/meta/{*path}', async (req: Request, res: Response) => {\n    try {\n      const subPath = '/' + (req.params as any).path;\n      const method = req.method;\n      const body = (method === 'PUT' || method === 'POST') ? req.body : undefined;\n      const result = await dispatcher.handleMetadata(subPath, { request: req }, method, body);\n      return sendResult(result, res);\n    } catch (err: any) {\n      return errorResponse(err, res);\n    }\n  });\n\n  router.all('/meta', async (req: Request, res: Response) => {\n    try {\n      const method = req.method;\n      const body = (method === 'PUT' || method === 'POST') ? req.body : undefined;\n      const result = await dispatcher.handleMetadata('', { request: req }, method, body);\n      return sendResult(result, res);\n    } catch (err: any) {\n      return errorResponse(err, res);\n    }\n  });\n\n  // --- Data ---\n  router.all('/data/{*path}', async (req: Request, res: Response) => {\n    try {\n      const subPath = '/' + (req.params as any).path;\n      const method = req.method;\n      const body = (method === 'POST' || method === 'PATCH') ? req.body : {};\n      const result = await dispatcher.handleData(subPath, method, body, req.query, { request: req });\n      return sendResult(result, res);\n    } catch (err: any) {\n      return errorResponse(err, res);\n    }\n  });\n\n  // --- Storage ---\n  router.all('/storage/{*path}', async (req: Request, res: Response) => {\n    try {\n      const subPath = '/' + (req.params as any).path;\n      const method = req.method;\n      const file = (req as any).file || (req as any).files?.file;\n      const result = await dispatcher.handleStorage(subPath, method, file, { request: req });\n      return sendResult(result, res);\n    } catch (err: any) {\n      return errorResponse(err, res);\n    }\n  });\n\n  return router;\n}\n\n/**\n * Middleware that attaches the ObjectStack kernel to the request.\n */\nexport function objectStackMiddleware(kernel: ObjectKernel) {\n  return (req: Request, _res: Response, next: NextFunction) => {\n    (req as any).objectStack = kernel;\n    next();\n  };\n}\n"],"mappings":"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","names":["createRouter"]}
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["// Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.\n\nimport { type Router, type Request, type Response, type NextFunction, Router as createRouter } from 'express';\nimport { type ObjectKernel, HttpDispatcher, HttpDispatcherResult } from '@objectstack/runtime';\n\nexport interface ExpressAdapterOptions {\n  kernel: ObjectKernel;\n  prefix?: string;\n}\n\n/**\n * Auth service interface with handleRequest method\n */\ninterface AuthService {\n  handleRequest(request: globalThis.Request): Promise<globalThis.Response>;\n}\n\n/**\n * Creates an Express Router with all ObjectStack route dispatchers.\n *\n * Only routes that need framework-specific handling (auth service, storage\n * file upload, GraphQL raw result, discovery wrapper) are registered explicitly.\n * All other routes are handled by a catch-all that delegates to\n * `HttpDispatcher.dispatch()`, making the adapter automatically support\n * new routes added to the dispatcher.\n *\n * @example\n * ```ts\n * import express from 'express';\n * import { createExpressRouter } from '@objectstack/express';\n *\n * const app = express();\n * app.use('/api', createExpressRouter({ kernel }));\n * app.listen(3000);\n * ```\n */\nexport function createExpressRouter(options: ExpressAdapterOptions): Router {\n  const router = createRouter();\n  const dispatcher = new HttpDispatcher(options.kernel);\n  const prefix = options.prefix || '/api';\n\n  const sendResult = (result: HttpDispatcherResult, res: Response) => {\n    if (result.handled) {\n      if (result.response) {\n        if (result.response.headers) {\n          Object.entries(result.response.headers).forEach(([k, v]) => res.set(k, v as string));\n        }\n        return res.status(result.response.status).json(result.response.body);\n      }\n      if (result.result) {\n        const response = result.result;\n        if (response.type === 'redirect' && response.url) {\n          return res.redirect(response.url);\n        }\n        if (response.type === 'stream' && response.stream) {\n          if (response.headers) {\n            Object.entries(response.headers).forEach(([k, v]) => res.set(k, v as string));\n          }\n          response.stream.pipe(res);\n          return;\n        }\n        return res.status(200).json(response);\n      }\n    }\n    return res.status(404).json({ success: false, error: { message: 'Not Found', code: 404 } });\n  };\n\n  const errorResponse = (err: any, res: Response) => {\n    return res.status(err.statusCode || 500).json({\n      success: false,\n      error: {\n        message: err.message || 'Internal Server Error',\n        code: err.statusCode || 500,\n      },\n    });\n  };\n\n  // ─── Explicit routes (framework-specific handling required) ────────────────\n\n  // --- Discovery ---\n  router.get('/', async (_req: Request, res: Response) => {\n    res.json({ data: await dispatcher.getDiscoveryInfo(prefix) });\n  });\n\n  // --- Auth (needs auth service integration) ---\n  router.all('/auth/{*path}', async (req: Request, res: Response) => {\n    try {\n      const path = (req.params as any).path;\n      const method = req.method;\n\n      // Try AuthPlugin service first (prefer async to support factory-based services)\n      let authService: AuthService | null = null;\n      try {\n        if (typeof options.kernel.getServiceAsync === 'function') {\n          authService = await options.kernel.getServiceAsync<AuthService>('auth');\n        } else if (typeof options.kernel.getService === 'function') {\n          authService = options.kernel.getService<AuthService>('auth');\n        }\n      } catch {\n        // Service not registered — fall through to dispatcher\n        authService = null;\n      }\n\n      if (authService && typeof authService.handleRequest === 'function') {\n        const protocol = req.protocol || 'http';\n        const host = req.get?.('host') || req.headers?.host || 'localhost';\n        const url = `${protocol}://${host}${req.originalUrl || req.url}`;\n        const headers = new Headers();\n        if (req.headers) {\n          Object.entries(req.headers).forEach(([k, v]) => {\n            if (typeof v === 'string') headers.set(k, v);\n            else if (Array.isArray(v)) headers.set(k, v.join(', '));\n          });\n        }\n        const init: RequestInit = { method, headers };\n        if (method !== 'GET' && method !== 'HEAD' && req.body) {\n          init.body = JSON.stringify(req.body);\n          if (!headers.has('content-type')) {\n            headers.set('content-type', 'application/json');\n          }\n        }\n        const webRequest = new Request(url, init);\n        const response = await authService.handleRequest(webRequest);\n        res.status(response.status);\n        response.headers.forEach((v: string, k: string) => res.set(k, v));\n        const text = await response.text();\n        return res.send(text);\n      }\n\n      // Fallback to dispatcher\n      const body = method === 'GET' || method === 'HEAD' ? {} : req.body || {};\n      const result = await dispatcher.handleAuth(path, method, body, { request: req, response: res });\n      return sendResult(result, res);\n    } catch (err: any) {\n      return errorResponse(err, res);\n    }\n  });\n\n  // --- GraphQL (returns raw result, not HttpDispatcherResult) ---\n  router.post('/graphql', async (req: Request, res: Response) => {\n    try {\n      const result = await dispatcher.handleGraphQL(req.body, { request: req });\n      return res.json(result);\n    } catch (err: any) {\n      return errorResponse(err, res);\n    }\n  });\n\n  // --- Storage (needs file upload handling) ---\n  router.all('/storage/{*path}', async (req: Request, res: Response) => {\n    try {\n      const subPath = '/' + (req.params as any).path;\n      const method = req.method;\n      const file = (req as any).file || (req as any).files?.file;\n      const result = await dispatcher.handleStorage(subPath, method, file, { request: req });\n      return sendResult(result, res);\n    } catch (err: any) {\n      return errorResponse(err, res);\n    }\n  });\n\n  // ─── Catch-all: delegate to dispatcher.dispatch() ─────────────────────────\n  // Handles meta, data, packages, analytics, automation, i18n, ui, openapi,\n  // custom API endpoints, and any future routes added to HttpDispatcher.\n  router.all('/{*path}', async (req: Request, res: Response) => {\n    try {\n      const subPath = '/' + (req.params as any).path;\n      const method = req.method;\n      const body = (method === 'POST' || method === 'PUT' || method === 'PATCH') ? req.body : undefined;\n      const result = await dispatcher.dispatch(method, subPath, body, req.query, { request: req, response: res });\n      return sendResult(result, res);\n    } catch (err: any) {\n      return errorResponse(err, res);\n    }\n  });\n\n  return router;\n}\n\n/**\n * Middleware that attaches the ObjectStack kernel to the request.\n */\nexport function objectStackMiddleware(kernel: ObjectKernel) {\n  return (req: Request, _res: Response, next: NextFunction) => {\n    (req as any).objectStack = kernel;\n    next();\n  };\n}\n"],"mappings":"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","names":["createRouter"]}

package/dist/index.mjs

@@ -96,44 +96,23 @@ function createExpressRouter(options) {
       return errorResponse(err, res);
     }
   });
-  router.all("/meta/{*path}", async (req, res) => {
-    try {
-      const subPath = "/" + req.params.path;
-      const method = req.method;
-      const body = method === "PUT" || method === "POST" ? req.body : void 0;
-      const result = await dispatcher.handleMetadata(subPath, { request: req }, method, body);
-      return sendResult(result, res);
-    } catch (err) {
-      return errorResponse(err, res);
-    }
-  });
-  router.all("/meta", async (req, res) => {
-    try {
-      const method = req.method;
-      const body = method === "PUT" || method === "POST" ? req.body : void 0;
-      const result = await dispatcher.handleMetadata("", { request: req }, method, body);
-      return sendResult(result, res);
-    } catch (err) {
-      return errorResponse(err, res);
-    }
-  });
-  router.all("/data/{*path}", async (req, res) => {
+  router.all("/storage/{*path}", async (req, res) => {
     try {
       const subPath = "/" + req.params.path;
       const method = req.method;
-      const body = method === "POST" || method === "PATCH" ? req.body : {};
-      const result = await dispatcher.handleData(subPath, method, body, req.query, { request: req });
+      const file = req.file || req.files?.file;
+      const result = await dispatcher.handleStorage(subPath, method, file, { request: req });
       return sendResult(result, res);
     } catch (err) {
       return errorResponse(err, res);
     }
   });
-  router.all("/storage/{*path}", async (req, res) => {
+  router.all("/{*path}", async (req, res) => {
     try {
       const subPath = "/" + req.params.path;
       const method = req.method;
-      const file = req.file || req.files?.file;
-      const result = await dispatcher.handleStorage(subPath, method, file, { request: req });
+      const body = method === "POST" || method === "PUT" || method === "PATCH" ? req.body : void 0;
+      const result = await dispatcher.dispatch(method, subPath, body, req.query, { request: req, response: res });
       return sendResult(result, res);
     } catch (err) {
       return errorResponse(err, res);

package/dist/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"sourcesContent":["// Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.\n\nimport { type Router, type Request, type Response, type NextFunction, Router as createRouter } from 'express';\nimport { type ObjectKernel, HttpDispatcher, HttpDispatcherResult } from '@objectstack/runtime';\n\nexport interface ExpressAdapterOptions {\n  kernel: ObjectKernel;\n  prefix?: string;\n}\n\n/**\n * Auth service interface with handleRequest method\n */\ninterface AuthService {\n  handleRequest(request: globalThis.Request): Promise<globalThis.Response>;\n}\n\n/**\n * Creates an Express Router with all ObjectStack route dispatchers.\n * Provides Auth, GraphQL, Metadata, Data, and Storage routes.\n *\n * @example\n * ```ts\n * import express from 'express';\n * import { createExpressRouter } from '@objectstack/express';\n *\n * const app = express();\n * app.use('/api', createExpressRouter({ kernel }));\n * app.listen(3000);\n * ```\n */\nexport function createExpressRouter(options: ExpressAdapterOptions): Router {\n  const router = createRouter();\n  const dispatcher = new HttpDispatcher(options.kernel);\n  const prefix = options.prefix || '/api';\n\n  const sendResult = (result: HttpDispatcherResult, res: Response) => {\n    if (result.handled) {\n      if (result.response) {\n        if (result.response.headers) {\n          Object.entries(result.response.headers).forEach(([k, v]) => res.set(k, v as string));\n        }\n        return res.status(result.response.status).json(result.response.body);\n      }\n      if (result.result) {\n        const response = result.result;\n        if (response.type === 'redirect' && response.url) {\n          return res.redirect(response.url);\n        }\n        if (response.type === 'stream' && response.stream) {\n          if (response.headers) {\n            Object.entries(response.headers).forEach(([k, v]) => res.set(k, v as string));\n          }\n          response.stream.pipe(res);\n          return;\n        }\n        return res.status(200).json(response);\n      }\n    }\n    return res.status(404).json({ success: false, error: { message: 'Not Found', code: 404 } });\n  };\n\n  const errorResponse = (err: any, res: Response) => {\n    return res.status(err.statusCode || 500).json({\n      success: false,\n      error: {\n        message: err.message || 'Internal Server Error',\n        code: err.statusCode || 500,\n      },\n    });\n  };\n\n  // --- Discovery ---\n  router.get('/', async (_req: Request, res: Response) => {\n    res.json({ data: await dispatcher.getDiscoveryInfo(prefix) });\n  });\n\n  // --- Auth ---\n  router.all('/auth/{*path}', async (req: Request, res: Response) => {\n    try {\n      const path = (req.params as any).path;\n      const method = req.method;\n\n      // Try AuthPlugin service first (prefer async to support factory-based services)\n      let authService: AuthService | null = null;\n      try {\n        if (typeof options.kernel.getServiceAsync === 'function') {\n          authService = await options.kernel.getServiceAsync<AuthService>('auth');\n        } else if (typeof options.kernel.getService === 'function') {\n          authService = options.kernel.getService<AuthService>('auth');\n        }\n      } catch {\n        // Service not registered — fall through to dispatcher\n        authService = null;\n      }\n\n      if (authService && typeof authService.handleRequest === 'function') {\n        const protocol = req.protocol || 'http';\n        const host = req.get?.('host') || req.headers?.host || 'localhost';\n        const url = `${protocol}://${host}${req.originalUrl || req.url}`;\n        const headers = new Headers();\n        if (req.headers) {\n          Object.entries(req.headers).forEach(([k, v]) => {\n            if (typeof v === 'string') headers.set(k, v);\n            else if (Array.isArray(v)) headers.set(k, v.join(', '));\n          });\n        }\n        const init: RequestInit = { method, headers };\n        if (method !== 'GET' && method !== 'HEAD' && req.body) {\n          init.body = JSON.stringify(req.body);\n          if (!headers.has('content-type')) {\n            headers.set('content-type', 'application/json');\n          }\n        }\n        const webRequest = new Request(url, init);\n        const response = await authService.handleRequest(webRequest);\n        res.status(response.status);\n        response.headers.forEach((v: string, k: string) => res.set(k, v));\n        const text = await response.text();\n        return res.send(text);\n      }\n\n      // Fallback to dispatcher\n      const body = method === 'GET' || method === 'HEAD' ? {} : req.body || {};\n      const result = await dispatcher.handleAuth(path, method, body, { request: req, response: res });\n      return sendResult(result, res);\n    } catch (err: any) {\n      return errorResponse(err, res);\n    }\n  });\n\n  // --- GraphQL ---\n  router.post('/graphql', async (req: Request, res: Response) => {\n    try {\n      const result = await dispatcher.handleGraphQL(req.body, { request: req });\n      return res.json(result);\n    } catch (err: any) {\n      return errorResponse(err, res);\n    }\n  });\n\n  // --- Metadata ---\n  router.all('/meta/{*path}', async (req: Request, res: Response) => {\n    try {\n      const subPath = '/' + (req.params as any).path;\n      const method = req.method;\n      const body = (method === 'PUT' || method === 'POST') ? req.body : undefined;\n      const result = await dispatcher.handleMetadata(subPath, { request: req }, method, body);\n      return sendResult(result, res);\n    } catch (err: any) {\n      return errorResponse(err, res);\n    }\n  });\n\n  router.all('/meta', async (req: Request, res: Response) => {\n    try {\n      const method = req.method;\n      const body = (method === 'PUT' || method === 'POST') ? req.body : undefined;\n      const result = await dispatcher.handleMetadata('', { request: req }, method, body);\n      return sendResult(result, res);\n    } catch (err: any) {\n      return errorResponse(err, res);\n    }\n  });\n\n  // --- Data ---\n  router.all('/data/{*path}', async (req: Request, res: Response) => {\n    try {\n      const subPath = '/' + (req.params as any).path;\n      const method = req.method;\n      const body = (method === 'POST' || method === 'PATCH') ? req.body : {};\n      const result = await dispatcher.handleData(subPath, method, body, req.query, { request: req });\n      return sendResult(result, res);\n    } catch (err: any) {\n      return errorResponse(err, res);\n    }\n  });\n\n  // --- Storage ---\n  router.all('/storage/{*path}', async (req: Request, res: Response) => {\n    try {\n      const subPath = '/' + (req.params as any).path;\n      const method = req.method;\n      const file = (req as any).file || (req as any).files?.file;\n      const result = await dispatcher.handleStorage(subPath, method, file, { request: req });\n      return sendResult(result, res);\n    } catch (err: any) {\n      return errorResponse(err, res);\n    }\n  });\n\n  return router;\n}\n\n/**\n * Middleware that attaches the ObjectStack kernel to the request.\n */\nexport function objectStackMiddleware(kernel: ObjectKernel) {\n  return (req: Request, _res: Response, next: NextFunction) => {\n    (req as any).objectStack = kernel;\n    next();\n  };\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["// Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.\n\nimport { type Router, type Request, type Response, type NextFunction, Router as createRouter } from 'express';\nimport { type ObjectKernel, HttpDispatcher, HttpDispatcherResult } from '@objectstack/runtime';\n\nexport interface ExpressAdapterOptions {\n  kernel: ObjectKernel;\n  prefix?: string;\n}\n\n/**\n * Auth service interface with handleRequest method\n */\ninterface AuthService {\n  handleRequest(request: globalThis.Request): Promise<globalThis.Response>;\n}\n\n/**\n * Creates an Express Router with all ObjectStack route dispatchers.\n *\n * Only routes that need framework-specific handling (auth service, storage\n * file upload, GraphQL raw result, discovery wrapper) are registered explicitly.\n * All other routes are handled by a catch-all that delegates to\n * `HttpDispatcher.dispatch()`, making the adapter automatically support\n * new routes added to the dispatcher.\n *\n * @example\n * ```ts\n * import express from 'express';\n * import { createExpressRouter } from '@objectstack/express';\n *\n * const app = express();\n * app.use('/api', createExpressRouter({ kernel }));\n * app.listen(3000);\n * ```\n */\nexport function createExpressRouter(options: ExpressAdapterOptions): Router {\n  const router = createRouter();\n  const dispatcher = new HttpDispatcher(options.kernel);\n  const prefix = options.prefix || '/api';\n\n  const sendResult = (result: HttpDispatcherResult, res: Response) => {\n    if (result.handled) {\n      if (result.response) {\n        if (result.response.headers) {\n          Object.entries(result.response.headers).forEach(([k, v]) => res.set(k, v as string));\n        }\n        return res.status(result.response.status).json(result.response.body);\n      }\n      if (result.result) {\n        const response = result.result;\n        if (response.type === 'redirect' && response.url) {\n          return res.redirect(response.url);\n        }\n        if (response.type === 'stream' && response.stream) {\n          if (response.headers) {\n            Object.entries(response.headers).forEach(([k, v]) => res.set(k, v as string));\n          }\n          response.stream.pipe(res);\n          return;\n        }\n        return res.status(200).json(response);\n      }\n    }\n    return res.status(404).json({ success: false, error: { message: 'Not Found', code: 404 } });\n  };\n\n  const errorResponse = (err: any, res: Response) => {\n    return res.status(err.statusCode || 500).json({\n      success: false,\n      error: {\n        message: err.message || 'Internal Server Error',\n        code: err.statusCode || 500,\n      },\n    });\n  };\n\n  // ─── Explicit routes (framework-specific handling required) ────────────────\n\n  // --- Discovery ---\n  router.get('/', async (_req: Request, res: Response) => {\n    res.json({ data: await dispatcher.getDiscoveryInfo(prefix) });\n  });\n\n  // --- Auth (needs auth service integration) ---\n  router.all('/auth/{*path}', async (req: Request, res: Response) => {\n    try {\n      const path = (req.params as any).path;\n      const method = req.method;\n\n      // Try AuthPlugin service first (prefer async to support factory-based services)\n      let authService: AuthService | null = null;\n      try {\n        if (typeof options.kernel.getServiceAsync === 'function') {\n          authService = await options.kernel.getServiceAsync<AuthService>('auth');\n        } else if (typeof options.kernel.getService === 'function') {\n          authService = options.kernel.getService<AuthService>('auth');\n        }\n      } catch {\n        // Service not registered — fall through to dispatcher\n        authService = null;\n      }\n\n      if (authService && typeof authService.handleRequest === 'function') {\n        const protocol = req.protocol || 'http';\n        const host = req.get?.('host') || req.headers?.host || 'localhost';\n        const url = `${protocol}://${host}${req.originalUrl || req.url}`;\n        const headers = new Headers();\n        if (req.headers) {\n          Object.entries(req.headers).forEach(([k, v]) => {\n            if (typeof v === 'string') headers.set(k, v);\n            else if (Array.isArray(v)) headers.set(k, v.join(', '));\n          });\n        }\n        const init: RequestInit = { method, headers };\n        if (method !== 'GET' && method !== 'HEAD' && req.body) {\n          init.body = JSON.stringify(req.body);\n          if (!headers.has('content-type')) {\n            headers.set('content-type', 'application/json');\n          }\n        }\n        const webRequest = new Request(url, init);\n        const response = await authService.handleRequest(webRequest);\n        res.status(response.status);\n        response.headers.forEach((v: string, k: string) => res.set(k, v));\n        const text = await response.text();\n        return res.send(text);\n      }\n\n      // Fallback to dispatcher\n      const body = method === 'GET' || method === 'HEAD' ? {} : req.body || {};\n      const result = await dispatcher.handleAuth(path, method, body, { request: req, response: res });\n      return sendResult(result, res);\n    } catch (err: any) {\n      return errorResponse(err, res);\n    }\n  });\n\n  // --- GraphQL (returns raw result, not HttpDispatcherResult) ---\n  router.post('/graphql', async (req: Request, res: Response) => {\n    try {\n      const result = await dispatcher.handleGraphQL(req.body, { request: req });\n      return res.json(result);\n    } catch (err: any) {\n      return errorResponse(err, res);\n    }\n  });\n\n  // --- Storage (needs file upload handling) ---\n  router.all('/storage/{*path}', async (req: Request, res: Response) => {\n    try {\n      const subPath = '/' + (req.params as any).path;\n      const method = req.method;\n      const file = (req as any).file || (req as any).files?.file;\n      const result = await dispatcher.handleStorage(subPath, method, file, { request: req });\n      return sendResult(result, res);\n    } catch (err: any) {\n      return errorResponse(err, res);\n    }\n  });\n\n  // ─── Catch-all: delegate to dispatcher.dispatch() ─────────────────────────\n  // Handles meta, data, packages, analytics, automation, i18n, ui, openapi,\n  // custom API endpoints, and any future routes added to HttpDispatcher.\n  router.all('/{*path}', async (req: Request, res: Response) => {\n    try {\n      const subPath = '/' + (req.params as any).path;\n      const method = req.method;\n      const body = (method === 'POST' || method === 'PUT' || method === 'PATCH') ? req.body : undefined;\n      const result = await dispatcher.dispatch(method, subPath, body, req.query, { request: req, response: res });\n      return sendResult(result, res);\n    } catch (err: any) {\n      return errorResponse(err, res);\n    }\n  });\n\n  return router;\n}\n\n/**\n * Middleware that attaches the ObjectStack kernel to the request.\n */\nexport function objectStackMiddleware(kernel: ObjectKernel) {\n  return (req: Request, _res: Response, next: NextFunction) => {\n    (req as any).objectStack = kernel;\n    next();\n  };\n}\n"],"mappings":"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","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@objectstack/express",
-  "version": "3.2.7",
+  "version": "3.2.9",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -13,14 +13,14 @@
   },
   "peerDependencies": {
     "express": "^5.1.0",
-    "@objectstack/runtime": "^3.2.7"
+    "@objectstack/runtime": "^3.2.9"
   },
   "devDependencies": {
     "@types/express": "^5.0.3",
     "express": "^5.1.0",
     "typescript": "^5.0.0",
-    "vitest": "^4.0.18",
-    "@objectstack/runtime": "3.2.7"
+    "vitest": "^4.1.0",
+    "@objectstack/runtime": "3.2.9"
   },
   "scripts": {
     "build": "tsup --config ../../../tsup.config.ts",

package/src/express.test.ts

@@ -7,9 +7,8 @@ const mockDispatcher = {
   getDiscoveryInfo: vi.fn().mockReturnValue({ version: '1.0', endpoints: [] }),
   handleAuth: vi.fn().mockResolvedValue({ handled: true, response: { body: { ok: true }, status: 200 } }),
   handleGraphQL: vi.fn().mockResolvedValue({ data: {} }),
-  handleMetadata: vi.fn().mockResolvedValue({ handled: true, response: { body: { objects: [] }, status: 200 } }),
-  handleData: vi.fn().mockResolvedValue({ handled: true, response: { body: { records: [] }, status: 200 } }),
   handleStorage: vi.fn().mockResolvedValue({ handled: true, response: { body: {}, status: 200 } }),
+  dispatch: vi.fn().mockResolvedValue({ handled: true, response: { body: { success: true }, status: 200 } }),
 };
 
 vi.mock('@objectstack/runtime', () => {

package/src/index.ts

@@ -17,7 +17,12 @@ interface AuthService {
 
 /**
  * Creates an Express Router with all ObjectStack route dispatchers.
- * Provides Auth, GraphQL, Metadata, Data, and Storage routes.
+ *
+ * Only routes that need framework-specific handling (auth service, storage
+ * file upload, GraphQL raw result, discovery wrapper) are registered explicitly.
+ * All other routes are handled by a catch-all that delegates to
+ * `HttpDispatcher.dispatch()`, making the adapter automatically support
+ * new routes added to the dispatcher.
  *
  * @example
  * ```ts
@@ -70,12 +75,14 @@ export function createExpressRouter(options: ExpressAdapterOptions): Router {
     });
   };
 
+  // ─── Explicit routes (framework-specific handling required) ────────────────
+
   // --- Discovery ---
   router.get('/', async (_req: Request, res: Response) => {
     res.json({ data: await dispatcher.getDiscoveryInfo(prefix) });
   });
 
-  // --- Auth ---
+  // --- Auth (needs auth service integration) ---
   router.all('/auth/{*path}', async (req: Request, res: Response) => {
     try {
       const path = (req.params as any).path;
@@ -129,7 +136,7 @@ export function createExpressRouter(options: ExpressAdapterOptions): Router {
     }
   });
 
-  // --- GraphQL ---
+  // --- GraphQL (returns raw result, not HttpDispatcherResult) ---
   router.post('/graphql', async (req: Request, res: Response) => {
     try {
       const result = await dispatcher.handleGraphQL(req.body, { request: req });
@@ -139,50 +146,28 @@ export function createExpressRouter(options: ExpressAdapterOptions): Router {
     }
   });
 
-  // --- Metadata ---
-  router.all('/meta/{*path}', async (req: Request, res: Response) => {
-    try {
-      const subPath = '/' + (req.params as any).path;
-      const method = req.method;
-      const body = (method === 'PUT' || method === 'POST') ? req.body : undefined;
-      const result = await dispatcher.handleMetadata(subPath, { request: req }, method, body);
-      return sendResult(result, res);
-    } catch (err: any) {
-      return errorResponse(err, res);
-    }
-  });
-
-  router.all('/meta', async (req: Request, res: Response) => {
-    try {
-      const method = req.method;
-      const body = (method === 'PUT' || method === 'POST') ? req.body : undefined;
-      const result = await dispatcher.handleMetadata('', { request: req }, method, body);
-      return sendResult(result, res);
-    } catch (err: any) {
-      return errorResponse(err, res);
-    }
-  });
-
-  // --- Data ---
-  router.all('/data/{*path}', async (req: Request, res: Response) => {
+  // --- Storage (needs file upload handling) ---
+  router.all('/storage/{*path}', async (req: Request, res: Response) => {
     try {
       const subPath = '/' + (req.params as any).path;
       const method = req.method;
-      const body = (method === 'POST' || method === 'PATCH') ? req.body : {};
-      const result = await dispatcher.handleData(subPath, method, body, req.query, { request: req });
+      const file = (req as any).file || (req as any).files?.file;
+      const result = await dispatcher.handleStorage(subPath, method, file, { request: req });
       return sendResult(result, res);
     } catch (err: any) {
       return errorResponse(err, res);
     }
   });
 
-  // --- Storage ---
-  router.all('/storage/{*path}', async (req: Request, res: Response) => {
+  // ─── Catch-all: delegate to dispatcher.dispatch() ─────────────────────────
+  // Handles meta, data, packages, analytics, automation, i18n, ui, openapi,
+  // custom API endpoints, and any future routes added to HttpDispatcher.
+  router.all('/{*path}', async (req: Request, res: Response) => {
     try {
       const subPath = '/' + (req.params as any).path;
       const method = req.method;
-      const file = (req as any).file || (req as any).files?.file;
-      const result = await dispatcher.handleStorage(subPath, method, file, { request: req });
+      const body = (method === 'POST' || method === 'PUT' || method === 'PATCH') ? req.body : undefined;
+      const result = await dispatcher.dispatch(method, subPath, body, req.query, { request: req, response: res });
       return sendResult(result, res);
     } catch (err: any) {
       return errorResponse(err, res);