apply suggestions

Author: Pontus Lundin

packages/openapi-typescript/src/transform/schema-object.ts

@@ -544,55 +544,53 @@ function transformSchemaObjectCore(schemaObject: SchemaObject, options: Transfor
     }
 
     // additionalProperties / patternProperties
-    if (schemaObject.additionalProperties || options.ctx.additionalProperties || schemaObject.patternProperties) {
-      const hasExplicitAdditionalProperties =
-        typeof schemaObject.additionalProperties === "object" && Object.keys(schemaObject.additionalProperties).length;
-      const hasImplicitAdditionalProperties =
-        schemaObject.additionalProperties === true ||
-        (typeof schemaObject.additionalProperties === "object" &&
-          Object.keys(schemaObject.additionalProperties).length === 0);
-      const hasExplicitPatternProperties =
-        typeof schemaObject.patternProperties === "object" && Object.keys(schemaObject.patternProperties).length;
-      const addlTypes = [];
-      if (hasExplicitAdditionalProperties) {
-        addlTypes.push(transformSchemaObject(schemaObject.additionalProperties as SchemaObject, options));
-      }
-      if (hasImplicitAdditionalProperties || (!schemaObject.additionalProperties && options.ctx.additionalProperties)) {
-        addlTypes.push(UNKNOWN);
-      }
-      if (hasExplicitPatternProperties) {
-        for (const [_, v] of getEntries(schemaObject.patternProperties ?? {}, options.ctx)) {
-          addlTypes.push(transformSchemaObject(v, options));
-        }
-      }
-
-      if (addlTypes.length === 0) {
-        return;
+    const hasExplicitAdditionalProperties =
+      typeof schemaObject.additionalProperties === "object" && Object.keys(schemaObject.additionalProperties).length;
+    const hasImplicitAdditionalProperties =
+      schemaObject.additionalProperties === true ||
+      (typeof schemaObject.additionalProperties === "object" &&
+        Object.keys(schemaObject.additionalProperties).length === 0);
+    const hasExplicitPatternProperties =
+      typeof schemaObject.patternProperties === "object" && Object.keys(schemaObject.patternProperties).length;
+    const stringIndexTypes = [];
+    if (hasExplicitAdditionalProperties) {
+      stringIndexTypes.push(transformSchemaObject(schemaObject.additionalProperties as SchemaObject, options));
+    }
+    if (hasImplicitAdditionalProperties || (!schemaObject.additionalProperties && options.ctx.additionalProperties)) {
+      stringIndexTypes.push(UNKNOWN);
+    }
+    if (hasExplicitPatternProperties) {
+      for (const [_, v] of getEntries(schemaObject.patternProperties ?? {}, options.ctx)) {
+        stringIndexTypes.push(transformSchemaObject(v, options));
       }
+    }
 
-      const addlType = tsUnion(addlTypes);
-
-      return tsIntersection([
-        ...(coreObjectType.length ? [ts.factory.createTypeLiteralNode(coreObjectType)] : []),
-        ts.factory.createTypeLiteralNode([
-          ts.factory.createIndexSignature(
-            /* modifiers  */ tsModifiers({
-              readonly: options.ctx.immutable,
-            }),
-            /* parameters */ [
-              ts.factory.createParameterDeclaration(
-                /* modifiers      */ undefined,
-                /* dotDotDotToken */ undefined,
-                /* name           */ ts.factory.createIdentifier("key"),
-                /* questionToken  */ undefined,
-                /* type           */ STRING,
-              ),
-            ],
-            /* type       */ addlType,
-          ),
-        ]),
-      ]);
+    if (stringIndexTypes.length === 0) {
+      return coreObjectType.length ? ts.factory.createTypeLiteralNode(coreObjectType) : undefined;
     }
+
+    const stringIndexType = tsUnion(stringIndexTypes);
+
+    return tsIntersection([
+      ...(coreObjectType.length ? [ts.factory.createTypeLiteralNode(coreObjectType)] : []),
+      ts.factory.createTypeLiteralNode([
+        ts.factory.createIndexSignature(
+          /* modifiers  */ tsModifiers({
+            readonly: options.ctx.immutable,
+          }),
+          /* parameters */ [
+            ts.factory.createParameterDeclaration(
+              /* modifiers      */ undefined,
+              /* dotDotDotToken */ undefined,
+              /* name           */ ts.factory.createIdentifier("key"),
+              /* questionToken  */ undefined,
+              /* type           */ STRING,
+            ),
+          ],
+          /* type       */ stringIndexType,
+        ),
+      ]),
+    ]);
   }
 
   return coreObjectType.length ? ts.factory.createTypeLiteralNode(coreObjectType) : undefined;