fix(scalar): better handling object properties with additionalProperties

orval-labs · Feb 18, 2022 · 44b6c4e · 44b6c4e · vercel · Feb 18, 2022
1 parent 7174cd0
commit 44b6c4e
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/src/core/getters/object.ts b/src/core/getters/object.ts
@@ -114,19 +114,19 @@ export const getObject = async ({
         acc.schemas.push(...resolvedValue.schemas);
 
         if (arr.length - 1 === index) {
-          acc.value += '\n}';
-        }
-
-        if (item.additionalProperties) {
-          if (isBoolean(item.additionalProperties)) {
-            acc.value += ` & { [key: string]: any }`;
+          if (item.additionalProperties) {
+            if (isBoolean(item.additionalProperties)) {
+              acc.value += `\n  [key: string]: any;\n }`;
+            } else {
+              const resolvedValue = await resolveValue({
+                schema: item.additionalProperties,
+                name,
+                context,
+              });
+              acc.value += `\n  [key: string]: ${resolvedValue.value};\n}`;
+            }
           } else {
-            const resolvedValue = await resolveValue({
-              schema: item.additionalProperties,
-              name,
-              context,
-            });
-            acc.value += ` & {[key: string]: ${resolvedValue.value}}`;
+            acc.value += '\n}';
           }
         }