From c1cb295111d80787c1b1fc1a92464351d32359b0 Mon Sep 17 00:00:00 2001
From: yassine <jeyesn350@gmail.com>
Date: Fri, 3 Apr 2026 06:31:15 +0100
Subject: [PATCH] fix(rest): properly parse body parameters when mixed with
 oneOf

Fixes an issue where endpoints that declare properties at the top level alongside a oneOf field (like Create a check run) were missing those top-level properties. It also fixes oneOf elements without 'type: object'.
---
 src/rest/scripts/utils/get-body-params.ts | 25 +++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/rest/scripts/utils/get-body-params.ts b/src/rest/scripts/utils/get-body-params.ts
index 87bd27cb8a10..504d4285a37d 100644
--- a/src/rest/scripts/utils/get-body-params.ts
+++ b/src/rest/scripts/utils/get-body-params.ts
@@ -54,24 +54,33 @@ async function getTopLevelOneOfProperty(
   // is the array as a property of the object. We need to ensure that the
   // first option listed is the most comprehensive and preferred option.
   const firstOneOfObject = schema.oneOf[0]
-  const allOneOfAreObjects = schema.oneOf.every((elem) => elem.type === 'object')
-  let required = firstOneOfObject.required || []
-  let properties = firstOneOfObject.properties || {}
+  const allOneOfAreObjects = schema.oneOf.every(
+    (elem) => elem.type === 'object' || elem.properties !== undefined,
+  )
+  let required = firstOneOfObject.required ? [...firstOneOfObject.required] : []
+  const properties = firstOneOfObject.properties ? { ...firstOneOfObject.properties } : {}
 
   // When all of the oneOf objects have the `type: object` we
   // need to display all of the parameters.
   // This merges all of the properties and required values.
   if (allOneOfAreObjects) {
     for (const each of schema.oneOf.slice(1)) {
-      if (firstOneOfObject.properties && each.properties) {
-        Object.assign(firstOneOfObject.properties, each.properties)
+      if (each.properties) {
+        Object.assign(properties, each.properties)
       }
-      if (firstOneOfObject.required && each.required) {
-        required = firstOneOfObject.required.concat(each.required)
+      if (each.required) {
+        required = Array.from(new Set([...required, ...each.required]))
       }
     }
-    properties = firstOneOfObject.properties || {}
   }
+
+  if (schema.properties) {
+    Object.assign(properties, schema.properties)
+  }
+  if (schema.required) {
+    required = Array.from(new Set([...required, ...schema.required]))
+  }
+
   return { properties, required }
 }