@equinor/fusion-framework-module-services 5.1.1-msal-0b0dadf270ee512f019a325c2f1586f91f9150a4 → 5.1.1

package/src/people/person-details/generate-endpoint.ts

@@ -7,22 +7,22 @@ import type { ApiRequestArgs, SupportedApiVersion } from './types';
  * Method for generating endpoint for getting context by id
  */
 export const generateEndpoint = <TVersion extends SupportedApiVersion>(
-    version: TVersion,
-    args: ApiRequestArgs<TVersion>,
+  version: TVersion,
+  args: ApiRequestArgs<TVersion>,
 ) => {
-    const apiVersion = ApiVersion[version as keyof typeof ApiVersion] ?? version;
-    switch (apiVersion) {
-        case ApiVersion.v4: {
-            const { azureId, expand } = args;
-            const params = new URLSearchParams();
-            params.append('api-version', apiVersion);
-            if (expand) {
-                params.append('$expand', expand.join(','));
-            }
-            return `/persons/${azureId}?${String(params)}`;
-        }
-        default: {
-            throw new UnsupportedApiVersion(version);
-        }
+  const apiVersion = ApiVersion[version as keyof typeof ApiVersion] ?? version;
+  switch (apiVersion) {
+    case ApiVersion.v4: {
+      const { azureId, expand } = args;
+      const params = new URLSearchParams();
+      params.append('api-version', apiVersion);
+      if (expand) {
+        params.append('$expand', expand.join(','));
+      }
+      return `/persons/${azureId}?${String(params)}`;
     }
+    default: {
+      throw new UnsupportedApiVersion(version);
+    }
+  }
 };

package/src/people/person-details/generate-parameters.ts

@@ -7,16 +7,16 @@ import type { ApiRequestArgs, SupportedApiVersion } from './types';
 
 /** function for creating http client arguments  */
 export const generateParameters = <
-    TResult,
-    TVersion extends SupportedApiVersion,
-    TClient extends IHttpClient = IHttpClient,
+  TResult,
+  TVersion extends SupportedApiVersion,
+  TClient extends IHttpClient = IHttpClient,
 >(
-    version: TVersion,
-    args: ApiRequestArgs<TVersion>,
-    init?: ClientRequestInit<TClient, TResult>,
+  version: TVersion,
+  args: ApiRequestArgs<TVersion>,
+  init?: ClientRequestInit<TClient, TResult>,
 ): ApiClientArguments<TClient, TResult> => {
-    const path = generateEndpoint(version, args);
-    return [path, init];
+  const path = generateEndpoint(version, args);
+  return [path, init];
 };
 
 export default generateParameters;

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

@@ -1,33 +1,33 @@
 import { ApiVersion } from '../static';
 import type { ApiPerson_v4, ApiPersonExpandProps_v4 } from '../api-models.v4';
-import { ClientMethod } from '../../types';
+import type { ClientMethod } from '../../types';
 
 export type SupportedApiVersion = Extract<keyof typeof ApiVersion, 'v4'>;
 
 type ApiRequestArgsMap = {
-    [ApiVersion.v4]: {
-        azureId: string;
-        expand?: Array<ApiPersonExpandProps_v4>;
-    };
+  [ApiVersion.v4]: {
+    azureId: string;
+    expand?: Array<ApiPersonExpandProps_v4>;
+  };
 };
 
 export type AllowedArgs = ApiRequestArgsMap[keyof ApiRequestArgsMap];
 
 export type ApiRequestArgs<T extends SupportedApiVersion> =
-    ApiRequestArgsMap[(typeof ApiVersion)[T]];
+  ApiRequestArgsMap[(typeof ApiVersion)[T]];
 
 type ApiResponseTypes<TArgs extends AllowedArgs> = {
-    [ApiVersion.v4]: ApiPerson_v4<TArgs['expand'] extends [] ? TArgs['expand'] : []>;
+  [ApiVersion.v4]: ApiPerson_v4<TArgs['expand'] extends [] ? TArgs['expand'] : []>;
 };
 
 export type ApiResponse<
-    T extends SupportedApiVersion,
-    TArgs extends AllowedArgs,
+  T extends SupportedApiVersion,
+  TArgs extends AllowedArgs,
 > = ApiResponseTypes<TArgs>[(typeof ApiVersion)[T]];
 
 export type ApiResult<
-    TVersion extends SupportedApiVersion,
-    TArgs extends ApiRequestArgs<TVersion>,
-    TMethod extends keyof ClientMethod<unknown> = keyof ClientMethod<unknown>,
-    TResult = ApiResponse<TVersion, TArgs>,
+  TVersion extends SupportedApiVersion,
+  TArgs extends ApiRequestArgs<TVersion>,
+  TMethod extends keyof ClientMethod<unknown> = keyof ClientMethod<unknown>,
+  TResult = ApiResponse<TVersion, TArgs>,
 > = ClientMethod<TResult>[TMethod];

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

@@ -1,7 +1,4 @@
-import {
-    type ClientRequestInit,
-    type IHttpClient,
-} from '@equinor/fusion-framework-module-http/client';
+import type { ClientRequestInit, IHttpClient } from '@equinor/fusion-framework-module-http/client';
 
 import { generateParameters } from './generate-parameters';
 
@@ -15,23 +12,23 @@ import type { ApiResponse, ApiRequestArgs, SupportedApiVersion } from './types';
  * @param method - client method to call
  */
 export const client =
-    <
-        TVersion extends SupportedApiVersion,
-        TMethod extends keyof ClientDataMethod = keyof ClientDataMethod,
-        TClient extends IHttpClient = IHttpClient,
-        TArgs extends ApiRequestArgs<TVersion> = ApiRequestArgs<TVersion>,
-    >(
-        client: TClient,
-        version: TVersion,
-        method: TMethod = 'blob' as TMethod,
-    ) =>
-    <T extends ApiResponse<TVersion> = ApiResponse<TVersion>>(
-        args: TArgs,
-        init?: ClientRequestInit<TClient, T>,
-    ): ClientDataMethod<T>[TMethod] => {
-        return client[method](
-            ...generateParameters<T, TVersion, TClient>(version, args, init),
-        ) as ClientDataMethod<T>[TMethod];
-    };
+  <
+    TVersion extends SupportedApiVersion,
+    TMethod extends keyof ClientDataMethod = keyof ClientDataMethod,
+    TClient extends IHttpClient = IHttpClient,
+    TArgs extends ApiRequestArgs<TVersion> = ApiRequestArgs<TVersion>,
+  >(
+    client: TClient,
+    version: TVersion,
+    method: TMethod = 'blob' as TMethod,
+  ) =>
+  <T extends ApiResponse<TVersion> = ApiResponse<TVersion>>(
+    args: TArgs,
+    init?: ClientRequestInit<TClient, T>,
+  ): ClientDataMethod<T>[TMethod] => {
+    return client[method](
+      ...generateParameters<T, TVersion, TClient>(version, args, init),
+    ) as ClientDataMethod<T>[TMethod];
+  };
 
 export default client;

package/src/people/person-photo/generate-endpoint.ts

@@ -7,19 +7,19 @@ import type { ApiRequestArgs, SupportedApiVersion } from './types';
  * Method for generating endpoint for getting context by id
  */
 export const generateEndpoint = <TVersion extends SupportedApiVersion>(
-    version: TVersion,
-    args: ApiRequestArgs<TVersion>,
+  version: TVersion,
+  args: ApiRequestArgs<TVersion>,
 ) => {
-    const apiVersion = ApiVersion[version as keyof typeof ApiVersion] ?? version;
-    switch (apiVersion) {
-        case ApiVersion.v2: {
-            const { azureId } = args;
-            const params = new URLSearchParams();
-            params.append('api-version', apiVersion);
-            return `/persons/${azureId}/photo?${String(params)}`;
-        }
-        default: {
-            throw new UnsupportedApiVersion(version);
-        }
+  const apiVersion = ApiVersion[version as keyof typeof ApiVersion] ?? version;
+  switch (apiVersion) {
+    case ApiVersion.v2: {
+      const { azureId } = args;
+      const params = new URLSearchParams();
+      params.append('api-version', apiVersion);
+      return `/persons/${azureId}/photo?${String(params)}`;
     }
+    default: {
+      throw new UnsupportedApiVersion(version);
+    }
+  }
 };

package/src/people/person-photo/generate-parameters.ts

@@ -7,16 +7,16 @@ import type { ApiRequestArgs, SupportedApiVersion } from './types';
 
 /** function for creating http client arguments  */
 export const generateParameters = <
-    TResult,
-    TVersion extends SupportedApiVersion,
-    TClient extends IHttpClient = IHttpClient,
+  TResult,
+  TVersion extends SupportedApiVersion,
+  TClient extends IHttpClient = IHttpClient,
 >(
-    version: TVersion,
-    args: ApiRequestArgs<TVersion>,
-    init?: ClientRequestInit<TClient, TResult>,
+  version: TVersion,
+  args: ApiRequestArgs<TVersion>,
+  init?: ClientRequestInit<TClient, TResult>,
 ): ApiClientArguments<TClient, TResult> => {
-    const path = generateEndpoint(version, args);
-    return [path, init];
+  const path = generateEndpoint(version, args);
+  return [path, init];
 };
 
 export default generateParameters;

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

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

package/src/people/query/client.ts

@@ -1,4 +1,4 @@
-import { ClientRequestInit, IHttpClient } from '@equinor/fusion-framework-module-http/client';
+import type { ClientRequestInit, IHttpClient } from '@equinor/fusion-framework-module-http/client';
 
 import { generateParameters } from './generate-parameters';
 
@@ -12,22 +12,24 @@ import type { ApiResponse, ApiResult, ApiRequestArgs, SupportedApiVersion } from
  * @param method - client method to call
  */
 export const client =
-    <
-        TVersion extends SupportedApiVersion,
-        TMethod extends keyof ClientMethod = keyof ClientMethod,
-        TClient extends IHttpClient = IHttpClient,
-        TArgs extends ApiRequestArgs<TVersion> = ApiRequestArgs<TVersion>,
-    >(
-        client: TClient,
-        version: TVersion,
-        method: TMethod = 'json' as TMethod,
-    ) =>
-    <T = ApiResponse<TVersion>>(
-        args: TArgs,
-        init?: ClientRequestInit<TClient, T>,
-    ): ApiResult<TVersion, TMethod, T> =>
-        client[method](
-            ...generateParameters<T, TVersion, TClient>(version, args, init),
-        ) as ApiResult<TVersion, TMethod, T>;
+  <
+    TVersion extends SupportedApiVersion,
+    TMethod extends keyof ClientMethod = keyof ClientMethod,
+    TClient extends IHttpClient = IHttpClient,
+    TArgs extends ApiRequestArgs<TVersion> = ApiRequestArgs<TVersion>,
+  >(
+    client: TClient,
+    version: TVersion,
+    method: TMethod = 'json' as TMethod,
+  ) =>
+  <T = ApiResponse<TVersion>>(
+    args: TArgs,
+    init?: ClientRequestInit<TClient, T>,
+  ): ApiResult<TVersion, TMethod, T> =>
+    client[method](...generateParameters<T, TVersion, TClient>(version, args, init)) as ApiResult<
+      TVersion,
+      TMethod,
+      T
+    >;
 
 export default client;

package/src/people/query/generate-endpoint.ts

@@ -7,20 +7,20 @@ import type { ApiRequestArgs, SupportedApiVersion } from './types';
  * Method for generating endpoint for getting context by id
  */
 export const generateEndpoint = <TVersion extends SupportedApiVersion>(
-    version: TVersion,
-    args: ApiRequestArgs<TVersion>,
+  version: TVersion,
+  args: ApiRequestArgs<TVersion>,
 ) => {
-    const apiVersion = ApiVersion[version as keyof typeof ApiVersion] ?? version;
-    switch (apiVersion) {
-        case ApiVersion.v2: {
-            const { search } = args;
-            const params = new URLSearchParams();
-            params.append('api-version', apiVersion);
-            params.append('$search', search);
-            return `/persons?${String(params)}`;
-        }
-        default: {
-            throw new UnsupportedApiVersion(version);
-        }
+  const apiVersion = ApiVersion[version as keyof typeof ApiVersion] ?? version;
+  switch (apiVersion) {
+    case ApiVersion.v2: {
+      const { search } = args;
+      const params = new URLSearchParams();
+      params.append('api-version', apiVersion);
+      params.append('$search', search);
+      return `/persons?${String(params)}`;
     }
+    default: {
+      throw new UnsupportedApiVersion(version);
+    }
+  }
 };

package/src/people/query/generate-parameters.ts

@@ -7,16 +7,16 @@ import type { ApiRequestArgs, SupportedApiVersion } from './types';
 
 /** function for creating http client arguments  */
 export const generateParameters = <
-    TResult,
-    TVersion extends SupportedApiVersion,
-    TClient extends IHttpClient = IHttpClient,
+  TResult,
+  TVersion extends SupportedApiVersion,
+  TClient extends IHttpClient = IHttpClient,
 >(
-    version: TVersion,
-    args: ApiRequestArgs<TVersion>,
-    init?: ClientRequestInit<TClient, TResult>,
+  version: TVersion,
+  args: ApiRequestArgs<TVersion>,
+  init?: ClientRequestInit<TClient, TResult>,
 ): ApiClientArguments<TClient, TResult> => {
-    const path = generateEndpoint(version, args);
-    return [path, init];
+  const path = generateEndpoint(version, args);
+  return [path, init];
 };
 
 export default generateParameters;

package/src/people/query/types.ts

@@ -1,28 +1,28 @@
 import { ApiVersion } from '../static';
-import { ApiPerson_v2 } from '../api-models.v2';
-import { ClientMethod } from '../../types';
+import type { ApiPerson_v2 } from '../api-models.v2';
+import type { ClientMethod } from '../../types';
 
 export type SupportedApiVersion = Extract<keyof typeof ApiVersion, 'v2'>;
 
 type ApiRequestArgsMap = {
-    [ApiVersion.v2]: {
-        search: string;
-    };
+  [ApiVersion.v2]: {
+    search: string;
+  };
 };
 
 export type AllowedArgs = ApiRequestArgsMap[keyof ApiRequestArgsMap];
 
 export type ApiRequestArgs<T extends SupportedApiVersion> =
-    ApiRequestArgsMap[(typeof ApiVersion)[T]];
+  ApiRequestArgsMap[(typeof ApiVersion)[T]];
 
 type ApiResponseTypes = {
-    [ApiVersion.v2]: Array<ApiPerson_v2>;
+  [ApiVersion.v2]: Array<ApiPerson_v2>;
 };
 
 export type ApiResponse<T extends SupportedApiVersion> = ApiResponseTypes[(typeof ApiVersion)[T]];
 
 export type ApiResult<
-    TVersion extends SupportedApiVersion,
-    TMethod extends keyof ClientMethod<unknown> = keyof ClientMethod<unknown>,
-    TResult = ApiResponse<TVersion>,
+  TVersion extends SupportedApiVersion,
+  TMethod extends keyof ClientMethod<unknown> = keyof ClientMethod<unknown>,
+  TResult = ApiResponse<TVersion>,
 > = ClientMethod<TResult>[TMethod];

package/src/people/static.ts

@@ -1,4 +1,4 @@
 export enum ApiVersion {
-    'v2' = '2.0',
-    'v4' = '4.0',
+  v2 = '2.0',
+  v4 = '4.0',
 }

package/src/people/utils.ts

@@ -1,29 +1,29 @@
-import { ApiPerson } from './api-models';
+import type { ApiPerson } from './api-models';
 import { ApiVersion } from './static';
 
 // type SupportedApiVersion = Extract<keyof typeof ApiVersion, 'v2' | 'v4'>;
 
 const requiredApiPersonAttributes = {
-    [ApiVersion.v2]: [
-        'azureUniqueId',
-        /** TODO - has to be more required attributes to identify V2??? */
-    ] satisfies Array<keyof ApiPerson<'v2'>>,
-    [ApiVersion.v4]: [
-        /** TODO - has to be more required attributes to identify V4??? */
-        'azureUniqueId',
-    ] satisfies Array<keyof ApiPerson<'v4'>>,
+  [ApiVersion.v2]: [
+    'azureUniqueId',
+    /** TODO - has to be more required attributes to identify V2??? */
+  ] satisfies Array<keyof ApiPerson<'v2'>>,
+  [ApiVersion.v4]: [
+    /** TODO - has to be more required attributes to identify V4??? */
+    'azureUniqueId',
+  ] satisfies Array<keyof ApiPerson<'v4'>>,
 };
 
 export const isApiPerson = <V extends keyof typeof ApiVersion>(version: V) => {
-    /** todo add options for more strict check */
-    return <T>(value: T): value is T extends ApiPerson<V> ? T : never => {
-        /** early escape if value is not defined or not a object */
-        if (typeof value !== 'object') {
-            return false;
-        }
-        const attr = Object.keys(value as object);
-        const requiredAttr = requiredApiPersonAttributes[ApiVersion[version]];
-        const result = requiredAttr.every((key) => attr.includes(key));
-        return result;
-    };
+  /** todo add options for more strict check */
+  return <T>(value: T): value is T extends ApiPerson<V> ? T : never => {
+    /** early escape if value is not defined or not a object */
+    if (typeof value !== 'object') {
+      return false;
+    }
+    const attr = Object.keys(value as object);
+    const requiredAttr = requiredApiPersonAttributes[ApiVersion[version]];
+    const result = requiredAttr.every((key) => attr.includes(key));
+    return result;
+  };
 };