fix: handle arrays correctly

Co-authored-by: gdgunnars <[email protected]>
thomasthiebaud · Apr 1, 2022 · 00c5a35 · 00c5a35
1 parent 9c354ae
commit 00c5a35
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 1 deletion.
diff --git a/src/schema.ts b/src/schema.ts
@@ -14,7 +14,11 @@ export function addDefaultValueToSchema(
   schema: Record<string, any>
 ): Record<string, any> {
   return Object.entries(schema).reduce((acc, [key, value]) => {
-    if (value !== null && typeof value == "object") {
+    if (
+      value !== null &&
+      typeof value == "object" &&
+      Array.isArray(value) === false
+    ) {
       acc[key] = addDefaultValueToSchema(value);
     } else {
       acc[key] = value;

diff --git a/tests/schema.spec.ts b/tests/schema.spec.ts
@@ -445,4 +445,42 @@ describe("#addDefaultValueToSchema", () => {
       additionalProperties: true,
     });
   });
+
+  it("should allow both objects and lists", () => {
+    const res = addDefaultValueToSchema({
+      properties: {
+        success: {
+          type: "object",
+          required: ["ok"],
+          properties: {
+            ok: {
+              type: "boolean",
+            },
+          },
+        },
+        message: {
+          type: "string",
+        },
+      },
+    });
+
+    expect(res).toEqual({
+      properties: {
+        success: {
+          type: "object",
+          required: ["ok"],
+          additionalProperties: false,
+          properties: {
+            ok: {
+              type: "boolean",
+            },
+          },
+        },
+        message: {
+          type: "string",
+        },
+      },
+      additionalProperties: false,
+    });
+  });
 });