fix(http): router callback typing

aeria-org · Mar 12, 2024 · 9fde2e6 · 9fde2e6
1 parent da9804d
commit 9fde2e6
Show file tree

Hide file tree

Showing 18 changed files with 140 additions and 66 deletions.
diff --git a/packages/aeria-build/CHANGELOG.md b/packages/aeria-build/CHANGELOG.md
@@ -1,5 +1,12 @@
 # aeria-build
 
+## 0.0.23
+
+### Patch Changes
+
+- @aeriajs/api@0.0.20
+- @aeriajs/builtins@0.0.20
+
 ## 0.0.22
 
 ### Patch Changes

diff --git a/packages/aeria-build/package.json b/packages/aeria-build/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aeria-build",
-  "version": "0.0.22",
+  "version": "0.0.23",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -46,8 +46,8 @@
     "tslib": "^2.5.0"
   },
   "peerDependencies": {
-    "@aeriajs/api": "^0.0.19",
-    "@aeriajs/builtins": "^0.0.19",
+    "@aeriajs/api": "^0.0.20",
+    "@aeriajs/builtins": "^0.0.20",
     "@aeriajs/common": "^0.0.9",
     "@aeriajs/types": "^0.0.8"
   }

diff --git a/packages/aeria/CHANGELOG.md b/packages/aeria/CHANGELOG.md
@@ -1,5 +1,17 @@
 # aeria
 
+## 0.0.20
+
+### Patch Changes
+
+- Updated dependencies
+  - @aeriajs/http@0.0.14
+  - @aeriajs/api@0.0.20
+  - @aeriajs/node-http@0.0.14
+  - @aeriajs/server@0.0.20
+  - @aeriajs/builtins@0.0.20
+  - @aeriajs/security@0.0.20
+
 ## 0.0.19
 
 ### Patch Changes

diff --git a/packages/aeria/package.json b/packages/aeria/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aeria",
-  "version": "0.0.19",
+  "version": "0.0.20",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -34,14 +34,14 @@
   ],
   "peerDependencies": {
     "@aeriajs/access-control": "^0.0.9",
-    "@aeriajs/api": "^0.0.19",
+    "@aeriajs/api": "^0.0.20",
     "@aeriajs/common": "^0.0.9",
     "@aeriajs/entrypoint": "^0.0.9",
-    "@aeriajs/http": "^0.0.13",
-    "@aeriajs/node-http": "^0.0.13",
-    "@aeriajs/security": "^0.0.19",
-    "@aeriajs/server": "^0.0.19",
-    "@aeriajs/builtins": "^0.0.19",
+    "@aeriajs/http": "^0.0.14",
+    "@aeriajs/node-http": "^0.0.14",
+    "@aeriajs/security": "^0.0.20",
+    "@aeriajs/server": "^0.0.20",
+    "@aeriajs/builtins": "^0.0.20",
     "@aeriajs/types": "^0.0.8",
     "@aeriajs/validation": "^0.0.12"
   }

diff --git a/packages/api/CHANGELOG.md b/packages/api/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @aeriajs/api
 
+## 0.0.20
+
+### Patch Changes
+
+- Updated dependencies
+  - @aeriajs/http@0.0.14
+  - @aeriajs/builtins@0.0.20
+  - @aeriajs/security@0.0.20
+
 ## 0.0.19
 
 ### Patch Changes

diff --git a/packages/api/package.json b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/api",
-  "version": "0.0.19",
+  "version": "0.0.20",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -45,9 +45,9 @@
     "@aeriajs/access-control": "^0.0.9",
     "@aeriajs/common": "^0.0.9",
     "@aeriajs/entrypoint": "^0.0.9",
-    "@aeriajs/http": "^0.0.13",
-    "@aeriajs/security": "^0.0.19",
-    "@aeriajs/builtins": "^0.0.19",
+    "@aeriajs/http": "^0.0.14",
+    "@aeriajs/security": "^0.0.20",
+    "@aeriajs/builtins": "^0.0.20",
     "@aeriajs/types": "^0.0.8",
     "@aeriajs/validation": "^0.0.12",
     "jsonwebtoken": "^8.5.1",

diff --git a/packages/builtins/CHANGELOG.md b/packages/builtins/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @aeriajs/builtins
 
+## 0.0.20
+
+### Patch Changes
+
+- @aeriajs/api@0.0.20
+
 ## 0.0.19
 
 ### Patch Changes

diff --git a/packages/builtins/package.json b/packages/builtins/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/builtins",
-  "version": "0.0.19",
+  "version": "0.0.20",
   "description": "## Installation",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -51,7 +51,7 @@
     "mongodb": "^6.1.0"
   },
   "peerDependencies": {
-    "@aeriajs/api": "^0.0.19",
+    "@aeriajs/api": "^0.0.20",
     "@aeriajs/access-control": "^0.0.9",
     "@aeriajs/entrypoint": "^0.0.9",
     "@aeriajs/common": "^0.0.9",

diff --git a/packages/http/CHANGELOG.md b/packages/http/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @aeriajs/http
 
+## 0.0.14
+
+### Patch Changes
+
+- Fix router callback typing
+
 ## 0.0.13
 
 ### Patch Changes

diff --git a/packages/http/package.json b/packages/http/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/http",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "description": "## Installation",
   "main": "dist/index.js",
   "module": "dist/index.mjs",

diff --git a/packages/http/src/routing.ts b/packages/http/src/routing.ts
@@ -48,10 +48,20 @@ type TypedContext<TContractWithRoles extends ContractWithRoles> = Omit<Context,
 export type ProxiedRouter<TRouter> = TRouter & Record<
   RequestMethod,
   <
-    TCallback extends (context: TypedContext<TContractWithRoles>)=> TContractWithRoles extends { response: infer Response }
-      ? InferResponse<Response>
-      : any,
-    const TContractWithRoles extends ContractWithRoles,
+    const TContractWithRoles extends ContractWithRoles | {},
+    TCallback extends (
+      TContractWithRoles extends { response: infer Response }
+        ? InferResponse<Response>
+        : any
+    ) extends infer Response
+      ? 'roles' extends keyof TContractWithRoles
+        ? TContractWithRoles['roles'] extends readonly (infer Role)[]
+          ? 'guest' extends Role
+            ? (context: TypedContext<TContractWithRoles>)=> Response
+            : (context: TypedContext<TContractWithRoles> & { token: { authenticated: true } })=> Response
+          : never
+        : (context: TypedContext<TContractWithRoles>)=> Response
+      : never,
   >(
     exp: RouteUri,
     cb: TCallback,
@@ -107,21 +117,12 @@ export const matches = <TRequest extends GenericRequest>(
   }
 }
 
-export const registerRoute = async <
-  const TContractWithRoles extends ContractWithRoles,
-  TCallback extends 'roles' extends keyof TContractWithRoles
-    ? TContractWithRoles['roles'] extends readonly (infer Role)[]
-      ? 'guest' extends Role
-        ? (context: Context)=> any
-        : (context: Context & { token: { authenticated: true } })=> any
-      : never
-    : (context: Context)=> any,
->(
+export const registerRoute = async (
   context: Context,
   method: RequestMethod | RequestMethod[],
   exp: RouteUri,
-  cb: TCallback,
-  contract?: TContractWithRoles,
+  cb: (context: Context)=> any,
+  contract?: ContractWithRoles,
   options: RouterOptions = {},
 ) => {
   const match = matches(context.request, method, exp, options)
@@ -243,10 +244,20 @@ export const createRouter = (options: Partial<RouterOptions> = {}) => {
   const routesMeta = {} as RoutesMeta
 
   const route = <
-    TCallback extends (context: TypedContext<TContractWithRoles>)=> TContractWithRoles extends { response: infer Response }
-      ? InferResponse<Response>
-      : TContractWithRoles,
-    const TContractWithRoles extends ContractWithRoles,
+    const TContractWithRoles extends ContractWithRoles | {},
+    TCallback extends (
+      TContractWithRoles extends { response: infer Response }
+        ? InferResponse<Response>
+        : any
+    ) extends infer Response
+      ? 'roles' extends keyof TContractWithRoles
+        ? TContractWithRoles['roles'] extends readonly (infer Role)[]
+          ? 'guest' extends Role
+            ? (context: TypedContext<TContractWithRoles>)=> Response
+            : (context: TypedContext<TContractWithRoles> & { token: { authenticated: true } })=> Response
+          : never
+        : (context: TypedContext<TContractWithRoles>)=> Response
+      : never,
   >(
     method: RequestMethod | RequestMethod[],
     exp: RouteUri,

diff --git a/packages/node-http/CHANGELOG.md b/packages/node-http/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @aeriajs/node-http
 
+## 0.0.14
+
+### Patch Changes
+
+- Updated dependencies
+  - @aeriajs/http@0.0.14
+
 ## 0.0.13
 
 ### Patch Changes

diff --git a/packages/node-http/package.json b/packages/node-http/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/node-http",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "description": "## Installation",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -32,6 +32,6 @@
     "dist"
   ],
   "peerDependencies": {
-    "@aeriajs/http": "^0.0.13"
+    "@aeriajs/http": "^0.0.14"
   }
 }
diff --git a/packages/security/CHANGELOG.md b/packages/security/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @aeriajs/security
 
+## 0.0.20
+
+### Patch Changes
+
+- @aeriajs/api@0.0.20
+
 ## 0.0.19
 
 ### Patch Changes

diff --git a/packages/security/package.json b/packages/security/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/security",
-  "version": "0.0.19",
+  "version": "0.0.20",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -32,7 +32,7 @@
     "dist"
   ],
   "peerDependencies": {
-    "@aeriajs/api": "^0.0.19",
+    "@aeriajs/api": "^0.0.20",
     "@aeriajs/common": "^0.0.9",
     "@aeriajs/types": "^0.0.8",
     "mongodb": "^6.1.0"

diff --git a/packages/server/CHANGELOG.md b/packages/server/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @aeriajs/server
 
+## 0.0.20
+
+### Patch Changes
+
+- Updated dependencies
+  - @aeriajs/http@0.0.14
+  - @aeriajs/api@0.0.20
+  - @aeriajs/server@0.0.20
+  - @aeriajs/builtins@0.0.20
+
 ## 0.0.19
 
 ### Patch Changes

diff --git a/packages/server/package.json b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/server",
-  "version": "0.0.19",
+  "version": "0.0.20",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -33,17 +33,17 @@
   ],
   "peerDependencies": {
     "@aeriajs/access-control": "^0.0.9",
-    "@aeriajs/api": "^0.0.19",
+    "@aeriajs/api": "^0.0.20",
     "@aeriajs/common": "^0.0.9",
     "@aeriajs/entrypoint": "^0.0.9",
-    "@aeriajs/http": "^0.0.13",
-    "@aeriajs/server": "^0.0.19",
-    "@aeriajs/builtins": "^0.0.19",
+    "@aeriajs/http": "^0.0.14",
+    "@aeriajs/server": "^0.0.20",
+    "@aeriajs/builtins": "^0.0.20",
     "@aeriajs/types": "^0.0.8",
     "mongodb": "^6.1.0"
   },
   "optionalDependencies": {
-    "@aeriajs/node-http": "^0.0.13"
+    "@aeriajs/node-http": "^0.0.14"
   },
   "devDependencies": {
     "mongodb": "^6.1.0"