@equinor/fusion-framework-module-services 4.0.1 → 4.1.0

package/dist/types/people/client.d.ts

@@ -10,6 +10,6 @@ export declare class PeopleApiClient<TClient extends IHttpClient = IHttpClient>
     constructor(_client: TClient);
     get<TVersion extends PersonDetailSupportedApiVersion, TArgs extends PersonDetailApiRequestArgs<TVersion>, TResult extends PersonDetailApiResponse<TVersion, TArgs>, TMethod extends keyof ClientMethod<TResult>>(version: TVersion, method: TMethod, args: TArgs, init?: ClientRequestInit<TClient, TResult>): PersonDetailResult<TVersion, TArgs, TMethod, TResult>;
     query<TVersion extends PersonQuerySupportedApiVersion, TArgs extends PersonQueryApiRequestArgs<TVersion>, TResult = PersonQueryApiResponse<TVersion>, TMethod extends keyof ClientMethod<TResult> = keyof ClientMethod<TResult>>(version: TVersion, method: TMethod, args: TArgs, init?: ClientRequestInit<TClient, TResult>): PersonQueryResult<TVersion, TMethod, TResult>;
-    photo<TVersion extends PersonPhotoSupportedApiVersion, TArgs extends PersonPhotoApiRequestArgs<TVersion>, TResult extends Blob = PersonPhotoApiResponse<TVersion>, TMethod extends keyof ClientDataMethod = keyof ClientDataMethod>(version: TVersion, method: TMethod, args: TArgs, init?: ClientRequestInit<TClient, TResult>): PersonPhotoResult<TMethod>;
+    photo<TVersion extends PersonPhotoSupportedApiVersion, TArgs extends PersonPhotoApiRequestArgs<TVersion>, TResult extends PersonPhotoApiResponse<TVersion> = PersonPhotoApiResponse<TVersion>, TMethod extends keyof ClientDataMethod = keyof ClientDataMethod>(version: TVersion, method: TMethod, args: TArgs, init?: ClientRequestInit<TClient, TResult>): PersonPhotoResult<TMethod>;
 }
 export default PeopleApiClient;

package/dist/types/people/person-photo/client.d.ts

@@ -1,5 +1,5 @@
-import { ClientRequestInit, IHttpClient } from '@equinor/fusion-framework-module-http/client';
+import { type ClientRequestInit, type IHttpClient } from '@equinor/fusion-framework-module-http/client';
 import type { ClientDataMethod } from '../../types';
 import type { ApiResponse, ApiRequestArgs } from './types';
-export declare const client: <TVersion extends "v2", TMethod extends keyof ClientDataMethod = keyof ClientDataMethod, TClient extends IHttpClient<import("@equinor/fusion-framework-module-http/client").FetchRequest, Response> = IHttpClient<import("@equinor/fusion-framework-module-http/client").FetchRequest, Response>, TArgs extends ApiRequestArgs<TVersion> = ApiRequestArgs<TVersion>>(client: TClient, version: TVersion, method?: TMethod) => <T extends Blob = ApiResponse<TVersion>>(args: TArgs, init?: ClientRequestInit<TClient, T>) => ClientDataMethod[TMethod];
+export declare const client: <TVersion extends "v2", TMethod extends keyof ClientDataMethod = keyof ClientDataMethod, TClient extends IHttpClient<import("@equinor/fusion-framework-module-http/client").FetchRequest, Response> = IHttpClient<import("@equinor/fusion-framework-module-http/client").FetchRequest, Response>, TArgs extends ApiRequestArgs<TVersion> = ApiRequestArgs<TVersion>>(client: TClient, version: TVersion, method?: TMethod) => <T extends ApiResponse<TVersion> = ApiResponse<TVersion>>(args: TArgs, init?: ClientRequestInit<TClient, T>) => ClientDataMethod<T>[TMethod];
 export default client;

package/dist/types/people/person-photo/types.d.ts

@@ -1,3 +1,4 @@
+import { BlobResult } from '@equinor/fusion-framework-module-http/client';
 import { ApiVersion } from '../static';
 import { ClientDataMethod } from '../../types';
 export type SupportedApiVersion = Extract<keyof typeof ApiVersion, 'v2'>;
@@ -9,7 +10,7 @@ type ApiRequestArgsMap = {
 export type AllowedArgs = ApiRequestArgsMap[keyof ApiRequestArgsMap];
 export type ApiRequestArgs<T extends SupportedApiVersion> = ApiRequestArgsMap[(typeof ApiVersion)[T]];
 type ApiResponseTypes = {
-    [ApiVersion.v2]: Blob;
+    [ApiVersion.v2]: BlobResult;
 };
 export type ApiResponse<T extends SupportedApiVersion> = ApiResponseTypes[(typeof ApiVersion)[T]];
 export type ApiResult<TMethod extends keyof ClientDataMethod = keyof ClientDataMethod> = ClientDataMethod[TMethod];

package/dist/types/types.d.ts

@@ -1,4 +1,4 @@
-import { ClientRequestInit, IHttpClient, FetchResponse, StreamResponse } from '@equinor/fusion-framework-module-http/client';
+import { ClientRequestInit, IHttpClient, StreamResponse, BlobResult, FetchResponse } from '@equinor/fusion-framework-module-http/client';
 export type ApiClientFactory<TClient extends IHttpClient = IHttpClient> = (name: string) => Promise<TClient>;
 export type ApiClientArguments<TClient extends IHttpClient, TResult = unknown> = [
     path: string,
@@ -10,8 +10,8 @@ export type ClientMethod<T = unknown> = {
     fetch$: StreamResponse<FetchResponse<T>>;
     json$: StreamResponse<T>;
 };
-export type ClientDataMethod = {
-    blob: Blob;
-    blob$: StreamResponse<Blob>;
+export type ClientDataMethod<T extends BlobResult = BlobResult> = {
+    blob: Promise<T>;
+    blob$: StreamResponse<T>;
 };
 export type ClientMethodType = keyof ClientMethod;

package/dist/types/version.d.ts

@@ -1 +1 @@
-export declare const version = "4.0.1";
+export declare const version = "4.1.0";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@equinor/fusion-framework-module-services",
-  "version": "4.0.1",
+  "version": "4.1.0",
   "description": "",
   "sideEffects": false,
   "main": "dist/esm/index.js",
@@ -116,13 +116,13 @@
   },
   "devDependencies": {
     "typescript": "^5.4.2",
-    "@equinor/fusion-framework-module": "^4.3.0",
-    "@equinor/fusion-framework-module-http": "^5.2.0",
-    "@equinor/fusion-framework-module-service-discovery": "^7.1.0"
+    "@equinor/fusion-framework-module": "^4.3.1",
+    "@equinor/fusion-framework-module-http": "^6.0.0",
+    "@equinor/fusion-framework-module-service-discovery": "^7.1.8"
   },
   "peerDependencies": {
     "odata-query": "^7.0.4",
-    "@equinor/fusion-framework-module": "^4.3.0"
+    "@equinor/fusion-framework-module": "^4.3.1"
   },
   "scripts": {
     "build": "tsc -b"

package/src/people/client.ts

@@ -83,7 +83,7 @@ export class PeopleApiClient<
     public photo<
         TVersion extends PersonPhotoSupportedApiVersion,
         TArgs extends PersonPhotoApiRequestArgs<TVersion>,
-        TResult extends Blob = PersonPhotoApiResponse<TVersion>,
+        TResult extends PersonPhotoApiResponse<TVersion> = PersonPhotoApiResponse<TVersion>,
         TMethod extends keyof ClientDataMethod = keyof ClientDataMethod,
     >(
         version: TVersion,

package/src/people/person-photo/client.ts

@@ -1,4 +1,7 @@
-import { ClientRequestInit, IHttpClient } from '@equinor/fusion-framework-module-http/client';
+import {
+    type ClientRequestInit,
+    type IHttpClient,
+} from '@equinor/fusion-framework-module-http/client';
 
 import { generateParameters } from './generate-parameters';
 
@@ -22,12 +25,13 @@ export const client =
         version: TVersion,
         method: TMethod = 'blob' as TMethod,
     ) =>
-    <T extends Blob = ApiResponse<TVersion>>(
+    <T extends ApiResponse<TVersion> = ApiResponse<TVersion>>(
         args: TArgs,
         init?: ClientRequestInit<TClient, T>,
-    ): ClientDataMethod[TMethod] =>
-        client[method](
+    ): ClientDataMethod<T>[TMethod] => {
+        return client[method](
             ...generateParameters<T, TVersion, TClient>(version, args, init),
-        ) as ClientDataMethod[TMethod];
+        ) as ClientDataMethod<T>[TMethod];
+    };
 
 export default client;

package/src/people/person-photo/types.ts

@@ -1,3 +1,4 @@
+import { BlobResult } from '@equinor/fusion-framework-module-http/client';
 import { ApiVersion } from '../static';
 import { ClientDataMethod } from '../../types';
 
@@ -15,7 +16,7 @@ export type ApiRequestArgs<T extends SupportedApiVersion> =
     ApiRequestArgsMap[(typeof ApiVersion)[T]];
 
 type ApiResponseTypes = {
-    [ApiVersion.v2]: Blob;
+    [ApiVersion.v2]: BlobResult;
 };
 
 export type ApiResponse<T extends SupportedApiVersion> = ApiResponseTypes[(typeof ApiVersion)[T]];

package/src/types.ts

@@ -1,8 +1,9 @@
 import {
     ClientRequestInit,
     IHttpClient,
-    FetchResponse,
     StreamResponse,
+    BlobResult,
+    FetchResponse,
 } from '@equinor/fusion-framework-module-http/client';
 
 export type ApiClientFactory<TClient extends IHttpClient = IHttpClient> = (
@@ -38,9 +39,9 @@ export type ClientMethod<T = unknown> = {
     json$: StreamResponse<T>;
 };
 
-export type ClientDataMethod = {
-    blob: Blob;
-    blob$: StreamResponse<Blob>;
+export type ClientDataMethod<T extends BlobResult = BlobResult> = {
+    blob: Promise<T>;
+    blob$: StreamResponse<T>;
 };
 
 export type ClientMethodType = keyof ClientMethod;

package/src/version.ts

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