Generic ResolveOpenAPIBlockResult type

Author: nolannbiron

packages/gitbook/src/lib/openapi/resolveOpenAPIModelsBlock.ts

@@ -1,9 +1,11 @@
 import { fetchOpenAPIFilesystem } from '@/lib/openapi/fetch';
-import type { ResolveOpenAPIModelsBlockResult } from '@/lib/openapi/types';
+import type { ResolveOpenAPIBlockResult } from '@/lib/openapi/types';
 import { OpenAPIParseError } from '@gitbook/openapi-parser';
-import { resolveOpenAPIModels } from '@gitbook/react-openapi';
+import { type OpenAPIModelsData, resolveOpenAPIModels } from '@gitbook/react-openapi';
 import type { AnyOpenAPIBlock, ResolveOpenAPIBlockArgs } from './types';
 
+type ResolveOpenAPIModelsBlockResult = ResolveOpenAPIBlockResult<OpenAPIModelsData>;
+
 const weakmap = new WeakMap<AnyOpenAPIBlock, Promise<ResolveOpenAPIModelsBlockResult>>();
 
 /**

packages/gitbook/src/lib/openapi/resolveOpenAPIOperationBlock.ts

@@ -1,11 +1,9 @@
 import { fetchOpenAPIFilesystem } from '@/lib/openapi/fetch';
 import { OpenAPIParseError } from '@gitbook/openapi-parser';
-import { resolveOpenAPIOperation } from '@gitbook/react-openapi';
-import type {
-    AnyOpenAPIBlock,
-    ResolveOpenAPIBlockArgs,
-    ResolveOpenAPIOperationBlockResult,
-} from './types';
+import { type OpenAPIOperationData, resolveOpenAPIOperation } from '@gitbook/react-openapi';
+import type { AnyOpenAPIBlock, ResolveOpenAPIBlockArgs, ResolveOpenAPIBlockResult } from './types';
+
+type ResolveOpenAPIOperationBlockResult = ResolveOpenAPIBlockResult<OpenAPIOperationData>;
 
 const weakmap = new WeakMap<AnyOpenAPIBlock, Promise<ResolveOpenAPIOperationBlockResult>>();
 

packages/gitbook/src/lib/openapi/types.ts

@@ -1,6 +1,5 @@
 import type { DocumentBlockOpenAPI, DocumentBlockOpenAPIOperation } from '@gitbook/api';
 import type { Filesystem, OpenAPIParseError, OpenAPIV3xDocument } from '@gitbook/openapi-parser';
-import type { OpenAPIModelsData, OpenAPIOperationData } from '@gitbook/react-openapi';
 import type { GitBookAnyContext } from '@v2/lib/context';
 
 //!!TODO: Add DocumentBlockOpenAPIModels when available in @gitbook/api
@@ -35,17 +34,10 @@ type FetchOpenAPIFilesystemError = {
 };
 
 /**
- * Resolved OpenAPI models block result.
+ * Resolved OpenAPI block result.
  */
-export type ResolveOpenAPIModelsBlockResult =
-    | { error?: undefined; data: OpenAPIModelsData | null; specUrl: string | null }
-    | ResolveOpenAPIBlockError;
-
-/**
- * Resolved OpenAPI operation block result.
- */
-export type ResolveOpenAPIOperationBlockResult =
-    | { error?: undefined; data: OpenAPIOperationData | null; specUrl: string | null }
+export type ResolveOpenAPIBlockResult<T> =
+    | { error?: undefined; data: T | null; specUrl: string | null }
     | ResolveOpenAPIBlockError;
 
 /**