Merge pull request #2008 from hey-api/fix/one-of-discriminator-required

chore: fix oneOf discriminator pull request for OpenAPI 3.1

Author: mrlubos

packages/openapi-ts-tests/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-false/types.gen.ts

@@ -442,9 +442,9 @@ export type ModelSquare = {
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
 export type CompositionWithOneOfDiscriminator = ({
-    kind?: 'circle';
+    kind: 'circle';
 } & ModelCircle) | ({
-    kind?: 'square';
+    kind: 'square';
 } & ModelSquare);
 
 /**

packages/openapi-ts-tests/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-number/types.gen.ts

@@ -442,9 +442,9 @@ export type ModelSquare = {
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
 export type CompositionWithOneOfDiscriminator = ({
-    kind?: 'circle';
+    kind: 'circle';
 } & ModelCircle) | ({
-    kind?: 'square';
+    kind: 'square';
 } & ModelSquare);
 
 /**

packages/openapi-ts-tests/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-strict/types.gen.ts

@@ -442,9 +442,9 @@ export type ModelSquare = {
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
 export type CompositionWithOneOfDiscriminator = ({
-    kind?: 'circle';
+    kind: 'circle';
 } & ModelCircle) | ({
-    kind?: 'square';
+    kind: 'square';
 } & ModelSquare);
 
 /**

packages/openapi-ts-tests/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/base-url-string/types.gen.ts

@@ -442,9 +442,9 @@ export type ModelSquare = {
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
 export type CompositionWithOneOfDiscriminator = ({
-    kind?: 'circle';
+    kind: 'circle';
 } & ModelCircle) | ({
-    kind?: 'square';
+    kind: 'square';
 } & ModelSquare);
 
 /**

packages/openapi-ts-tests/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/bundle/types.gen.ts

@@ -442,9 +442,9 @@ export type ModelSquare = {
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
 export type CompositionWithOneOfDiscriminator = ({
-    kind?: 'circle';
+    kind: 'circle';
 } & ModelCircle) | ({
-    kind?: 'square';
+    kind: 'square';
 } & ModelSquare);
 
 /**

packages/openapi-ts-tests/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/default/types.gen.ts

@@ -442,9 +442,9 @@ export type ModelSquare = {
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
 export type CompositionWithOneOfDiscriminator = ({
-    kind?: 'circle';
+    kind: 'circle';
 } & ModelCircle) | ({
-    kind?: 'square';
+    kind: 'square';
 } & ModelSquare);
 
 /**

packages/openapi-ts-tests/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-optional/types.gen.ts

@@ -442,9 +442,9 @@ export type ModelSquare = {
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
 export type CompositionWithOneOfDiscriminator = ({
-    kind?: 'circle';
+    kind: 'circle';
 } & ModelCircle) | ({
-    kind?: 'square';
+    kind: 'square';
 } & ModelSquare);
 
 /**

packages/openapi-ts-tests/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/types.gen.ts

@@ -442,9 +442,9 @@ export type ModelSquare = {
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
 export type CompositionWithOneOfDiscriminator = ({
-    kind?: 'circle';
+    kind: 'circle';
 } & ModelCircle) | ({
-    kind?: 'square';
+    kind: 'square';
 } & ModelSquare);
 
 /**

packages/openapi-ts-tests/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/tsconfig-nodenext-sdk/types.gen.ts

@@ -442,9 +442,9 @@ export type ModelSquare = {
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
 export type CompositionWithOneOfDiscriminator = ({
-    kind?: 'circle';
+    kind: 'circle';
 } & ModelCircle) | ({
-    kind?: 'square';
+    kind: 'square';
 } & ModelSquare);
 
 /**

packages/openapi-ts-tests/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/types.gen.ts

@@ -442,9 +442,9 @@ export type ModelSquare = {
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
 export type CompositionWithOneOfDiscriminator = ({
-    kind?: 'circle';
+    kind: 'circle';
 } & ModelCircle) | ({
-    kind?: 'square';
+    kind: 'square';
 } & ModelSquare);
 
 /**

packages/openapi-ts-tests/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/types.gen.ts

@@ -442,9 +442,9 @@ export type ModelSquare = {
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
 export type CompositionWithOneOfDiscriminator = ({
-    kind?: 'circle';
+    kind: 'circle';
 } & ModelCircle) | ({
-    kind?: 'square';
+    kind: 'square';
 } & ModelSquare);
 
 /**

packages/openapi-ts-tests/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/types.gen.ts

@@ -442,9 +442,9 @@ export type ModelSquare = {
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
 export type CompositionWithOneOfDiscriminator = ({
-    kind?: 'circle';
+    kind: 'circle';
 } & ModelCircle) | ({
-    kind?: 'square';
+    kind: 'square';
 } & ModelSquare);
 
 /**

packages/openapi-ts-tests/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/types.gen.ts

@@ -442,9 +442,9 @@ export type ModelSquare = {
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
 export type CompositionWithOneOfDiscriminator = ({
-    kind?: 'circle';
+    kind: 'circle';
 } & ModelCircle) | ({
-    kind?: 'square';
+    kind: 'square';
 } & ModelSquare);
 
 /**

packages/openapi-ts-tests/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/bundle/types.gen.ts

@@ -442,9 +442,9 @@ export type ModelSquare = {
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
 export type CompositionWithOneOfDiscriminator = ({
-    kind?: 'circle';
+    kind: 'circle';
 } & ModelCircle) | ({
-    kind?: 'square';
+    kind: 'square';
 } & ModelSquare);
 
 /**

packages/openapi-ts-tests/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/types.gen.ts

@@ -442,9 +442,9 @@ export type ModelSquare = {
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
 export type CompositionWithOneOfDiscriminator = ({
-    kind?: 'circle';
+    kind: 'circle';
 } & ModelCircle) | ({
-    kind?: 'square';
+    kind: 'square';
 } & ModelSquare);
 
 /**

packages/openapi-ts-tests/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/types.gen.ts

@@ -442,9 +442,9 @@ export type ModelSquare = {
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
 export type CompositionWithOneOfDiscriminator = ({
-    kind?: 'circle';
+    kind: 'circle';
 } & ModelCircle) | ({
-    kind?: 'square';
+    kind: 'square';
 } & ModelSquare);
 
 /**

packages/openapi-ts-tests/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/types.gen.ts

@@ -442,9 +442,9 @@ export type ModelSquare = {
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
 export type CompositionWithOneOfDiscriminator = ({
-    kind?: 'circle';
+    kind: 'circle';
 } & ModelCircle) | ({
-    kind?: 'square';
+    kind: 'square';
 } & ModelSquare);
 
 /**

packages/openapi-ts-tests/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/types.gen.ts

@@ -442,9 +442,9 @@ export type ModelSquare = {
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
 export type CompositionWithOneOfDiscriminator = ({
-    kind?: 'circle';
+    kind: 'circle';
 } & ModelCircle) | ({
-    kind?: 'square';
+    kind: 'square';
 } & ModelSquare);
 
 /**

packages/openapi-ts-tests/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-false/types.gen.ts

@@ -442,9 +442,9 @@ export type ModelSquare = {
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
 export type CompositionWithOneOfDiscriminator = ({
-    kind?: 'circle';
+    kind: 'circle';
 } & ModelCircle) | ({
-    kind?: 'square';
+    kind: 'square';
 } & ModelSquare);
 
 /**

packages/openapi-ts-tests/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-number/types.gen.ts

@@ -442,9 +442,9 @@ export type ModelSquare = {
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
 export type CompositionWithOneOfDiscriminator = ({
-    kind?: 'circle';
+    kind: 'circle';
 } & ModelCircle) | ({
-    kind?: 'square';
+    kind: 'square';
 } & ModelSquare);
 
 /**

packages/openapi-ts-tests/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-strict/types.gen.ts

@@ -442,9 +442,9 @@ export type ModelSquare = {
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
 export type CompositionWithOneOfDiscriminator = ({
-    kind?: 'circle';
+    kind: 'circle';
 } & ModelCircle) | ({
-    kind?: 'square';
+    kind: 'square';
 } & ModelSquare);
 
 /**

packages/openapi-ts-tests/test/__snapshots__/3.1.x/clients/@hey-api/client-next/base-url-string/types.gen.ts

@@ -442,9 +442,9 @@ export type ModelSquare = {
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
 export type CompositionWithOneOfDiscriminator = ({
-    kind?: 'circle';
+    kind: 'circle';
 } & ModelCircle) | ({
-    kind?: 'square';
+    kind: 'square';
 } & ModelSquare);
 
 /**

packages/openapi-ts-tests/test/__snapshots__/3.1.x/clients/@hey-api/client-next/bundle/types.gen.ts

@@ -442,9 +442,9 @@ export type ModelSquare = {
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
 export type CompositionWithOneOfDiscriminator = ({
-    kind?: 'circle';
+    kind: 'circle';
 } & ModelCircle) | ({
-    kind?: 'square';
+    kind: 'square';
 } & ModelSquare);
 
 /**

packages/openapi-ts-tests/test/__snapshots__/3.1.x/clients/@hey-api/client-next/default/types.gen.ts

@@ -442,9 +442,9 @@ export type ModelSquare = {
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
 export type CompositionWithOneOfDiscriminator = ({
-    kind?: 'circle';
+    kind: 'circle';
 } & ModelCircle) | ({
-    kind?: 'square';
+    kind: 'square';
 } & ModelSquare);
 
 /**

packages/openapi-ts-tests/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-optional/types.gen.ts

@@ -442,9 +442,9 @@ export type ModelSquare = {
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
 export type CompositionWithOneOfDiscriminator = ({
-    kind?: 'circle';
+    kind: 'circle';
 } & ModelCircle) | ({
-    kind?: 'square';
+    kind: 'square';
 } & ModelSquare);
 
 /**

packages/openapi-ts-tests/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/types.gen.ts

@@ -442,9 +442,9 @@ export type ModelSquare = {
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
 export type CompositionWithOneOfDiscriminator = ({
-    kind?: 'circle';
+    kind: 'circle';
 } & ModelCircle) | ({
-    kind?: 'square';
+    kind: 'square';
 } & ModelSquare);
 
 /**

packages/openapi-ts-tests/test/__snapshots__/3.1.x/clients/@hey-api/client-next/tsconfig-nodenext-sdk/types.gen.ts

@@ -442,9 +442,9 @@ export type ModelSquare = {
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
 export type CompositionWithOneOfDiscriminator = ({
-    kind?: 'circle';
+    kind: 'circle';
 } & ModelCircle) | ({
-    kind?: 'square';
+    kind: 'square';
 } & ModelSquare);
 
 /**

packages/openapi-ts-tests/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-false/types.gen.ts

@@ -442,9 +442,9 @@ export type ModelSquare = {
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
 export type CompositionWithOneOfDiscriminator = ({
-    kind?: 'circle';
+    kind: 'circle';
 } & ModelCircle) | ({
-    kind?: 'square';
+    kind: 'square';
 } & ModelSquare);
 
 /**

packages/openapi-ts-tests/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-number/types.gen.ts

@@ -442,9 +442,9 @@ export type ModelSquare = {
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
 export type CompositionWithOneOfDiscriminator = ({
-    kind?: 'circle';
+    kind: 'circle';
 } & ModelCircle) | ({
-    kind?: 'square';
+    kind: 'square';
 } & ModelSquare);
 
 /**

packages/openapi-ts-tests/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-strict/types.gen.ts

@@ -442,9 +442,9 @@ export type ModelSquare = {
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
 export type CompositionWithOneOfDiscriminator = ({
-    kind?: 'circle';
+    kind: 'circle';
 } & ModelCircle) | ({
-    kind?: 'square';
+    kind: 'square';
 } & ModelSquare);
 
 /**

packages/openapi-ts-tests/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/base-url-string/types.gen.ts

@@ -442,9 +442,9 @@ export type ModelSquare = {
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
 export type CompositionWithOneOfDiscriminator = ({
-    kind?: 'circle';
+    kind: 'circle';
 } & ModelCircle) | ({
-    kind?: 'square';
+    kind: 'square';
 } & ModelSquare);
 
 /**

packages/openapi-ts-tests/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/default/types.gen.ts

@@ -442,9 +442,9 @@ export type ModelSquare = {
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
 export type CompositionWithOneOfDiscriminator = ({
-    kind?: 'circle';
+    kind: 'circle';
 } & ModelCircle) | ({
-    kind?: 'square';
+    kind: 'square';
 } & ModelSquare);
 
 /**

packages/openapi-ts-tests/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-optional/types.gen.ts

@@ -442,9 +442,9 @@ export type ModelSquare = {
  * This is a model with one property with a 'one of' relationship where the options are not $ref
  */
 export type CompositionWithOneOfDiscriminator = ({
-    kind?: 'circle';
+    kind: 'circle';
 } & ModelCircle) | ({
-    kind?: 'square';
+    kind: 'square';
 } & ModelSquare);
 
 /**