Elliottkember patch 1

modules/openapi-generator/src/main/resources/typescript-fetch/modelOneOf.mustache

@@ -89,6 +89,13 @@ export function {{classname}}FromJSONTyped(json: any, ignoreDiscriminator: boole
         }
     }
     {{/isNumeric}}
+    {{#isBoolean}}
+    if (Array.isArray(json)) {
+        if (json.every(item => typeof item === 'boolean'{{#isEnum}} && ({{#allowableValues}}{{#values}}item === {{.}}{{^-last}} || {{/-last}}{{/values}}{{/allowableValues}}){{/isEnum}})) {
+            return json;
+        }
+    }
+    {{/isBoolean}}
     {{#isString}}
     if (Array.isArray(json)) {
         if (json.every(item => typeof item === 'string'{{#isEnum}} && ({{#allowableValues}}{{#values}}item === '{{.}}'{{^-last}} || {{/-last}}{{/values}}{{/allowableValues}}){{/isEnum}})) {
@@ -116,6 +123,11 @@ export function {{classname}}FromJSONTyped(json: any, ignoreDiscriminator: boole
         return json;
     }
     {{/isNumeric}}
+    {{#isBoolean}}
+    if (typeof json === 'boolean'{{#isEnum}} && ({{#allowableValues}}{{#values}}json === {{.}}{{^-last}} || {{/-last}}{{/values}}{{/allowableValues}}){{/isEnum}}) {
+        return json;
+    }
+    {{/isBoolean}}
     {{#isString}}
     if (typeof json === 'string'{{#isEnum}} && ({{#allowableValues}}{{#values}}json === '{{.}}'{{^-last}} || {{/-last}}{{/values}}{{/allowableValues}}){{/isEnum}}) {
         return json;
@@ -194,6 +206,13 @@ export function {{classname}}ToJSONTyped(value?: {{classname}} | null, ignoreDis
         }
     }
     {{/isNumeric}}
+    {{#isBoolean}}
+    if (Array.isArray(value)) {
+        if (value.every(item => typeof item === 'boolean'{{#isEnum}} && ({{#allowableValues}}{{#values}}item === {{.}}{{^-last}} || {{/-last}}{{/values}}{{/allowableValues}}){{/isEnum}})) {
+            return value;
+        }
+    }
+    {{/isBoolean}}
     {{#isString}}
     if (Array.isArray(value)) {
         if (value.every(item => typeof item === 'string'{{#isEnum}} && ({{#allowableValues}}{{#values}}item === '{{.}}'{{^-last}} || {{/-last}}{{/values}}{{/allowableValues}}){{/isEnum}})) {
@@ -219,6 +238,11 @@ export function {{classname}}ToJSONTyped(value?: {{classname}} | null, ignoreDis
         return value;
     }
     {{/isNumeric}}
+    {{#isBoolean}}
+    if (typeof value === 'boolean'{{#isEnum}} && ({{#allowableValues}}{{#values}}value === {{.}}{{^-last}} || {{/-last}}{{/values}}{{/allowableValues}}){{/isEnum}}) {
+        return value;
+    }
+    {{/isBoolean}}
     {{#isString}}
     if (typeof value === 'string'{{#isEnum}} && ({{#allowableValues}}{{#values}}value === '{{.}}'{{^-last}} || {{/-last}}{{/values}}{{/allowableValues}}){{/isEnum}}) {
         return value;

modules/openapi-generator/src/test/resources/3_0/typescript-fetch/oneOf.yaml

@@ -93,4 +93,9 @@ components:
             - "optionTwo"
           type: string
       required:
-        - discriminatorField
+        - discriminatorField
+    VariousOneOf:
+      oneOf:
+        - type: string
+        - type: integer
+        - type: boolean

samples/client/petstore/typescript-fetch/builds/oneOf/.openapi-generator/FILES

@@ -8,6 +8,7 @@ docs/TestArrayResponse.md
 docs/TestB.md
 docs/TestDiscriminatorResponse.md
 docs/TestResponse.md
+docs/VariousOneOf.md
 index.ts
 models/OptionOne.ts
 models/OptionTwo.ts
@@ -16,5 +17,6 @@ models/TestArrayResponse.ts
 models/TestB.ts
 models/TestDiscriminatorResponse.ts
 models/TestResponse.ts
+models/VariousOneOf.ts
 models/index.ts
 runtime.ts

samples/client/petstore/typescript-fetch/builds/oneOf/docs/VariousOneOf.md

@@ -0,0 +1,32 @@
+
+# VariousOneOf
+
+
+## Properties
+
+Name | Type
+------------ | -------------
+
+## Example
+
+```typescript
+import type { VariousOneOf } from ''
+
+// TODO: Update the object below with actual values
+const example = {
+} satisfies VariousOneOf
+
+console.log(example)
+
+// Convert the instance to a JSON string
+const exampleJSON: string = JSON.stringify(example)
+console.log(exampleJSON)
+
+// Parse the JSON string back to an object
+const exampleParsed = JSON.parse(exampleJSON) as VariousOneOf
+console.log(exampleParsed)
+```
+
+[[Back to top]](#) [[Back to API list]](../README.md#api-endpoints) [[Back to Model list]](../README.md#models) [[Back to README]](../README.md)
+
+

samples/client/petstore/typescript-fetch/builds/oneOf/models/VariousOneOf.ts

@@ -0,0 +1,63 @@
+sdklfj;aklsdjf;ajsdkl
+
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * testing oneOf without discriminator
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+/**
+ * @type VariousOneOf
+ * 
+ * @export
+ */
+export type VariousOneOf = boolean | number | string;
+
+export function VariousOneOfFromJSON(json: any): VariousOneOf {
+    return VariousOneOfFromJSONTyped(json, false);
+}
+
+export function VariousOneOfFromJSONTyped(json: any, ignoreDiscriminator: boolean): VariousOneOf {
+    if (json == null) {
+        return json;
+    }
+    if (typeof json === 'boolean') {
+        return json;
+    }
+    if (typeof json === 'number') {
+        return json;
+    }
+    if (typeof json === 'string') {
+        return json;
+    }
+    return {} as any;
+}
+
+export function VariousOneOfToJSON(json: any): any {
+    return VariousOneOfToJSONTyped(json, false);
+}
+
+export function VariousOneOfToJSONTyped(value?: VariousOneOf | null, ignoreDiscriminator: boolean = false): any {
+    if (value == null) {
+        return value;
+    }
+    if (typeof value === 'boolean') {
+        return value;
+    }
+    if (typeof value === 'number') {
+        return value;
+    }
+    if (typeof value === 'string') {
+        return value;
+    }
+    return {};
+}
+

samples/client/petstore/typescript-fetch/builds/oneOf/models/index.ts

@@ -7,3 +7,4 @@ export * from './TestArrayResponse';
 export * from './TestB';
 export * from './TestDiscriminatorResponse';
 export * from './TestResponse';
+export * from './VariousOneOf';