From 178da5b433ae89db3d73ff5d4985d80109e948e8 Mon Sep 17 00:00:00 2001
From: Adler Faulkner <aif28@cornell.edu>
Date: Wed, 8 Nov 2023 13:19:44 -0800
Subject: [PATCH] fix: simplify operation arg types

---
 package-lock.json                    |  4 ++--
 package.json                         |  2 +-
 src/openapi-types/OpenApiArgTypes.ts | 13 ++++++++++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 50a3f6f..874537c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@comake/standard-sdk-js",
-  "version": "2.2.5",
+  "version": "2.3.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@comake/standard-sdk-js",
-      "version": "2.2.5",
+      "version": "2.3.0",
       "license": "MIT",
       "dependencies": {
         "@comake/openapi-operation-executor": "^0.11.3",
diff --git a/package.json b/package.json
index 615da3b..148de2b 100644
--- 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
index 68d8c18..f496905 100644
--- 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>;