chore: update FE dependencies

Author: jcdcdev

src/jcdcdev.Umbraco.ReadingTime.Client/openapi-ts.config.ts

@@ -1,27 +1,26 @@
-import { defineConfig, defaultPlugins } from '@hey-api/openapi-ts';
+import {defineConfig, defaultPlugins} from '@hey-api/openapi-ts';
 
 export default defineConfig({
-	input:
-		'http://localhost:54813/umbraco/swagger/default/swagger.json',
-	plugins: [
-		...defaultPlugins,
-		'legacy/fetch',
-		'@hey-api/schemas',
-		{
-			dates: true,
-			name: '@hey-api/transformers',
-		},
-		{
-			enums: 'javascript',
-			name: '@hey-api/typescript',
-		},
-		{
-			name: '@hey-api/sdk',
-			transformer: true,
-		},
-	],
-	output: {
-		format: 'prettier',
-		path: './src/api',
-	}
+    input: 'http://localhost:54813/umbraco/swagger/default/swagger.json',
+    plugins: [
+        ...defaultPlugins,
+        'legacy/fetch',
+        '@hey-api/schemas',
+        {
+            dates: true,
+            name: '@hey-api/transformers',
+        },
+        {
+            enums: 'javascript',
+            name: '@hey-api/typescript',
+        },
+        {
+            name: '@hey-api/sdk',
+            transformer: true,
+        },
+    ],
+    output: {
+        format: 'prettier',
+        path: './src/api',
+    }
 });

src/jcdcdev.Umbraco.ReadingTime.Client/src/api/core/ApiRequestOptions.ts

@@ -1,13 +1,21 @@
-export type ApiRequestOptions = {
-	readonly method: 'GET' | 'PUT' | 'POST' | 'DELETE' | 'OPTIONS' | 'HEAD' | 'PATCH';
-	readonly url: string;
-	readonly path?: Record<string, unknown>;
+export type ApiRequestOptions<T = unknown> = {
+	readonly body?: any;
 	readonly cookies?: Record<string, unknown>;
+	readonly errors?: Record<number | string, string>;
+	readonly formData?: Record<string, unknown> | any[] | Blob | File;
 	readonly headers?: Record<string, unknown>;
-	readonly query?: Record<string, unknown>;
-	readonly formData?: Record<string, unknown>;
-	readonly body?: any;
 	readonly mediaType?: string;
+	readonly method:
+		| 'DELETE'
+		| 'GET'
+		| 'HEAD'
+		| 'OPTIONS'
+		| 'PATCH'
+		| 'POST'
+		| 'PUT';
+	readonly path?: Record<string, unknown>;
+	readonly query?: Record<string, unknown>;
 	readonly responseHeader?: string;
-	readonly errors?: Record<number | string, string>;
+	readonly responseTransformer?: (data: unknown) => Promise<T>;
+	readonly url: string;
 };

src/jcdcdev.Umbraco.ReadingTime.Client/src/api/core/OpenAPI.ts

@@ -2,7 +2,7 @@ import type { ApiRequestOptions } from './ApiRequestOptions';
 
 type Headers = Record<string, string>;
 type Middleware<T> = (value: T) => T | Promise<T>;
-type Resolver<T> = (options: ApiRequestOptions) => Promise<T>;
+type Resolver<T> = (options: ApiRequestOptions<T>) => Promise<T>;
 
 export class Interceptors<T> {
   _fns: Middleware<T>[];

src/jcdcdev.Umbraco.ReadingTime.Client/src/api/core/request.ts

@@ -101,20 +101,24 @@ export const getFormData = (options: ApiRequestOptions): FormData | undefined =>
 	return undefined;
 };
 
-type Resolver<T> = (options: ApiRequestOptions) => Promise<T>;
+type Resolver<T> = (options: ApiRequestOptions<T>) => Promise<T>;
 
-export const resolve = async <T>(options: ApiRequestOptions, resolver?: T | Resolver<T>): Promise<T | undefined> => {
+export const resolve = async <T>(options: ApiRequestOptions<T>, resolver?: T | Resolver<T>): Promise<T | undefined> => {
 	if (typeof resolver === 'function') {
 		return (resolver as Resolver<T>)(options);
 	}
 	return resolver;
 };
 
-export const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions): Promise<Headers> => {
+export const getHeaders = async <T>(config: OpenAPIConfig, options: ApiRequestOptions<T>): Promise<Headers> => {
 	const [token, username, password, additionalHeaders] = await Promise.all([
+		// @ts-ignore
 		resolve(options, config.TOKEN),
+		// @ts-ignore
 		resolve(options, config.USERNAME),
+		// @ts-ignore
 		resolve(options, config.PASSWORD),
+		// @ts-ignore
 		resolve(options, config.HEADERS),
 	]);
 
@@ -304,7 +308,7 @@ export const catchErrorCodes = (options: ApiRequestOptions, result: ApiResult):
  * @returns CancelablePromise<T>
  * @throws ApiError
  */
-export const request = <T>(config: OpenAPIConfig, options: ApiRequestOptions): CancelablePromise<T> => {
+export const request = <T>(config: OpenAPIConfig, options: ApiRequestOptions<T>): CancelablePromise<T> => {
 	return new CancelablePromise(async (resolve, reject, onCancel) => {
 		try {
 			const url = getUrl(config, options);
@@ -322,12 +326,17 @@ export const request = <T>(config: OpenAPIConfig, options: ApiRequestOptions): C
 				const responseBody = await getResponseBody(response);
 				const responseHeader = getResponseHeader(response, options.responseHeader);
 
+				let transformedBody = responseBody;
+				if (options.responseTransformer && response.ok) {
+					transformedBody = await options.responseTransformer(responseBody)
+				}
+
 				const result: ApiResult = {
 					url,
 					ok: response.ok,
 					status: response.status,
 					statusText: response.statusText,
-					body: responseHeader ?? responseBody,
+					body: responseHeader ?? transformedBody,
 				};
 
 				catchErrorCodes(options, result);

src/jcdcdev.Umbraco.ReadingTime.Client/src/api/index.ts

@@ -2,6 +2,5 @@
 export { ApiError } from './core/ApiError';
 export { CancelablePromise, CancelError } from './core/CancelablePromise';
 export { OpenAPI, type OpenAPIConfig } from './core/OpenAPI';
-export * from './schemas.gen';
-export * from './services.gen';
+export * from './sdk.gen';
 export * from './types.gen';

src/jcdcdev.Umbraco.ReadingTime.Client/src/api/schemas.gen.ts

@@ -1,6 +1,6 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-export const $ReadingTimeResponse = {
+export const ReadingTimeResponseSchema = {
     required: ['readingTime', 'updateDate'],
     type: 'object',
     properties: {

…adingTime.Client/src/api/services.gen.ts …co.ReadingTime.Client/src/api/sdk.gen.tssrc/jcdcdev.Umbraco.ReadingTime.Client/src/api/services.gen.ts renamed to src/jcdcdev.Umbraco.ReadingTime.Client/src/api/sdk.gen.ts src/jcdcdev.Umbraco.ReadingTime.Client/src/api/services.gen.ts renamed to src/jcdcdev.Umbraco.ReadingTime.Client/src/api/sdk.gen.ts

@@ -13,12 +13,14 @@ import type { GetUmbracoReadingtimeApiData, GetUmbracoReadingtimeApiResponse } f
  * @returns unknown OK
  * @throws ApiError
  */
-export const getUmbracoReadingtimeApi = (data: GetUmbracoReadingtimeApiData = {}): CancelablePromise<GetUmbracoReadingtimeApiResponse> => { return __request(OpenAPI, {
-    method: 'GET',
-    url: '/umbraco/readingtime/api',
-    query: {
-        contentKey: data.contentKey,
-        dataTypeKey: data.dataTypeKey,
-        culture: data.culture
-    }
-}); };
+export const getUmbracoReadingtimeApi = (data: GetUmbracoReadingtimeApiData = {}): CancelablePromise<GetUmbracoReadingtimeApiResponse> => {
+    return __request(OpenAPI, {
+        method: 'GET',
+        url: '/umbraco/readingtime/api',
+        query: {
+            contentKey: data.contentKey,
+            dataTypeKey: data.dataTypeKey,
+            culture: data.culture
+        }
+    });
+};

src/jcdcdev.Umbraco.ReadingTime.Client/src/api/types.gen.ts

@@ -1,7 +1,7 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
 export type ReadingTimeResponse = {
-    updateDate: string;
+    updateDate: Date;
     readingTime: string;
 };
 
@@ -11,18 +11,4 @@ export type GetUmbracoReadingtimeApiData = {
     dataTypeKey?: string;
 };
 
-export type GetUmbracoReadingtimeApiResponse = ReadingTimeResponse;
-
-export type $OpenApiTs = {
-    '/umbraco/readingtime/api': {
-        get: {
-            req: GetUmbracoReadingtimeApiData;
-            res: {
-                /**
-                 * OK
-                 */
-                200: ReadingTimeResponse;
-            };
-        };
-    };
-};
+export type GetUmbracoReadingtimeApiResponse = ((ReadingTimeResponse));