fix: simplify operation arg types

comake · Nov 8, 2023 · 178da5b · 178da5b
1 parent c1cef52
commit 178da5b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@comake/standard-sdk-js",
-  "version": "2.2.5",
+  "version": "2.3.0",
   "description": "An open source SDK to integrate and interact with any API",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

diff --git a/src/openapi-types/OpenApiArgTypes.ts b/src/openapi-types/OpenApiArgTypes.ts
@@ -112,6 +112,13 @@ type ArgsOfOperationInPathItemIfDefined<
 export type OpenApiArgTypes<
   T extends OpenApi,
   TOperation extends string = string,
-> = {
-  [key in keyof T['paths']]: ArgsOfOperationInPathItemIfDefined<T['paths'][key], TOperation, T>
-}[keyof T['paths']];
+  TPathItemMatcher = {
+    [key in OpenApiOperationType]: Record<key, { operationId: TOperation }>
+  }[OpenApiOperationType],
+  TPathItem extends PathItem = Extract<
+    T['paths'][keyof T['paths']],
+    TPathItemMatcher
+  >,
+> = [TPathItem] extends [never]
+  ? never
+  : ArgsOfOperationInPathItemIfDefined<TPathItem, TOperation, T>;