refactor: remove oneOfStringEnums handling and simplify oneOf logic in TypeScript code generators

Author: GregoryMerlet

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

@@ -961,19 +961,6 @@ public void setIsEnum(boolean isEnum) {
         this.isEnum = isEnum;
     }
 
-    @SuppressWarnings("unchecked")
-    public List<String> getAllowableValuesList() {
-        return Optional.ofNullable(this.getAllowableValues())
-                .map(allowableValues -> allowableValues.get("values"))
-                .flatMap(valuesList -> {
-                    try {
-                        return Optional.ofNullable((List<String>)valuesList);
-                    } catch (ClassCastException e) {
-                        return Optional.empty();
-                    }
-                })
-                .orElse(Collections.emptyList());
-    }
 
     @Override
     public String toString() {

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

@@ -2716,11 +2716,6 @@ protected void updateModelForComposedSchema(CodegenModel m, Schema schema, Map<S
                             m.anyOf.add(languageType);
                         }
                     } else if (composed.getOneOf() != null) {
-                        if (ModelUtils.isStringSchema(interfaceSchema) && ModelUtils.isEnumSchema(interfaceSchema)) {
-                            // use string union literals
-                            languageType = getEnumStringLiteralUnionType(interfaceSchema);
-                        }
-
                         if (m.oneOf.contains(languageType)) {
                             LOGGER.debug("{} (oneOf schema) already has `{}` defined and therefore it's skipped.", m.name, languageType);
                         } else {
@@ -2836,13 +2831,6 @@ protected void updateModelForComposedSchema(CodegenModel m, Schema schema, Map<S
         // end of code block for composed schema
     }
 
-    @SuppressWarnings("unchecked")
-    private static String getEnumStringLiteralUnionType(Schema interfaceSchema) {
-        return (String) interfaceSchema.getEnum().stream()
-                .map(enumName -> "\"" + (String)enumName + "\"")
-                .collect(Collectors.joining(" | "));
-    }
-
     /**
      * Combines all previously-detected type entries for a schema with newly-discovered ones, to ensure
      * that schema for items like enum include all possible values.

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

@@ -796,12 +796,6 @@ private ExtendedCodegenModel processCodeGenModel(ExtendedCodegenModel cm) {
                 .filter(Objects::nonNull)
                 .collect(Collectors.toCollection(TreeSet::new));
 
-        cm.oneOfStringEnums = oneOfsList.stream()
-                .filter(CodegenProperty::getIsEnum)
-                .map(CodegenProperty::getAllowableValuesList)
-                .flatMap(Collection::stream)
-                .collect(Collectors.toCollection(TreeSet::new));
-
         cm.oneOfArrays = oneOfsList.stream()
                 .filter(CodegenProperty::getIsArray)
                 .map(CodegenProperty::getComplexType)
@@ -1501,8 +1495,6 @@ public class ExtendedCodegenModel extends CodegenModel {
         @Getter @Setter
         public Set<String> oneOfModels = new TreeSet<>();
         @Getter @Setter
-        public Set<String> oneOfStringEnums = new TreeSet<>();
-        @Getter @Setter
         public Set<String> oneOfArrays = new TreeSet<>();
 
         public boolean hasStringOneOf;

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

@@ -32,7 +32,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.TreeSet;
-import java.util.stream.Collectors;
 
 public class TypeScriptReduxQueryClientCodegen extends AbstractTypeScriptClientCodegen {
 
@@ -146,9 +145,13 @@ public ModelsMap postProcessModels(ModelsMap objs) {
             }
             if (!cm.oneOf.isEmpty()) {
                 // For oneOfs only import $refs within the oneOf
-                cm.imports = cm.imports.stream()
-                        .filter(cm.oneOf::contains)
-                        .collect(Collectors.toCollection(TreeSet::new));
+                TreeSet<String> oneOfRefs = new TreeSet<>();
+                for (String im : cm.imports) {
+                    if (cm.oneOf.contains(im)) {
+                        oneOfRefs.add(im);
+                    }
+                }
+                cm.imports = oneOfRefs;
             }
         }
 

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

@@ -31,37 +31,27 @@ export function {{classname}}FromJSONTyped(json: any, ignoreDiscriminator: boole
     }
 {{/discriminator}}
 {{^discriminator}}
-    {{#oneOfStringEnums}}
-    if (json === "{{{.}}}") {
-        return json;
-    }
-    {{/oneOfStringEnums}}
-    {{#hasStringOneOf}}
-    if (json instanceof String) {
-        return json as {{classname}};
-    }
-    {{/hasStringOneOf}}
-    if (!(json instanceof Object)){
-        return {} as any;
-    }
-    {{#hasStringArrayOneOf}}
-    if (Array.isArray(json) && json.every(item => typeof item === 'string')) {
+    {{#oneOfModels}}
+    {{#-first}}
+    if (typeof json !== 'object') {
         return json;
     }
-    {{/hasStringArrayOneOf}}
-    {{#oneOfModels}}
+    {{/-first}}
     if (instanceOf{{{.}}}(json)) {
         return {{{.}}}FromJSONTyped(json, true);
     }
     {{/oneOfModels}}
     {{#oneOfArrays}}
     {{#-first}}
-    if (Array.isArray(json) && json.every(item => typeof item === 'object')) {
+    if (Array.isArray(json)) {
+        if (json.every(item => typeof item === 'object')) {
     {{/-first}}
-        if (json.every(item => instanceOf{{{.}}}(item))) {
-            return json.map(value => {{{.}}}FromJSONTyped(value, true));
-        }
+            if (json.every(item => instanceOf{{{.}}}(item))) {
+                return json.map(value => {{{.}}}FromJSONTyped(value, true));
+            }
     {{#-last}}
+        }
+        return json;
     }
     {{/-last}}
     {{/oneOfArrays}}
@@ -88,39 +78,28 @@ export function {{classname}}ToJSONTyped(value?: {{classname}} | null, ignoreDis
             return json;
     }
 {{/discriminator}}
-
 {{^discriminator}}
-    {{#oneOfStringEnums}}
-    if (value === "{{{.}}}") {
-        return value;
-    }
-    {{/oneOfStringEnums}}
-    {{#hasStringOneOf}}
-    if (value instanceof String) {
-        return value;
-    }
-    {{/hasStringOneOf}}
-    if (!(value instanceof Object)){
-        return {};
-    }
-    {{#hasStringArrayOneOf}}
-    if (Array.isArray(value) && value.every(item => typeof item === 'string')) {
+    {{#oneOfModels}}
+    {{#-first}}
+    if (typeof value !== 'object') {
         return value;
     }
-    {{/hasStringArrayOneOf}}
-    {{#oneOfModels}}
+    {{/-first}}
     if (instanceOf{{{.}}}(value)) {
         return {{{.}}}ToJSON(value as {{{.}}});
     }
     {{/oneOfModels}}
     {{#oneOfArrays}}
     {{#-first}}
-    if (Array.isArray(value) && value.every(item => typeof item === 'object')) {
+    if (Array.isArray(value)) {
+        if (value.every(item => typeof item === 'object')) {
     {{/-first}}
-        if (value.every(item => instanceOf{{{.}}}(item))) {
-            return value.map(value => {{{.}}}ToJSON(value as {{{.}}}));
-        }
+            if (value.every(item => instanceOf{{{.}}}(item))) {
+                return value.map(value => {{{.}}}ToJSON(value as {{{.}}}));
+            }
     {{#-last}}
+        }
+        return value;
     }
     {{/-last}}
     {{/oneOfArrays}}