@equinor/fusion-framework-module-http 7.0.1 → 7.0.3

package/dist/types/lib/operators/fetch-request.schema.d.ts

@@ -4,7 +4,7 @@ import { z } from 'zod';
  *
  * @link https://www.rfc-editor.org/rfc/rfc7231#section-4.1
  */
-export declare const requestMethodCasing: () => z.ZodType<string>;
+export declare const requestMethodCasing: () => z.ZodType<string | undefined>;
 /**
  * Creates a Zod enum schema for HTTP request methods.
  *
@@ -28,7 +28,7 @@ export declare const requestMethodVerb: () => z.ZodEnum<{
     CONNECT: "CONNECT";
     TRACE: "TRACE";
 }>;
-export declare const requestMethod: () => z.ZodPipe<z.ZodType<string, unknown, z.core.$ZodTypeInternals<string, unknown>>, z.ZodEnum<{
+export declare const requestMethod: () => z.ZodOptional<z.ZodEnum<{
     GET: "GET";
     POST: "POST";
     PUT: "PUT";
@@ -69,7 +69,7 @@ export declare const requestInitSchema: z.ZodObject<{
     headers: z.ZodUnion<[z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>, z.ZodCustom<Headers, Headers>]>;
     integrity: z.ZodOptional<z.ZodString>;
     keepalive: z.ZodOptional<z.ZodBoolean>;
-    method: z.ZodOptional<z.ZodPipe<z.ZodType<string, unknown, z.core.$ZodTypeInternals<string, unknown>>, z.ZodEnum<{
+    method: z.ZodOptional<z.ZodOptional<z.ZodEnum<{
         GET: "GET";
         POST: "POST";
         PUT: "PUT";
@@ -140,7 +140,7 @@ export declare const fetchRequestSchema: z.ZodObject<{
     headers: z.ZodUnion<[z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>, z.ZodCustom<Headers, Headers>]>;
     integrity: z.ZodOptional<z.ZodString>;
     keepalive: z.ZodOptional<z.ZodBoolean>;
-    method: z.ZodOptional<z.ZodPipe<z.ZodType<string, unknown, z.core.$ZodTypeInternals<string, unknown>>, z.ZodEnum<{
+    method: z.ZodOptional<z.ZodOptional<z.ZodEnum<{
         GET: "GET";
         POST: "POST";
         PUT: "PUT";

package/dist/types/provider.d.ts

@@ -2,6 +2,7 @@ import type { HttpClient } from './lib/client';
 import type { HttpClientOptions, HttpClientRequestInitType, IHttpClientConfigurator } from './configurator';
 import type { IHttpRequestHandler } from './lib/operators';
 import type { IHttpClient } from './lib/client';
+import { BaseModuleProvider } from '@equinor/fusion-framework-module/provider';
 /**
  * Exception thrown when a client cannot be found.
  *
@@ -46,7 +47,7 @@ export interface IHttpClientProvider<TClient extends IHttpClient = IHttpClient>
  * The `HttpClientProvider` class is responsible for managing HTTP client instances and their configuration.
  * It provides methods to check if a client is configured, create new client instances, and create custom client instances.
  */
-export declare class HttpClientProvider<TClient extends IHttpClient = IHttpClient> implements IHttpClientProvider<TClient> {
+export declare class HttpClientProvider<TClient extends IHttpClient = IHttpClient> extends BaseModuleProvider<IHttpClientConfigurator<TClient>> implements IHttpClientProvider<TClient> {
     protected config: IHttpClientConfigurator<TClient>;
     /**
      * Gets the default HTTP request handler for the HTTP client provider.

package/dist/types/version.d.ts

@@ -1 +1 @@
-export declare const version = "7.0.1";
+export declare const version = "7.0.3";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@equinor/fusion-framework-module-http",
-  "version": "7.0.1",
+  "version": "7.0.3",
   "description": "",
   "main": "dist/esm/index.js",
   "types": "dist/types/index.d.ts",
@@ -59,8 +59,8 @@
   "dependencies": {
     "rxjs": "^7.8.1",
     "zod": "^4.1.8",
-    "@equinor/fusion-framework-module": "^5.0.2",
-    "@equinor/fusion-framework-module-msal": "^5.0.1"
+    "@equinor/fusion-framework-module": "^5.0.4",
+    "@equinor/fusion-framework-module-msal": "^5.1.1"
   },
   "devDependencies": {
     "typescript": "^5.8.2",

package/src/lib/operators/fetch-request.schema.ts

@@ -5,14 +5,17 @@ import { z } from 'zod';
  *
  * @link https://www.rfc-editor.org/rfc/rfc7231#section-4.1
  */
-export const requestMethodCasing = (): z.ZodType<string> => {
-  return z.string().refine((value) => value === value?.toUpperCase(), {
-    message: [
-      'Provided HTTP method must be in uppercase.',
-      'See RFC 7231 Section 4.1 for more information',
-      'https://www.rfc-editor.org/rfc/rfc7231#section-4.1',
-    ].join(' '),
-  });
+export const requestMethodCasing = (): z.ZodType<string | undefined> => {
+  return z
+    .string()
+    .optional()
+    .refine((value) => value === undefined || value === value?.toUpperCase(), {
+      message: [
+        'Provided HTTP method must be in uppercase.',
+        'See RFC 7231 Section 4.1 for more information',
+        'https://www.rfc-editor.org/rfc/rfc7231#section-4.1',
+      ].join(' '),
+    });
 };
 
 /**
@@ -34,7 +37,7 @@ export const requestMethodVerb = () => {
   });
 };
 
-export const requestMethod = () => requestMethodCasing().pipe(requestMethodVerb());
+export const requestMethod = () => requestMethodVerb().optional();
 
 /**
  * Schema for validating the initialization options of a request.

package/src/provider.ts

@@ -7,6 +7,8 @@ import type {
 
 import type { IHttpRequestHandler } from './lib/operators';
 import type { IHttpClient } from './lib/client';
+import { BaseModuleProvider } from '@equinor/fusion-framework-module/provider';
+import { version } from './version';
 
 /**
  * Exception thrown when a client cannot be found.
@@ -75,6 +77,7 @@ const isURL = (url: string) => {
  * It provides methods to check if a client is configured, create new client instances, and create custom client instances.
  */
 export class HttpClientProvider<TClient extends IHttpClient = IHttpClient>
+  extends BaseModuleProvider<IHttpClientConfigurator<TClient>>
   implements IHttpClientProvider<TClient>
 {
   /**
@@ -85,7 +88,12 @@ export class HttpClientProvider<TClient extends IHttpClient = IHttpClient>
     return this.config.defaultHttpRequestHandler;
   }
 
-  constructor(protected config: IHttpClientConfigurator<TClient>) {}
+  constructor(protected config: IHttpClientConfigurator<TClient>) {
+    super({
+      version,
+      config,
+    });
+  }
 
   /**
    * Checks if a client with the given key is configured in the `HttpClientProvider`.

package/src/version.ts

@@ -1,2 +1,2 @@
 // Generated by genversion.
-export const version = '7.0.1';
+export const version = '7.0.3';

package/tests/operators.test.ts

@@ -30,9 +30,17 @@ describe('capitalizeRequestMethodOperator', () => {
 
     const result = executeOperator(operator, { method: 'get' });
 
-    expect(result).resolves.toMatchObject({ method: 'GET' });
+    await expect(result).resolves.toMatchObject({ method: 'GET' });
     expect(consoleWarn).toHaveBeenCalled();
   });
+
+  it('should handle undefined request method', async () => {
+    const operator = capitalizeRequestMethodOperator();
+
+    const result = executeOperator(operator, { method: undefined });
+
+    await expect(result).resolves.toMatchObject({ method: undefined });
+  });
 });
 
 describe('requestValidationOperator', () => {
@@ -50,7 +58,7 @@ describe('requestValidationOperator', () => {
 
     const result = executeOperator(operator, mockRequest);
 
-    expect(result).resolves.toBeUndefined();
+    await expect(result).resolves.toBeUndefined();
   });
 
   it('should parse valid request parameters', async () => {
@@ -58,7 +66,7 @@ describe('requestValidationOperator', () => {
 
     const result = executeOperator(operator, mockRequest);
 
-    expect(result).resolves.toStrictEqual(mockRequest);
+    await expect(result).resolves.toStrictEqual(mockRequest);
   });
 
   it('should allow additional properties when strict validation is disabled', async () => {
@@ -70,8 +78,8 @@ describe('requestValidationOperator', () => {
       additionalProperty: 'some-value',
     });
 
-    expect(result).resolves.toMatchObject(mockRequest);
-    expect(result).resolves.toHaveProperty('additionalProperty', 'some-value');
+    await expect(result).resolves.toMatchObject(mockRequest);
+    await expect(result).resolves.toHaveProperty('additionalProperty', 'some-value');
   });
 
   it('should remove additional properties when strict validation is enabled', async () => {
@@ -84,8 +92,8 @@ describe('requestValidationOperator', () => {
       method: 'GET',
     });
 
-    expect(result).resolves.toStrictEqual(mockRequest);
-    expect(result).resolves.not.toHaveProperty('additionalProperty');
+    await expect(result).resolves.toStrictEqual(mockRequest);
+    await expect(result).resolves.not.toHaveProperty('additionalProperty');
   });
 
   it('should throw an error for invalid request parameters', async () => {
@@ -96,6 +104,6 @@ describe('requestValidationOperator', () => {
       method: 'GETS', // invalid method
     });
 
-    expect(result).rejects.toThrowError('RFC 2615');
+    await expect(result).rejects.toThrowError('RFC 2615');
   });
 });