Eliminate duplicate name/baseName checks in instanceOf type guards when name equals baseName

Author: jasperpatterson

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java

@@ -1382,6 +1382,7 @@ public ExtendedCodegenProperty(CodegenProperty cp) {
             this.xmlName = cp.xmlName;
             this.xmlNamespace = cp.xmlNamespace;
             this.isXmlWrapped = cp.isXmlWrapped;
+            this.setHasSanitizedName(cp.getHasSanitizedName());
         }
 
         @Override

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

@@ -25,13 +25,23 @@ import { type {{modelName}}, {{modelName}}FromJSONTyped, {{modelName}}ToJSON, {{
 export function instanceOf{{classname}}(value: object): value is {{classname}} {
     {{#vars}}
     {{#required}}
+    {{#hasSanitizedName}}
     if ((!('{{name}}' in value) && !('{{baseName}}' in value)) || (value['{{name}}'] === undefined && value['{{baseName}}'] === undefined)) return false;
+    {{/hasSanitizedName}}
+    {{^hasSanitizedName}}
+    if (!('{{name}}' in value) || value['{{name}}'] === undefined) return false;
+    {{/hasSanitizedName}}
     {{#isEnum}}
     {{#allowableValues}}
     {{#values}}
     {{#-first}}
     {{#-last}}
+    {{#hasSanitizedName}}
     if (value['{{name}}'] !== '{{.}}' && value['{{baseName}}'] !== '{{.}}') return false;
+    {{/hasSanitizedName}}
+    {{^hasSanitizedName}}
+    if (value['{{name}}'] !== '{{.}}') return false;
+    {{/hasSanitizedName}}
     {{/-last}}
     {{/-first}}
     {{/values}}

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

@@ -41,8 +41,8 @@ export type OptionOneDiscriminatorFieldEnum = typeof OptionOneDiscriminatorField
  * Check if a given object implements the OptionOne interface.
  */
 export function instanceOfOptionOne(value: object): value is OptionOne {
-    if ((!('discriminatorField' in value) && !('discriminatorField' in value)) || (value['discriminatorField'] === undefined && value['discriminatorField'] === undefined)) return false;
-    if (value['discriminatorField'] !== 'optionOne' && value['discriminatorField'] !== 'optionOne') return false;
+    if (!('discriminatorField' in value) || value['discriminatorField'] === undefined) return false;
+    if (value['discriminatorField'] !== 'optionOne') return false;
     return true;
 }
 

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

@@ -41,8 +41,8 @@ export type OptionTwoDiscriminatorFieldEnum = typeof OptionTwoDiscriminatorField
  * Check if a given object implements the OptionTwo interface.
  */
 export function instanceOfOptionTwo(value: object): value is OptionTwo {
-    if ((!('discriminatorField' in value) && !('discriminatorField' in value)) || (value['discriminatorField'] === undefined && value['discriminatorField'] === undefined)) return false;
-    if (value['discriminatorField'] !== 'optionTwo' && value['discriminatorField'] !== 'optionTwo') return false;
+    if (!('discriminatorField' in value) || value['discriminatorField'] === undefined) return false;
+    if (value['discriminatorField'] !== 'optionTwo') return false;
     return true;
 }
 

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

@@ -31,7 +31,7 @@ export interface TestA {
  * Check if a given object implements the TestA interface.
  */
 export function instanceOfTestA(value: object): value is TestA {
-    if ((!('foo' in value) && !('foo' in value)) || (value['foo'] === undefined && value['foo'] === undefined)) return false;
+    if (!('foo' in value) || value['foo'] === undefined) return false;
     return true;
 }
 

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

@@ -31,7 +31,7 @@ export interface TestB {
  * Check if a given object implements the TestB interface.
  */
 export function instanceOfTestB(value: object): value is TestB {
-    if ((!('bar' in value) && !('bar' in value)) || (value['bar'] === undefined && value['bar'] === undefined)) return false;
+    if (!('bar' in value) || value['bar'] === undefined) return false;
     return true;
 }