@rest-vir/define-service 1.3.1 → 1.3.3

package/dist/frontend-connect/connect-web-socket.d.ts

@@ -55,9 +55,9 @@ export type ConnectWebSocketParams<WebSocketToConnect extends Readonly<SelectFro
 } : {
     protocols: WebSocketToConnect['ProtocolsType'];
 }) & (WebSocketToConnect['searchParamsShape'] extends undefined ? {
-    searchParams?: never;
+    searchParams?: Record<string, string[]>;
 } : {
-    searchParams: WebSocketToConnect['SearchParamsType'];
+    searchParams: WebSocketToConnect['SearchParamsType'] & Record<string, string[]>;
 });
 /**
  * Collapsed version of {@link ConnectWebSocketParams} for {@link connectWebSocket} that only

package/dist/frontend-connect/fetch-endpoint.d.ts

@@ -45,9 +45,9 @@ export type FetchEndpointParams<EndpointToFetch extends SelectFrom<EndpointDefin
     responseDataShape: true;
     methods: true;
 }>, AllowFetchMock extends boolean = true> = EndpointToFetch extends EndpointDefinition ? Readonly<ConstructPathParams<EndpointToFetch['path']> & (EndpointToFetch['SearchParamsType'] extends undefined ? {
-    searchParams?: never;
+    searchParams?: Record<string, string[]> | undefined;
 } : {
-    searchParams: EndpointToFetch['SearchParamsType'];
+    searchParams: EndpointToFetch['SearchParamsType'] & Record<string, string[]>;
 }) & (EndpointExecutorData<EndpointToFetch>['request'] extends undefined ? {
     /**
      * This endpoint does not accept any request data, so there is none to be

package/dist/frontend-connect/fetch-endpoint.js

@@ -1,5 +1,5 @@
 import { check } from '@augment-vir/assert';
-import { addPrefix, filterMap, getObjectTypedEntries, HttpMethod, } from '@augment-vir/common';
+import { addPrefix, filterMap, getObjectTypedEntries, HttpMethod, mapObject, } from '@augment-vir/common';
 import { assertValidShape } from 'object-shape-tester';
 import { buildUrl } from 'url-vir';
 import { parseJsonWithUndefined } from '../augments/json.js';
@@ -94,13 +94,17 @@ export async function fetchEndpoint(endpoint, ...params) {
  * @package [`@rest-vir/define-service`](https://www.npmjs.com/package/@rest-vir/define-service)
  */
 export function buildEndpointRequestInit(endpoint, ...[{ method, options = {}, pathParams, requestData, searchParams, wildcard } = {},]) {
-    const headers = options.headers instanceof Headers
+    const headers = mapObject(options.headers instanceof Headers
         ? Object.fromEntries(options.headers.entries())
         : check.isArray(options.headers)
             ? Object.fromEntries(options.headers)
-            : options.headers || {};
-    const hasContentTypeHeader = Object.keys(headers).some((headerKey) => headerKey.toLowerCase() === 'content-type');
-    if (!hasContentTypeHeader) {
+            : options.headers || {}, (key, value) => {
+        return {
+            key: key.toLowerCase(),
+            value,
+        };
+    });
+    if (!headers['content-type']) {
         if (requestData instanceof FormData) {
             /**
              * Do not set `content-type` manually when submitting form data because the browser will
@@ -112,6 +116,7 @@ export function buildEndpointRequestInit(endpoint, ...[{ method, options = {}, p
             headers['content-type'] = 'application/json';
         }
     }
+    const shouldStringify = !!headers['content-type']?.match(/\bjson\b/i);
     const url = buildEndpointUrl(endpoint, {
         pathParams,
         searchParams,
@@ -121,15 +126,15 @@ export function buildEndpointRequestInit(endpoint, ...[{ method, options = {}, p
         ...options,
         headers,
         method: filterToValidMethod(endpoint, method),
-        ...(requestData instanceof FormData
-            ? {
-                body: requestData,
-            }
-            : requestData
+        ...(requestData
+            ? shouldStringify
                 ? {
                     body: JSON.stringify(requestData),
                 }
-                : {}),
+                : {
+                    body: requestData,
+                }
+            : {}),
     };
     return {
         url,

package/dist/web-socket/web-socket-definition.d.ts

@@ -87,7 +87,7 @@ export type WithFinalWebSocketProps<Init, WebSocketPath extends EndpointPathBase
     MessageFromHostType: Init['messageFromHostShape'] extends NoParam ? any : undefined extends Init['messageFromHostShape'] ? undefined : ShapeInitType<Init['messageFromHostShape']>;
     protocolsShape: 'protocolsShape' extends keyof Init ? undefined extends Init['protocolsShape'] ? undefined : Shape<Init['protocolsShape']> | undefined : undefined;
     ProtocolsType: undefined extends Init['protocolsShape'] ? string[] : ShapeInitType<Init['protocolsShape']>;
-    searchParamsShape: 'searchParamsShape' extends keyof Init ? undefined extends Init['searchParamsShape'] ? undefined : Shape<Init['searchParamsShape']> | undefined : undefined;
+    searchParamsShape: 'searchParamsShape' extends keyof Init ? Shape<Init['searchParamsShape']> | undefined : undefined;
     SearchParamsType: 'searchParamsShape' extends keyof Init ? ShapeInitType<Init['searchParamsShape']> : undefined;
     customProps: 'customProps' extends keyof Init ? Init['customProps'] : undefined;
 }> : never) & {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rest-vir/define-service",
-    "version": "1.3.1",
+    "version": "1.3.3",
     "description": "Define an connect to a declarative and type safe REST and WebSocket service.",
     "keywords": [
         "rest",
@@ -40,14 +40,14 @@
         "test:update": "npm test update"
     },
     "dependencies": {
-        "@augment-vir/assert": "^31.48.0",
-        "@augment-vir/common": "^31.48.0",
+        "@augment-vir/assert": "^31.51.1",
+        "@augment-vir/common": "^31.51.1",
         "date-vir": "^8.0.0",
         "type-fest": "^5.2.0",
         "url-vir": "^2.1.6"
     },
     "devDependencies": {
-        "@augment-vir/test": "^31.48.0",
+        "@augment-vir/test": "^31.51.1",
         "@web/dev-server-esbuild": "^1.0.4",
         "@web/test-runner": "^0.20.2",
         "@web/test-runner-commands": "^0.9.0",