toJsonSchema: Only disallow additionalProperties for strictObject

`additionalProperties: true` was preventing validation of valid intersected objects. Fixes fabian-hiller#990. Signed-off-by: Anders Kaseorg <[email protected]>
andersk · Dec 27, 2024 · b136f40 · b136f40
1 parent 882f5f1
commit b136f40
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/packages/to-json-schema/src/convertSchema.test.ts b/packages/to-json-schema/src/convertSchema.test.ts
@@ -221,7 +221,6 @@ describe('convertSchema', () => {
           key4: { anyOf: [{ type: 'number' }, { type: 'null' }] },
         },
         required: ['key1', 'key3'],
-        additionalProperties: false,
       });
     });
 
@@ -669,7 +668,6 @@ describe('convertSchema', () => {
               foo: { type: 'string' },
             },
             required: ['type', 'foo'],
-            additionalProperties: false,
           },
           {
             type: 'object',
@@ -678,7 +676,6 @@ describe('convertSchema', () => {
               bar: { type: 'number' },
             },
             required: ['type', 'bar'],
-            additionalProperties: false,
           },
         ],
       });
@@ -703,15 +700,13 @@ describe('convertSchema', () => {
               foo: { type: 'string' },
             },
             required: ['foo'],
-            additionalProperties: false,
           },
           {
             type: 'object',
             properties: {
               bar: { type: 'number' },
             },
             required: ['bar'],
-            additionalProperties: false,
           },
         ],
       });
@@ -772,15 +767,13 @@ describe('convertSchema', () => {
         type: 'object',
         properties: { node: { $ref: '#/$defs/1' } },
         required: [],
-        additionalProperties: false,
       });
       expect(context).toStrictEqual({
         definitions: {
           '1': {
             type: 'object',
             properties: { node: { $ref: '#/$defs/1' } },
             required: [],
-            additionalProperties: false,
           },
         },
         referenceMap: new Map().set(nodeSchema, '1'),
@@ -807,7 +800,6 @@ describe('convertSchema', () => {
         type: 'object',
         properties: { node: { $ref: '#/$defs/2' } },
         required: ['node'],
-        additionalProperties: false,
       });
       expect(context).toStrictEqual({
         definitions: {
@@ -817,7 +809,6 @@ describe('convertSchema', () => {
                 type: 'object',
                 properties: { node: { $ref: '#/$defs/2' } },
                 required: ['node'],
-                additionalProperties: false,
               },
               { type: 'null' },
             ],

diff --git a/packages/to-json-schema/src/convertSchema.ts b/packages/to-json-schema/src/convertSchema.ts
@@ -267,8 +267,11 @@ export function convertSchema(
           config,
           context
         );
-      } else {
-        jsonSchema.additionalProperties = valibotSchema.type === 'loose_object';
+      } else if (valibotSchema.type === 'loose_object') {
+        // `true` has no validation effect, but might as well be explicit
+        jsonSchema.additionalProperties = true;
+      } else if (valibotSchema.type === 'strict_object') {
+        jsonSchema.additionalProperties = false;
       }
 
       break;

diff --git a/packages/to-json-schema/src/toJsonSchema.test.ts b/packages/to-json-schema/src/toJsonSchema.test.ts
@@ -40,7 +40,6 @@ describe('toJsonSchema', () => {
               age: { type: 'number' },
             },
             required: ['name', 'email'],
-            additionalProperties: false,
             description: 'foo',
           },
         },
@@ -65,7 +64,6 @@ describe('toJsonSchema', () => {
         $ref: '#/$defs/ul',
         $defs: {
           ul: {
-            additionalProperties: false,
             properties: {
               children: {
                 items: { $ref: '#/$defs/li' },
@@ -77,7 +75,6 @@ describe('toJsonSchema', () => {
             type: 'object',
           },
           li: {
-            additionalProperties: false,
             properties: {
               children: {
                 items: {