fix: add default values to nested schema

Author: thomasthiebaud

src/schema.ts

@@ -10,11 +10,22 @@ import { capitalize, writeFile } from "./utils";
 const compileOptions: Partial<CompilerOptions> = { bannerComment: "" };
 const defaultSchema = { type: "object", additionalProperties: false };
 
-function addDefaultValueToSchema(schema: any) {
-  return {
-    ...schema,
-    additionalProperties: schema.additionalProperties || false,
-  };
+export function addDefaultValueToSchema(
+  schema: Record<string, any>
+): Record<string, any> {
+  return Object.entries(schema).reduce((acc, [key, value]) => {
+    if (value !== null && typeof value == "object") {
+      acc[key] = addDefaultValueToSchema(value);
+    } else {
+      acc[key] = value;
+    }
+
+    if (key === "properties" && !acc.additionalProperties) {
+      acc.additionalProperties = false;
+    }
+
+    return acc;
+  }, {} as any);
 }
 
 export const defaultOptions = {

tests/schema.spec.ts

@@ -3,6 +3,7 @@ import {
   generateReplyInterfaces,
   generateInterfaces,
   defaultOptions,
+  addDefaultValueToSchema,
 } from "../src/schema";
 
 describe("#generateReplyInterfaces", () => {
@@ -344,3 +345,104 @@ describe("#generateInterfaces", () => {
     ).toMatchSnapshot();
   });
 });
+
+describe("#addDefaultValueToSchema", () => {
+  it("should add default values to schema", () => {
+    const res = addDefaultValueToSchema({
+      properties: {
+        success: {
+          type: "string",
+        },
+        message: {
+          type: "string",
+        },
+      },
+    });
+
+    expect(res).toEqual({
+      properties: {
+        success: {
+          type: "string",
+        },
+        message: {
+          type: "string",
+        },
+      },
+      additionalProperties: false,
+    });
+  });
+
+  it("should add default values to nested schema", () => {
+    const res = addDefaultValueToSchema({
+      properties: {
+        success: {
+          type: "object",
+          properties: {
+            ok: {
+              type: "boolean",
+            },
+          },
+        },
+        message: {
+          type: "string",
+        },
+      },
+    });
+
+    expect(res).toEqual({
+      properties: {
+        success: {
+          type: "object",
+          additionalProperties: false,
+          properties: {
+            ok: {
+              type: "boolean",
+            },
+          },
+        },
+        message: {
+          type: "string",
+        },
+      },
+      additionalProperties: false,
+    });
+  });
+
+  it("should not overide values if already present", () => {
+    const res = addDefaultValueToSchema({
+      properties: {
+        success: {
+          type: "object",
+          additionalProperties: true,
+          properties: {
+            ok: {
+              type: "boolean",
+            },
+          },
+        },
+        message: {
+          type: "string",
+        },
+      },
+      additionalProperties: true,
+    });
+
+    expect(res).toEqual({
+      properties: {
+        success: {
+          type: "object",
+          additionalProperties: true,
+          properties: {
+            ok: {
+              type: "boolean",
+            },
+          },
+        },
+        message: {
+          type: "string",
+        },
+      },
+      additionalProperties: true,
+    });
+  });
+});