Fix required additional properties (#932)

* Fix required additional properties handling

* Optimize

Author: tkukushkin

src/transform/schema.ts

@@ -52,14 +52,22 @@ export function transformSchemaObjMap(obj: Record<string, any>, options: Transfo
 }
 
 /** make sure all required fields exist **/
-export function addRequiredProps(properties: Record<string, any>, required: Set<string>): string[] {
+export function addRequiredProps(
+  properties: Record<string, any>,
+  required: Set<string>,
+  additionalProperties: any,
+  options: TransformSchemaObjOptions
+): string[] {
   const missingRequired = [...required].filter((r: string) => !(r in properties));
   if (missingRequired.length == 0) {
     return [];
   }
   let output = "";
+
+  const valueType = additionalProperties ? transformSchemaObj(additionalProperties, options) : "unknown";
+
   for (const r of missingRequired) {
-    output += `${r}: unknown;\n`;
+    output += `${r}: ${valueType};\n`;
   }
   return [`{\n${output}}`];
 }
@@ -131,7 +139,12 @@ export function transformSchemaObj(node: any, options: TransformSchemaObjOptions
       }
       case "object": {
         const isAnyOfOrOneOfOrAllOf = "anyOf" in node || "oneOf" in node || "allOf" in node;
-        const missingRequired = addRequiredProps(node.properties || {}, node.required || []);
+        const missingRequired = addRequiredProps(
+          node.properties || {},
+          node.required || [],
+          node.additionalProperties,
+          options
+        );
         // if empty object, then return generic map type
         if (
           !isAnyOfOrOneOfOrAllOf &&

test/core/schema.test.js

@@ -446,6 +446,29 @@ abc: unknown;
 })`);
   });
 
+  it("object with missing required field but with additionalProperties", () => {
+    expect(
+      transform(
+        {
+          type: "object",
+          required: ["abc", "email"],
+          properties: {
+            email: { type: "string" },
+          },
+          additionalProperties: {
+            type: "integer",
+          },
+        },
+        { ...defaults }
+      )
+    ).to.equal(`({
+"email": string;
+
+}) & ({
+abc: number;
+}) & ({ [key: string]: number; })`);
+  });
+
   describe("comments", () => {
     it("basic", () => {
       expect(