Fix validation of object with additional properties

Author: SamyPesse

src/compileValueSchema.ts

@@ -372,7 +372,7 @@ function compileObjectSchema(compiler: Compiler, schema: OpenAPIObjectSchema) {
         });
 
         // No additional properties are allowed
-        if (!schema.additionalProperties && schema.properties) {
+        if (schema.additionalProperties === false) {
             nodes.push(
                 builders.ifStatement(
                     builders.binaryExpression(
@@ -381,7 +381,7 @@ function compileObjectSchema(compiler: Compiler, schema: OpenAPIObjectSchema) {
                         builders.literal(0),
                     ),
                     builders.blockStatement([
-                        builders.returnStatement(error(`unexpected properties`)),
+                        builders.returnStatement(error(`unexpected additional properties`)),
                     ]),
                 ),
             );

src/tests/__snapshots__/compileValueSchema.test.ts.snap

@@ -298,9 +298,6 @@ function obj0(path, value, context) {
         value['bar'] = result1;
         keys.delete('bar');
     }
-    if (keys.size > 0) {
-        return new ValidationError(path, 'unexpected properties');
-    }
     return value;
 }"
 `;
@@ -358,9 +355,6 @@ function obj0(path, value, context) {
     } else {
         value['foo'] = 10;
     }
-    if (keys.size > 0) {
-        return new ValidationError(path, 'unexpected properties');
-    }
     return value;
 }"
 `;
@@ -851,9 +845,6 @@ function obj1(path, value, context) {
         value['a'] = result0;
         keys.delete('a');
     }
-    if (keys.size > 0) {
-        return new ValidationError(path, 'unexpected properties');
-    }
     return value;
 }
 function obj4(path, value, context) {
@@ -879,9 +870,6 @@ function obj3(path, value, context) {
         value['b'] = result0;
         keys.delete('b');
     }
-    if (keys.size > 0) {
-        return new ValidationError(path, 'unexpected properties');
-    }
     return value;
 }
 function obj0(path, value, context) {

src/tests/__snapshots__/compiler.test.ts.snap

@@ -69,9 +69,6 @@ function obj1(path, value, context) {
         value['bar'] = result1;
         keys.delete('bar');
     }
-    if (keys.size > 0) {
-        return new ValidationError(path, 'unexpected properties');
-    }
     return value;
 }"
 `;
@@ -157,9 +154,6 @@ function obj1(path, value, context) {
         value['rec'] = result2;
         keys.delete('rec');
     }
-    if (keys.size > 0) {
-        return new ValidationError(path, 'unexpected properties');
-    }
     return value;
 }"
 `;

tests/gitbook.test.ts

@@ -65,10 +65,41 @@ test('POST orgs/appleId/custom-fields', () => {
         query: {},
         body: undefined,
     });
-    console.log(result);
     expect(result).toMatchObject({
         params: {
             organizationId: 'appleId',
         },
     });
 });
+
+test('PUT orgs/apple/schemas/newType', () => {
+    const result = validateRequest({
+        path: '/orgs/apple/schemas/newType',
+        method: 'put',
+        headers: {
+            'content-type': 'application/json',
+        },
+        query: {},
+        body: {
+            type: 'newType',
+            title: {
+                singular: 'New type',
+                plural: 'New types',
+            },
+            properties: [
+                {
+                    name: 'title',
+                    type: 'text',
+                    title: 'Title',
+                },
+            ],
+        },
+    });
+    expect(result).toMatchObject({
+        operationId: 'setEntitySchema',
+        params: {
+            organizationId: 'apple',
+            entityType: 'newType',
+        },
+    });
+});