@rest-vir/run-service 1.2.5 → 1.3.0

package/dist/handle-request/handle-endpoint.js

@@ -1,7 +1,8 @@
 import { assert, assertWrap } from '@augment-vir/assert';
-import { ensureErrorAndPrependMessage, HttpStatus, isErrorHttpStatus } from '@augment-vir/common';
+import { ensureErrorAndPrependMessage, isErrorHttpStatus } from '@augment-vir/common';
 import { createRestVirHandlerErrorPrefix, HttpMethod, RestVirHandlerError, } from '@rest-vir/implement-service';
 import { assertValidShape } from 'object-shape-tester';
+import { buildHandlerParams } from './handler-params.js';
 /**
  * Handles an endpoint's implementation execution.
  *
@@ -18,18 +19,18 @@ export async function handleEndpointRequest({ endpoint, request, response, attac
         const requestData = restVirContext.requestData;
         const searchParams = restVirContext.searchParams;
         const endpointParams = {
-            pathParams: request.params,
+            ...buildHandlerParams({
+                request,
+                requestData,
+                response,
+                server,
+            }),
             method: assertWrap.isEnumValue(request.method.toUpperCase(), HttpMethod),
-            request,
-            requestData,
-            requestHeaders: request.headers,
-            response,
             service: endpoint.service,
             endpoint,
             log: endpoint.service.logger,
             context,
             searchParams,
-            server,
         };
         const endpointResult = (await endpoint.implementation(endpointParams));
         /** If the dev forgets to set a status code. */
@@ -56,13 +57,13 @@ export async function handleEndpointRequest({ endpoint, request, response, attac
                     'content-type': endpointResult.dataType || 'application/json',
                     ...endpointResult.headers,
                 },
-                statusCode: HttpStatus.Ok,
+                statusCode: endpointResult.statusCode,
                 body: endpointResult.responseData,
             };
         }
         else {
             return {
-                statusCode: HttpStatus.Ok,
+                statusCode: endpointResult.statusCode,
                 headers: endpointResult.headers,
             };
         }

package/dist/handle-request/handler-params.d.ts

@@ -0,0 +1,15 @@
+import { type RunningServerInfo, type ServerRequest, type ServerResponse } from '@rest-vir/implement-service';
+export declare function buildHandlerParams({ request, response, requestData, server, }: {
+    server: Readonly<RunningServerInfo>;
+    request: ServerRequest;
+    response: ServerResponse;
+    requestData: any;
+}): {
+    pathParams: Record<string, string>;
+    wildcard: string | undefined;
+    request: ServerRequest;
+    requestData: any;
+    requestHeaders: import("http").IncomingHttpHeaders;
+    response: ServerResponse;
+    server: Readonly<RunningServerInfo>;
+};

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

@@ -0,0 +1,14 @@
+import { filterObject } from '@augment-vir/common';
+export function buildHandlerParams({ request, response, requestData, server, }) {
+    return {
+        pathParams: filterObject(request.params, (key) => {
+            return !String(key).startsWith('*');
+        }),
+        wildcard: request.params['*'],
+        request,
+        requestData,
+        requestHeaders: request.headers,
+        response,
+        server,
+    };
+}

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

@@ -7,6 +7,7 @@ import { handleHandlerOutputWithoutSending } from './endpoint-handler.js';
 import { handleCors } from './handle-cors.js';
 import { handleRequestMethod } from './handle-request-method.js';
 import { handleSearchParams } from './handle-search-params.js';
+import { buildHandlerParams } from './handler-params.js';
 /**
  * Handles a request before it gets to the actual route handlers.
  *
@@ -79,16 +80,16 @@ export async function preHandler({ request, response, service, server, attachId,
     }
     attachedRestVirContext.searchParams = searchParams.data;
     const contextParams = {
-        pathParams: request.params,
+        ...buildHandlerParams({
+            request,
+            requestData,
+            response,
+            server,
+        }),
         method: assertWrap.isEnumValue(request.method.toUpperCase(), HttpMethod),
-        request,
-        requestData,
-        requestHeaders: request.headers,
-        response,
         service,
         endpointDefinition,
         webSocketDefinition,
-        server,
         searchParams: searchParams.data,
     };
     try {

package/dist/handle-request/run-post-hook.js

@@ -1,6 +1,7 @@
 import { assert, checkWrap } from '@augment-vir/assert';
 import { matchUrlToService } from '@rest-vir/define-service';
 import { HttpMethod, } from '@rest-vir/implement-service';
+import { buildHandlerParams } from './handler-params.js';
 export async function runPostHook({ request, response, attachId, server, postHook, service, originalBody, originalStatus, }) {
     const method = checkWrap.isEnumValue(request.method.toUpperCase(), HttpMethod);
     if (!method) {
@@ -23,18 +24,18 @@ export async function runPostHook({ request, response, attachId, server, postHoo
         ? service.webSockets[pathMatch.webSocketPath]
         : undefined;
     const postHookParams = {
-        pathParams: request.params,
+        ...buildHandlerParams({
+            request,
+            requestData,
+            response,
+            server,
+        }),
         method,
-        request,
-        requestData,
-        requestHeaders: request.headers,
-        response,
         service,
         endpointDefinition,
         webSocketDefinition,
         context,
         searchParams,
-        server,
         originalResponseData: originalBody,
         originalStatus,
     };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rest-vir/run-service",
-    "version": "1.2.5",
+    "version": "1.3.0",
     "description": "Run a service defined by @rest-vir/define-service and implemented by @rest-vir/implement-service.",
     "keywords": [
         "rest",
@@ -39,31 +39,31 @@
         "test:update": "npm test update"
     },
     "dependencies": {
-        "@augment-vir/assert": "^31.40.0",
-        "@augment-vir/common": "^31.40.0",
-        "@augment-vir/node": "^31.40.0",
+        "@augment-vir/assert": "^31.48.0",
+        "@augment-vir/common": "^31.48.0",
+        "@augment-vir/node": "^31.48.0",
         "@fastify/compress": "^8.1.0",
         "@fastify/websocket": "^11.2.0",
-        "@rest-vir/define-service": "^1.2.5",
-        "@rest-vir/implement-service": "^1.2.5",
+        "@rest-vir/define-service": "^1.3.0",
+        "@rest-vir/implement-service": "^1.3.0",
         "cluster-vir": "^1.0.1",
         "date-vir": "^8.0.0",
         "fastify": "^5.6.1",
         "light-my-request": "^6.6.0",
         "portfinder": "^1.0.38",
-        "type-fest": "^5.1.0",
+        "type-fest": "^5.2.0",
         "url-vir": "^2.1.6"
     },
     "devDependencies": {
-        "@augment-vir/test": "^31.40.0",
-        "@fastify/multipart": "^9.2.1",
+        "@augment-vir/test": "^31.48.0",
+        "@fastify/multipart": "^9.3.0",
         "@types/connect": "^3.4.38",
-        "@types/node": "^24.7.2",
+        "@types/node": "^24.10.0",
         "@types/ws": "^8.18.1",
         "c8": "^10.1.3",
         "istanbul-smart-text-reporter": "^1.1.5",
         "markdown-code-example-inserter": "^3.0.3",
-        "object-shape-tester": "^6.9.2"
+        "object-shape-tester": "^6.9.3"
     },
     "peerDependencies": {
         "@augment-vir/test": ">=30",