@rest-vir/run-service 0.17.1 → 0.18.0

package/dist/handle-request/pre-handler.js

@@ -63,6 +63,10 @@ export async function preHandler(request, response, service, server, attachId) {
         response.send('Invalid body.');
         return undefined;
     }
+    const searchParams = handleSearchParams({ request, route });
+    if (!('data' in searchParams)) {
+        return handleHandlerResult(searchParams, response);
+    }
     const contextParams = {
         method: assertWrap.isEnumValue(request.method.toUpperCase(), HttpMethod),
         request,
@@ -73,11 +77,8 @@ export async function preHandler(request, response, service, server, attachId) {
         endpointDefinition: endpointDefinition,
         webSocketDefinition: webSocketDefinition,
         server,
+        searchParams: searchParams.data,
     };
-    const searchParams = handleSearchParams({ request, route });
-    if (!('data' in searchParams)) {
-        return handleHandlerResult(searchParams, response);
-    }
     try {
         const contextOutput = await service.createContext?.(contextParams);
         if (contextOutput?.reject) {

package/dist/test/test-service.d.ts

@@ -1,5 +1,5 @@
 import { type Overwrite, type PartialWithUndefined, type SelectFrom } from '@augment-vir/common';
-import { type ClientWebSocket, type CollapsedConnectWebSocketParams, type CollapsedFetchEndpointParams, type EndpointDefinition, type WebSocketDefinition } from '@rest-vir/define-service';
+import { type ClientWebSocket, type CollapsedConnectWebSocketParams, type CollapsedFetchEndpointParams, type EndpointDefinition, type GenericEndpointDefinition, type GenericWebSocketDefinition, type WebSocketDefinition } from '@rest-vir/define-service';
 import { type GenericServiceImplementation } from '@rest-vir/implement-service';
 import { type FastifyInstance } from 'fastify';
 import { type HandleRouteOptions } from '../handle-request/endpoint-handler.js';
@@ -225,7 +225,7 @@ export type ConnectTestWebSocket<WebSocketToTest extends WebSocketDefinition> =
 export type FetchTestService<Service extends SelectFrom<GenericServiceImplementation, {
     endpoints: true;
 }>> = {
-    [EndpointPath in keyof Service['endpoints']]: Service['endpoints'][EndpointPath] extends EndpointDefinition ? FetchTestEndpoint<Service['endpoints'][EndpointPath]> : never;
+    [EndpointPath in keyof Service['endpoints']]: Service['endpoints'][EndpointPath] extends GenericEndpointDefinition ? FetchTestEndpoint<Service['endpoints'][EndpointPath]> : never;
 };
 /**
  * Type for the `connectWebSocket` function provided by {@link testService} and
@@ -238,7 +238,7 @@ export type FetchTestService<Service extends SelectFrom<GenericServiceImplementa
 export type ConnectTestServiceWebSocket<Service extends SelectFrom<GenericServiceImplementation, {
     webSockets: true;
 }>> = {
-    [WebSocketPath in keyof Service['webSockets']]: Service['webSockets'][WebSocketPath] extends WebSocketDefinition ? ConnectTestWebSocket<Service['webSockets'][WebSocketPath]> : never;
+    [WebSocketPath in keyof Service['webSockets']]: Service['webSockets'][WebSocketPath] extends GenericWebSocketDefinition ? ConnectTestWebSocket<Service['webSockets'][WebSocketPath]> : never;
 };
 /**
  * Options for {@link testService}.

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rest-vir/run-service",
-    "version": "0.17.1",
+    "version": "0.18.0",
     "description": "Run a service defined by @rest-vir/define-service and implemented by @rest-vir/implement-service.",
     "keywords": [
         "rest",
@@ -43,8 +43,8 @@
         "@augment-vir/common": "^31.16.0",
         "@augment-vir/node": "^31.16.0",
         "@fastify/websocket": "^11.0.2",
-        "@rest-vir/define-service": "^0.17.1",
-        "@rest-vir/implement-service": "^0.17.1",
+        "@rest-vir/define-service": "^0.18.0",
+        "@rest-vir/implement-service": "^0.18.0",
         "cluster-vir": "^0.1.0",
         "date-vir": "^7.3.1",
         "fastify": "^5.3.2",