@rest-vir/define-service 1.3.0 → 1.3.2

package/dist/endpoint/endpoint.d.ts

@@ -98,6 +98,8 @@ export declare const endpointInitShape: Shape<{
      * - Any other set value overrides the service's origin requirement (if it has any).
      */
     requiredClientOrigin: Shape<import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<(import("@sinclair/typebox").TUnsafe<{
+        allOrigins: boolean;
+    }> | import("@sinclair/typebox").TUnsafe<{
         anyOrigin: boolean;
     }> | import("@sinclair/typebox").TUnsafe<RegExp> | import("@sinclair/typebox").TString | import("@sinclair/typebox").TUndefined | import("@sinclair/typebox").TUnsafe<() => void> | import("@sinclair/typebox").TArray<import("@sinclair/typebox").TUnion<(import("@sinclair/typebox").TUnsafe<{
         anyOrigin: boolean;

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/util/origin.d.ts

@@ -82,6 +82,8 @@ export type OriginRequirement = undefined | string | RegExp | AnyOrigin | AllOri
  * @package [`@rest-vir/define-service`](https://www.npmjs.com/package/@rest-vir/define-service)
  */
 export declare const originRequirementShape: import("object-shape-tester").Shape<import("object-shape-tester").Shape<import("@sinclair/typebox").TUnion<(import("@sinclair/typebox").TUnsafe<{
+    allOrigins: boolean;
+}> | import("@sinclair/typebox").TUnsafe<{
     anyOrigin: boolean;
 }> | import("@sinclair/typebox").TUnsafe<RegExp> | import("@sinclair/typebox").TString | import("@sinclair/typebox").TUndefined | import("@sinclair/typebox").TUnsafe<() => void> | import("@sinclair/typebox").TArray<import("@sinclair/typebox").TUnion<(import("@sinclair/typebox").TUnsafe<{
     anyOrigin: boolean;

package/dist/util/origin.js

@@ -50,7 +50,7 @@ export function isAllOrigins(input) {
  * @category Package : @rest-vir/define-service
  * @package [`@rest-vir/define-service`](https://www.npmjs.com/package/@rest-vir/define-service)
  */
-export const originRequirementShape = defineShape(unionShape(undefined, '', exactShape(AnyOrigin), classShape(RegExp), () => { }, [
+export const originRequirementShape = defineShape(unionShape(undefined, '', exactShape(AllOrigins), exactShape(AnyOrigin), classShape(RegExp), () => { }, [
     unionShape('', exactShape(AnyOrigin), classShape(RegExp), () => { }),
 ]));
 /**

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

@@ -137,6 +137,8 @@ export declare const webSocketInitShape: Shape<{
      * - Any other set value overrides the service's origin requirement (if it has any).
      */
     requiredClientOrigin: Shape<import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<(import("@sinclair/typebox").TUnsafe<{
+        allOrigins: boolean;
+    }> | import("@sinclair/typebox").TUnsafe<{
         anyOrigin: boolean;
     }> | import("@sinclair/typebox").TUnsafe<RegExp> | import("@sinclair/typebox").TString | import("@sinclair/typebox").TUndefined | import("@sinclair/typebox").TUnsafe<() => void> | import("@sinclair/typebox").TArray<import("@sinclair/typebox").TUnion<(import("@sinclair/typebox").TUnsafe<{
         anyOrigin: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rest-vir/define-service",
-    "version": "1.3.0",
+    "version": "1.3.2",
     "description": "Define an connect to a declarative and type safe REST and WebSocket service.",
     "keywords": [
         "rest",