Add validation for mixing fixed and additionalProps

src/parser.ts

@@ -80,7 +80,7 @@ class V1Validator {
       /^#\/exports$/, // allow defining exports named `type` or `format`
       /^#\/imports$/ // allow defining imports named `type` or `format`
     ]
-    
+
     const shouldValidate = skipPatterns.none(pattern => pattern.test(currentPath))
     if (shouldValidate) {
       this.validateTypedInterface(node)
@@ -137,6 +137,13 @@ class V1Validator {
       }
     }
 
+    // TODO consider adding properties to XtpTyped when we support inlining objects
+    if ('properties' in prop && Object.keys(prop.properties!).length > 0) {
+      if (prop.additionalProperties) {
+        this.recordError('We currently do not support objects with both fixed properties and additionalProperties')
+      }
+    }
+
     if (prop.items) this.validateTypedInterface(prop.items)
     if (prop.additionalProperties) this.validateTypedInterface(prop.additionalProperties)
   }

tests/index.test.ts

@@ -215,6 +215,23 @@ test('parse-v1-invalid-identifiers-doc', () => {
   }
 })
 
+test('parse-v1-additional-props-doc', () => {
+  const invalidV1Doc: any = yaml.load(fs.readFileSync('./tests/schemas/v1-invalid-additional-properties.yaml', 'utf8'))
+  try {
+    parse(JSON.stringify(invalidV1Doc))
+    expect(true).toBe('should have thrown')
+  } catch (e) {
+    const expectedErrors = [
+      {
+        message: 'We currently do not support objects with both fixed properties and additionalProperties',
+        path: '#/components/schemas/MixedObject'
+      },
+    ]
+
+    expectErrors(e, expectedErrors)
+  }
+})
+
 function expectErrors(e: any, expectedErrors: ValidationError[]) {
   if (e instanceof NormalizeError) {
     const sortByPath = (a: ValidationError, b: ValidationError) => a.path.localeCompare(b.path);

tests/schemas/v1-invalid-additional-properties.yaml

@@ -0,0 +1,14 @@
+---
+version: v1-draft
+exports:
+  hello: {}
+components:
+  schemas:
+    MixedObject:
+      description: should not allow mixing fixed and additional props for now
+      properties:
+        hello:
+          type: string
+      additionalProperties:
+        type: string
+