fix: add missing child selection of additionalItems: boolean

sagold · Dec 3, 2024 · 0b7c747 · 0b7c747
1 parent 03c91bb
commit 0b7c747
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 3 deletions.
diff --git a/dist/jsonSchemaLibrary.js b/dist/jsonSchemaLibrary.js
diff --git a/dist/module/lib/getChildSchemaSelection.js b/dist/module/lib/getChildSchemaSelection.js
@@ -24,7 +24,9 @@ export default function getChildSchemaSelection(draft, property, schema = draft.
     }
     // array.items[] exceeded (or undefined), but additionalItems specified
     if (schema.additionalItems && !isObject(schema.items)) {
-        return [draft.createNode(schema.additionalItems).resolveRef().schema];
+        // we fallback to a string if no schema is defined - might be subject for configuration
+        const additionalSchema = schema.additionalItems === true ? { type: "string" } : schema.additionalItems;
+        return [draft.createNode(additionalSchema).resolveRef().schema];
     }
     // array.items[] exceeded
     if (Array.isArray(schema.items) && schema.items.length <= +property) {

diff --git a/lib/getChildSchemaSelection.ts b/lib/getChildSchemaSelection.ts
@@ -31,7 +31,10 @@ export default function getChildSchemaSelection(
 
     // array.items[] exceeded (or undefined), but additionalItems specified
     if (schema.additionalItems && !isObject(schema.items)) {
-        return [draft.createNode(schema.additionalItems).resolveRef().schema];
+        // we fallback to a string if no schema is defined - might be subject for configuration
+        const additionalSchema: JsonSchema =
+            schema.additionalItems === true ? { type: "string" } : schema.additionalItems;
+        return [draft.createNode(additionalSchema).resolveRef().schema];
     }
 
     // array.items[] exceeded

diff --git a/test/unit/getChildSchemaSelection.test.ts b/test/unit/getChildSchemaSelection.test.ts
@@ -70,6 +70,43 @@ describe("getChildSchemaSelection", () => {
     });
 
     describe("additionalItems", () => {
+        it("should return empty list if additionalItems is false", () => {
+            draft.setSchema({
+                type: "array",
+                items: [{ type: "string" }],
+                additionalItems: false
+            });
+
+            const result = getChildSchemaSelection(draft, 1, draft.getSchema());
+
+            expect(result).to.have.length(0);
+        });
+
+        it("should return empty list if additionalItems is undefined", () => {
+            draft.setSchema({
+                type: "array",
+                items: [{ type: "string" }],
+                additionalItems: undefined
+            });
+
+            const result = getChildSchemaSelection(draft, 1, draft.getSchema());
+
+            expect(result).to.have.length(0);
+        });
+
+        it("should return string-schema if additionalItems is true", () => {
+            draft.setSchema({
+                type: "array",
+                items: [{ type: "string" }],
+                additionalItems: true
+            });
+
+            const result = getChildSchemaSelection(draft, 1, draft.getSchema());
+
+            expect(result).to.have.length(1);
+            expect(result).to.deep.eq([{ type: "string" }]);
+        });
+
         it("should return additionalItem schema", () => {
             draft.setSchema({
                 type: "array",