Fix numeric singleton enum check and discriminator wire-format key

Author: jasperpatterson

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

@@ -37,10 +37,12 @@ export function instanceOf{{classname}}(value: object): value is {{classname}} {
     {{#-first}}
     {{#-last}}
     {{#hasSanitizedName}}
-    if (value['{{name}}'] !== '{{.}}' && value['{{baseName}}'] !== '{{.}}') return false;
+    {{#isString}}if (value['{{name}}'] !== '{{.}}' && value['{{baseName}}'] !== '{{.}}') return false;{{/isString}}
+    {{^isString}}if (value['{{name}}'] !== {{.}} && value['{{baseName}}'] !== {{.}}) return false;{{/isString}}
     {{/hasSanitizedName}}
     {{^hasSanitizedName}}
-    if (value['{{name}}'] !== '{{.}}') return false;
+    {{#isString}}if (value['{{name}}'] !== '{{.}}') return false;{{/isString}}
+    {{^isString}}if (value['{{name}}'] !== {{.}}) return false;{{/isString}}
     {{/hasSanitizedName}}
     {{/-last}}
     {{/-first}}

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

@@ -151,7 +151,7 @@ export function {{classname}}ToJSONTyped(value?: {{classname}} | null, ignoreDis
     switch (value['{{discriminator.propertyName}}']) {
 {{#discriminator.mappedModels}}
         case '{{mappingName}}':
-            return Object.assign({}, {{modelName}}ToJSON(value), { {{discriminator.propertyName}}: '{{mappingName}}' } as const);
+            return Object.assign({}, {{modelName}}ToJSON(value), { '{{discriminator.propertyBaseName}}': '{{mappingName}}' } as const);
 {{/discriminator.mappedModels}}
         default:
             return value;

modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/fetch/TypeScriptFetchClientCodegenTest.java

@@ -485,6 +485,24 @@ public void testInstanceOfChecksDiscriminatorValue() throws IOException {
         TestUtils.assertFileContains(dashedOptionOne, "value['discriminator-field'] !== 'dashedOptionOne'");
         TestUtils.assertFileContains(dashedOptionOne, "'someProperty' in value");
         TestUtils.assertFileContains(dashedOptionOne, "'some-property' in value");
+
+        // Numeric singleton enum: value check must NOT quote the literal
+        Path numericModel = Paths.get(output + "/models/NumericSingletonEnumModel.ts");
+        TestUtils.assertFileExists(numericModel);
+        TestUtils.assertFileContains(numericModel, "value['kind'] !== 42");
+        TestUtils.assertFileNotContains(numericModel, "value['kind'] !== '42'");
+
+        // ToJSONTyped of discriminated oneOf must emit the wire-format discriminator key
+        // (propertyBaseName), not the camelCase TS property name
+        Path dashedDiscriminatorResponse = Paths.get(output + "/models/TestDashedDiscriminatorResponse.ts");
+        TestUtils.assertFileExists(dashedDiscriminatorResponse);
+        TestUtils.assertFileContains(dashedDiscriminatorResponse, "{ 'discriminator-field': 'dashedOptionOne' }");
+        TestUtils.assertFileContains(dashedDiscriminatorResponse, "{ 'discriminator-field': 'dashedOptionTwo' }");
+
+        Path snakeDiscriminatorResponse = Paths.get(output + "/models/TestSnakeCaseDiscriminatorResponse.ts");
+        TestUtils.assertFileExists(snakeDiscriminatorResponse);
+        TestUtils.assertFileContains(snakeDiscriminatorResponse, "{ 'discriminator_field': 'snakeOptionOne' }");
+        TestUtils.assertFileContains(snakeDiscriminatorResponse, "{ 'discriminator_field': 'snakeOptionTwo' }");
     }
 
     @Test(description = "Verify validationAttributes works with withoutRuntimeChecks=true")

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

@@ -114,6 +114,15 @@ components:
           type: string
       required:
         - discriminatorField
+    NumericSingletonEnumModel:
+      type: object
+      properties:
+        kind:
+          type: integer
+          enum:
+            - 42
+      required:
+        - kind
     TestSnakeCaseDiscriminatorResponse:
       discriminator:
         propertyName: discriminator_field

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

@@ -3,6 +3,7 @@ apis/index.ts
 docs/DashedOptionOne.md
 docs/DashedOptionTwo.md
 docs/DefaultApi.md
+docs/NumericSingletonEnumModel.md
 docs/OptionOne.md
 docs/OptionTwo.md
 docs/SnakeOptionOne.md
@@ -17,6 +18,7 @@ docs/TestSnakeCaseDiscriminatorResponse.md
 index.ts
 models/DashedOptionOne.ts
 models/DashedOptionTwo.ts
+models/NumericSingletonEnumModel.ts
 models/OptionOne.ts
 models/OptionTwo.ts
 models/SnakeOptionOne.ts

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

@@ -0,0 +1,34 @@
+
+# NumericSingletonEnumModel
+
+
+## Properties
+
+Name | Type
+------------ | -------------
+`kind` | number
+
+## Example
+
+```typescript
+import type { NumericSingletonEnumModel } from ''
+
+// TODO: Update the object below with actual values
+const example = {
+  "kind": null,
+} satisfies NumericSingletonEnumModel
+
+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 NumericSingletonEnumModel
+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/DashedOptionOne.ts

@@ -49,6 +49,7 @@ export type DashedOptionOneDiscriminatorFieldEnum = typeof DashedOptionOneDiscri
 export function instanceOfDashedOptionOne(value: object): value is DashedOptionOne {
     if ((!('discriminatorField' in value) && !('discriminator-field' in value)) || (value['discriminatorField'] === undefined && value['discriminator-field'] === undefined)) return false;
     if (value['discriminatorField'] !== 'dashedOptionOne' && value['discriminator-field'] !== 'dashedOptionOne') return false;
+    
     if ((!('someProperty' in value) && !('some-property' in value)) || (value['someProperty'] === undefined && value['some-property'] === undefined)) return false;
     return true;
 }

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

@@ -49,6 +49,7 @@ export type DashedOptionTwoDiscriminatorFieldEnum = typeof DashedOptionTwoDiscri
 export function instanceOfDashedOptionTwo(value: object): value is DashedOptionTwo {
     if ((!('discriminatorField' in value) && !('discriminator-field' in value)) || (value['discriminatorField'] === undefined && value['discriminator-field'] === undefined)) return false;
     if (value['discriminatorField'] !== 'dashedOptionTwo' && value['discriminator-field'] !== 'dashedOptionTwo') return false;
+    
     if ((!('someProperty' in value) && !('some-property' in value)) || (value['someProperty'] === undefined && value['some-property'] === undefined)) return false;
     return true;
 }

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

@@ -0,0 +1,78 @@
+/* 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.
+ */
+
+import { mapValues } from '../runtime';
+/**
+ * 
+ * @export
+ * @interface NumericSingletonEnumModel
+ */
+export interface NumericSingletonEnumModel {
+    /**
+     * 
+     * @type {NumericSingletonEnumModelKindEnum}
+     * @memberof NumericSingletonEnumModel
+     */
+    kind: NumericSingletonEnumModelKindEnum;
+}
+
+
+/**
+ * @export
+ */
+export const NumericSingletonEnumModelKindEnum = {
+    NUMBER_42: 42
+} as const;
+export type NumericSingletonEnumModelKindEnum = typeof NumericSingletonEnumModelKindEnum[keyof typeof NumericSingletonEnumModelKindEnum];
+
+
+/**
+ * Check if a given object implements the NumericSingletonEnumModel interface.
+ */
+export function instanceOfNumericSingletonEnumModel(value: object): value is NumericSingletonEnumModel {
+    if (!('kind' in value) || value['kind'] === undefined) return false;
+    
+    if (value['kind'] !== 42) return false;
+    return true;
+}
+
+export function NumericSingletonEnumModelFromJSON(json: any): NumericSingletonEnumModel {
+    return NumericSingletonEnumModelFromJSONTyped(json, false);
+}
+
+export function NumericSingletonEnumModelFromJSONTyped(json: any, ignoreDiscriminator: boolean): NumericSingletonEnumModel {
+    if (json == null) {
+        return json;
+    }
+    return {
+        
+        'kind': json['kind'],
+    };
+}
+
+export function NumericSingletonEnumModelToJSON(json: any): NumericSingletonEnumModel {
+    return NumericSingletonEnumModelToJSONTyped(json, false);
+}
+
+export function NumericSingletonEnumModelToJSONTyped(value?: NumericSingletonEnumModel | null, ignoreDiscriminator: boolean = false): any {
+    if (value == null) {
+        return value;
+    }
+
+    return {
+        
+        'kind': value['kind'],
+    };
+}
+

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

@@ -43,6 +43,7 @@ export type OptionOneDiscriminatorFieldEnum = typeof OptionOneDiscriminatorField
 export function instanceOfOptionOne(value: object): value is OptionOne {
     if (!('discriminatorField' in value) || value['discriminatorField'] === undefined) return false;
     if (value['discriminatorField'] !== 'optionOne') return false;
+    
     return true;
 }