@furystack/rest-service 9.0.3 → 9.0.5

package/src/endpoint-generators/create-get-collection-endpoint.spec.ts

@@ -43,7 +43,7 @@ describe('createGetCollectionEndpoint', () => {
 
       const response = await fetch(`http://127.0.0.1:${port}/api/entities`, { method: 'GET' })
       expect(response.ok).toBe(true)
-      const json: GetCollectionResult<MockClass> = await response.json()
+      const json = (await response.json()) as GetCollectionResult<MockClass>
       expect(response.status).toBe(200)
       expect(json.count).toBe(count)
       expect(json.entries).toEqual(allEntities)
@@ -72,7 +72,7 @@ describe('createGetCollectionEndpoint', () => {
         method: 'GET',
       })
       expect(response.ok).toBe(true)
-      const json: GetCollectionResult<MockClass> = await response.json()
+      const json = (await response.json()) as GetCollectionResult<MockClass>
       expect(response.status).toBe(200)
       expect(json.count).toBe(count)
       expect(json.entries).toEqual(orderedEntities)
@@ -107,7 +107,7 @@ describe('createGetCollectionEndpoint', () => {
         method: 'GET',
       })
       expect(response.ok).toBe(true)
-      const json: GetCollectionResult<MockClass> = await response.json()
+      const json = (await response.json()) as GetCollectionResult<MockClass>
       expect(response.status).toBe(200)
       expect(json.count).toBe(count)
       expect(json.entries).toEqual(filteredEntities)
@@ -143,7 +143,7 @@ describe('createGetCollectionEndpoint', () => {
       })
 
       expect(response.ok).toBe(true)
-      const json: GetCollectionResult<MockClass> = await response.json()
+      const json = (await response.json()) as GetCollectionResult<MockClass>
       expect(response.status).toBe(200)
       expect(json.count).toBe(count)
       expect(json.entries).toEqual(selectedEntities)
@@ -180,7 +180,7 @@ describe('createGetCollectionEndpoint', () => {
         method: 'GET',
       })
       expect(response.status).toBe(200)
-      const json: GetCollectionResult<MockClass> = await response.json()
+      const json = (await response.json()) as GetCollectionResult<MockClass>
       expect(json.count).toBe(count)
       expect(json.entries).toEqual(topSkipEntities)
     })

package/src/helpers.spec.ts

@@ -5,6 +5,7 @@ import { HttpAuthenticationSettings } from './http-authentication-settings.js'
 import { useHttpAuthentication, useRestService, useStaticFiles } from './helpers.js'
 import { StaticServerManager } from './static-server-manager.js'
 import { describe, it, expect } from 'vitest'
+import { getPort } from '@furystack/core/port-generator'
 
 describe('Injector extensions', () => {
   describe('useHttpAuthentication', () => {
@@ -19,7 +20,9 @@ describe('Injector extensions', () => {
   describe('useRestService()', () => {
     it('Should set up a REST service', async () => {
       await usingAsync(new Injector(), async (i) => {
-        await useRestService({ injector: i, api: {}, root: '/', port: 1234 })
+        const port = getPort()
+
+        await useRestService({ injector: i, api: {}, root: '/', port })
         expect(i.cachedSingletons.get(ApiManager)).toBeDefined()
       })
     })
@@ -28,7 +31,9 @@ describe('Injector extensions', () => {
   describe('useRestService()', () => {
     it('Should set up a REST service', async () => {
       await usingAsync(new Injector(), async (i) => {
-        await useStaticFiles({ injector: i, baseUrl: '/', path: '.', port: 1234 })
+        const port = getPort()
+
+        await useStaticFiles({ injector: i, baseUrl: '/', path: '.', port })
         expect(i.cachedSingletons.get(StaticServerManager)).toBeDefined()
       })
     })

package/src/http-user-context.ts

@@ -1,4 +1,4 @@
-import type { IncomingMessage, ServerResponse } from 'http'
+import type { IncomingMessage } from 'http'
 import type { User } from '@furystack/core'
 import { StoreManager } from '@furystack/core'
 import { Injectable, Injected } from '@furystack/inject'
@@ -139,7 +139,10 @@ export class HttpUserContext {
    * @param serverResponse A serverResponse to set the cookie
    * @returns the current User
    */
-  public async cookieLogin(user: User, serverResponse: Pick<ServerResponse, 'setHeader'>): Promise<User> {
+  public async cookieLogin(
+    user: User,
+    serverResponse: { setHeader: (header: string, value: string) => void },
+  ): Promise<User> {
     const sessionId = randomBytes(32).toString('hex')
     await this.getSessionStore().add({ sessionId, username: user.username })
     serverResponse.setHeader('Set-Cookie', `${this.authentication.cookieName}=${sessionId}; Path=/; HttpOnly`)
@@ -147,7 +150,10 @@ export class HttpUserContext {
     return user
   }
 
-  public async cookieLogout(request: Pick<IncomingMessage, 'headers'>, response: Pick<ServerResponse, 'setHeader'>) {
+  public async cookieLogout(
+    request: Pick<IncomingMessage, 'headers'>,
+    response: { setHeader: (header: string, value: string) => void },
+  ) {
     this.user = undefined
     const sessionId = this.getSessionIdFromRequest(request)
     response.setHeader('Set-Cookie', `${this.authentication.cookieName}=; Path=/; HttpOnly`)
@@ -168,7 +174,7 @@ export class HttpUserContext {
   @Injected(PasswordAuthenticator)
   private declare readonly authenticator: PasswordAuthenticator
 
-  public async init() {
+  public init() {
     this.getUserStore().addListener('onEntityUpdated', ({ id, change }) => {
       if (this.user?.username === id) {
         this.user = { ...this.user, ...change }

package/src/validate.integration.spec.schema.json

@@ -16,16 +16,11 @@
               "type": "string"
             }
           },
-          "required": [
-            "id"
-          ],
+          "required": ["id"],
           "type": "object"
         }
       },
-      "required": [
-        "url",
-        "result"
-      ],
+      "required": ["url", "result"],
       "type": "object"
     },
     "FilterType<Mock>": {
@@ -175,17 +170,11 @@
           "description": "Sets up an order by a field and a direction",
           "properties": {
             "id": {
-              "enum": [
-                "ASC",
-                "DESC"
-              ],
+              "enum": ["ASC", "DESC"],
               "type": "string"
             },
             "value": {
-              "enum": [
-                "ASC",
-                "DESC"
-              ],
+              "enum": ["ASC", "DESC"],
               "type": "string"
             }
           },
@@ -194,10 +183,7 @@
         "select": {
           "description": "The result set will be limited to these fields",
           "items": {
-            "enum": [
-              "id",
-              "value"
-            ],
+            "enum": ["id", "value"],
             "type": "string"
           },
           "type": "array"
@@ -230,10 +216,7 @@
           "$ref": "#/definitions/GetCollectionResult%3CMock%3E"
         }
       },
-      "required": [
-        "query",
-        "result"
-      ],
+      "required": ["query", "result"],
       "type": "object"
     },
     "GetCollectionResult<Mock>": {
@@ -252,10 +235,7 @@
           "type": "array"
         }
       },
-      "required": [
-        "count",
-        "entries"
-      ],
+      "required": ["count", "entries"],
       "type": "object"
     },
     "GetEntityEndpoint<Mock,\"id\">": {
@@ -268,10 +248,7 @@
             "select": {
               "description": "The list of fields to select",
               "items": {
-                "enum": [
-                  "id",
-                  "value"
-                ],
+                "enum": ["id", "value"],
                 "type": "string"
               },
               "type": "array"
@@ -290,17 +267,11 @@
               "type": "string"
             }
           },
-          "required": [
-            "id"
-          ],
+          "required": ["id"],
           "type": "object"
         }
       },
-      "required": [
-        "query",
-        "url",
-        "result"
-      ],
+      "required": ["query", "url", "result"],
       "type": "object"
     },
     "Mock": {
@@ -313,10 +284,7 @@
           "type": "string"
         }
       },
-      "required": [
-        "id",
-        "value"
-      ],
+      "required": ["id", "value"],
       "type": "object"
     },
     "PatchEndpoint<Mock,\"id\">": {
@@ -346,17 +314,11 @@
               "type": "string"
             }
           },
-          "required": [
-            "id"
-          ],
+          "required": ["id"],
           "type": "object"
         }
       },
-      "required": [
-        "body",
-        "url",
-        "result"
-      ],
+      "required": ["body", "url", "result"],
       "type": "object"
     },
     "PostEndpoint<Mock,\"id\">": {
@@ -370,10 +332,7 @@
           "$ref": "#/definitions/Mock"
         }
       },
-      "required": [
-        "body",
-        "result"
-      ],
+      "required": ["body", "result"],
       "type": "object"
     },
     "RestApi": {
@@ -389,9 +348,7 @@
               "result": {},
               "url": {}
             },
-            "required": [
-              "result"
-            ],
+            "required": ["result"],
             "type": "object"
           },
           "type": "object"
@@ -406,9 +363,7 @@
               "result": {},
               "url": {}
             },
-            "required": [
-              "result"
-            ],
+            "required": ["result"],
             "type": "object"
           },
           "type": "object"
@@ -423,9 +378,7 @@
               "result": {},
               "url": {}
             },
-            "required": [
-              "result"
-            ],
+            "required": ["result"],
             "type": "object"
           },
           "type": "object"
@@ -440,9 +393,7 @@
               "result": {},
               "url": {}
             },
-            "required": [
-              "result"
-            ],
+            "required": ["result"],
             "type": "object"
           },
           "type": "object"
@@ -457,9 +408,7 @@
               "result": {},
               "url": {}
             },
-            "required": [
-              "result"
-            ],
+            "required": ["result"],
             "type": "object"
           },
           "type": "object"
@@ -474,9 +423,7 @@
               "result": {},
               "url": {}
             },
-            "required": [
-              "result"
-            ],
+            "required": ["result"],
             "type": "object"
           },
           "type": "object"
@@ -491,9 +438,7 @@
               "result": {},
               "url": {}
             },
-            "required": [
-              "result"
-            ],
+            "required": ["result"],
             "type": "object"
           },
           "type": "object"
@@ -508,9 +453,7 @@
               "result": {},
               "url": {}
             },
-            "required": [
-              "result"
-            ],
+            "required": ["result"],
             "type": "object"
           },
           "type": "object"
@@ -525,9 +468,7 @@
               "result": {},
               "url": {}
             },
-            "required": [
-              "result"
-            ],
+            "required": ["result"],
             "type": "object"
           },
           "type": "object"
@@ -551,11 +492,7 @@
               "type": "string"
             }
           },
-          "required": [
-            "foo",
-            "bar",
-            "baz"
-          ],
+          "required": ["foo", "bar", "baz"],
           "type": "object"
         },
         "result": {
@@ -571,18 +508,11 @@
               "type": "string"
             }
           },
-          "required": [
-            "foo",
-            "bar",
-            "baz"
-          ],
+          "required": ["foo", "bar", "baz"],
           "type": "object"
         }
       },
-      "required": [
-        "body",
-        "result"
-      ],
+      "required": ["body", "result"],
       "type": "object"
     },
     "ValidateHeaders": {
@@ -601,11 +531,7 @@
               "type": "string"
             }
           },
-          "required": [
-            "foo",
-            "bar",
-            "baz"
-          ],
+          "required": ["foo", "bar", "baz"],
           "type": "object"
         },
         "result": {
@@ -621,18 +547,11 @@
               "type": "string"
             }
           },
-          "required": [
-            "foo",
-            "bar",
-            "baz"
-          ],
+          "required": ["foo", "bar", "baz"],
           "type": "object"
         }
       },
-      "required": [
-        "headers",
-        "result"
-      ],
+      "required": ["headers", "result"],
       "type": "object"
     },
     "ValidateQuery": {
@@ -651,11 +570,7 @@
               "type": "string"
             }
           },
-          "required": [
-            "foo",
-            "bar",
-            "baz"
-          ],
+          "required": ["foo", "bar", "baz"],
           "type": "object"
         },
         "result": {
@@ -671,18 +586,11 @@
               "type": "string"
             }
           },
-          "required": [
-            "foo",
-            "bar",
-            "baz"
-          ],
+          "required": ["foo", "bar", "baz"],
           "type": "object"
         }
       },
-      "required": [
-        "query",
-        "result"
-      ],
+      "required": ["query", "result"],
       "type": "object"
     },
     "ValidateUrl": {
@@ -695,9 +603,7 @@
               "type": "number"
             }
           },
-          "required": [
-            "id"
-          ],
+          "required": ["id"],
           "type": "object"
         },
         "url": {
@@ -707,16 +613,11 @@
               "type": "number"
             }
           },
-          "required": [
-            "id"
-          ],
+          "required": ["id"],
           "type": "object"
         }
       },
-      "required": [
-        "url",
-        "result"
-      ],
+      "required": ["url", "result"],
       "type": "object"
     },
     "ValidationApi": {
@@ -732,9 +633,7 @@
               "result": {},
               "url": {}
             },
-            "required": [
-              "result"
-            ],
+            "required": ["result"],
             "type": "object"
           },
           "type": "object"
@@ -746,9 +645,7 @@
               "$ref": "#/definitions/DeleteEndpoint%3CMock%2C%22id%22%3E"
             }
           },
-          "required": [
-            "/mock/:id"
-          ],
+          "required": ["/mock/:id"],
           "type": "object"
         },
         "GET": {
@@ -770,13 +667,7 @@
               "$ref": "#/definitions/ValidateUrl"
             }
           },
-          "required": [
-            "/validate-query",
-            "/validate-url/:id",
-            "/validate-headers",
-            "/mock",
-            "/mock/:id"
-          ],
+          "required": ["/validate-query", "/validate-url/:id", "/validate-headers", "/mock", "/mock/:id"],
           "type": "object"
         },
         "HEAD": {
@@ -789,9 +680,7 @@
               "result": {},
               "url": {}
             },
-            "required": [
-              "result"
-            ],
+            "required": ["result"],
             "type": "object"
           },
           "type": "object"
@@ -806,9 +695,7 @@
               "result": {},
               "url": {}
             },
-            "required": [
-              "result"
-            ],
+            "required": ["result"],
             "type": "object"
           },
           "type": "object"
@@ -820,9 +707,7 @@
               "$ref": "#/definitions/PatchEndpoint%3CMock%2C%22id%22%3E"
             }
           },
-          "required": [
-            "/mock/:id"
-          ],
+          "required": ["/mock/:id"],
           "type": "object"
         },
         "POST": {
@@ -835,10 +720,7 @@
               "$ref": "#/definitions/ValidateBody"
             }
           },
-          "required": [
-            "/validate-body",
-            "/mock"
-          ],
+          "required": ["/validate-body", "/mock"],
           "type": "object"
         },
         "PUT": {
@@ -851,9 +733,7 @@
               "result": {},
               "url": {}
             },
-            "required": [
-              "result"
-            ],
+            "required": ["result"],
             "type": "object"
           },
           "type": "object"
@@ -868,20 +748,13 @@
               "result": {},
               "url": {}
             },
-            "required": [
-              "result"
-            ],
+            "required": ["result"],
             "type": "object"
           },
           "type": "object"
         }
       },
-      "required": [
-        "GET",
-        "POST",
-        "PATCH",
-        "DELETE"
-      ],
+      "required": ["GET", "POST", "PATCH", "DELETE"],
       "type": "object"
     },
     "WithOptionalId<Mock,\"id\">": {
@@ -894,10 +767,8 @@
           "type": "string"
         }
       },
-      "required": [
-        "value"
-      ],
+      "required": ["value"],
       "type": "object"
     }
   }
-}
+}

package/src/validate.integration.spec.ts

@@ -3,7 +3,7 @@ import { createClient, ResponseError } from '@furystack/rest-client-fetch'
 import { usingAsync } from '@furystack/utils'
 import { JsonResult } from './request-action-implementation.js'
 import { Validate } from './validate.js'
-import schema from './validate.integration.spec.schema.json' assert { type: 'json' }
+import schema from './validate.integration.spec.schema.json' with { type: 'json' }
 import type { ValidationApi } from './validate.integration.schema.js'
 import { useRestService } from './helpers.js'
 import { describe, it, expect } from 'vitest'