Ensure generation of properties that only have additionalProps + propertyNames enum

Author: Sqh3rd

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

@@ -282,6 +282,9 @@ private boolean isModelNeeded(Schema schema, Set<Schema> visitedSchemas) {
                 return true;
             }
         }
+        if (ModelUtils.hasEnumPropertyNames(schema)) {
+            return true;
+        }
 
         return false;
     }

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

@@ -662,7 +662,7 @@ public String getTypeDeclaration(Schema p) {
             if (Boolean.TRUE.equals(inner.getNullable())) {
                 nullSafeSuffix += " | null";
             }
-            return "{ [key: string]: " + getTypeDeclaration(unaliasSchema(inner)) + nullSafeSuffix + "; }";
+            return "Record<string, " + getTypeDeclaration(unaliasSchema(inner)) + nullSafeSuffix + ">";
         } else if (ModelUtils.isFileSchema(p)) {
             return "File";
         } else if (ModelUtils.isBinarySchema(p)) {

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

@@ -889,7 +889,7 @@ public static boolean isFreeFormObject(Schema schema, OpenAPI openAPI) {
             if (schema.getAdditionalProperties() instanceof Boolean && (Boolean) schema.getAdditionalProperties()) {
                 return true;
             } else if (schema.getAdditionalProperties() instanceof JsonSchema) {
-                return true;
+                return !ModelUtils.hasEnumPropertyNames(schema);
             } else if (schema.getTypes() != null) {
                 if (schema.getTypes().size() == 1) { // types = [object]
                     return SchemaTypeUtil.OBJECT_TYPE.equals(schema.getTypes().iterator().next());
@@ -937,7 +937,7 @@ public static boolean isFreeFormObject(Schema schema, OpenAPI openAPI) {
                         return objSchema.getProperties() == null || objSchema.getProperties().isEmpty();
                     } else if (addlProps instanceof Schema) {
                         // additionalProperties defined as {}
-                        return addlProps.getType() == null && addlProps.get$ref() == null && (addlProps.getProperties() == null || addlProps.getProperties().isEmpty());
+                        return addlProps.getType() == null && addlProps.get$ref() == null && (addlProps.getProperties() == null || addlProps.getProperties().isEmpty()) && !ModelUtils.hasEnumPropertyNames(schema);
                     }
                 }
             }
@@ -963,7 +963,7 @@ public static boolean shouldGenerateMapModel(Schema schema) {
         // A composed schema (allOf, oneOf, anyOf) is considered a Map schema if the additionalproperties attribute is set
         // for that composed schema. However, in the case of a composed schema, the properties are defined or referenced
         // in the inner schemas, and the outer schema does not have properties.
-        return ModelUtils.isGenerateAliasAsModel(schema) || ModelUtils.isComposedSchema(schema) || !(schema.getProperties() == null || schema.getProperties().isEmpty());
+        return ModelUtils.isGenerateAliasAsModel(schema) || ModelUtils.isComposedSchema(schema) || !(schema.getProperties() == null || schema.getProperties().isEmpty()) || ModelUtils.hasEnumPropertyNames(schema);
     }
 
     public static boolean shouldGenerateArrayModel(Schema schema) {
@@ -2158,6 +2158,13 @@ public static boolean hasAnyOf(Schema schema) {
         return false;
     }
 
+    public static boolean hasEnumPropertyNames(Schema schema) {
+        if (schema == null || schema.getPropertyNames() == null) {
+            return false;
+        }
+        return !schema.getPropertyNames().getEnum().isEmpty();
+    }
+
     /**
      * Returns schema type.
      * For 3.1 spec, return the first one.

modules/openapi-generator/src/main/resources/typescript-angular/modelGenericAdditionalProperties.mustache

@@ -2,7 +2,7 @@
 
     [key: string]: {{additionalPropertiesType}}{{#hasVars}} | any{{/hasVars}};
     {{#nameOnlyVars}}
-        {{.}}?: {{additionalPropertiesType}};
+    {{.}}?: {{additionalPropertiesType}};
     {{/nameOnlyVars}}
 
 {{/additionalPropertiesType}}