restrict arrays as well

dylibso · Oct 29, 2024 · 40082b9 · 40082b9
1 parent 000bc0d
commit 40082b9
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/src/parser.ts b/src/parser.ts
@@ -122,7 +122,20 @@ class V1Validator {
     }
 
 
-    if (prop.items) this.validateTypedInterface(prop.items)
+    if (prop.items) {
+      this.validateTypedInterface(prop.items)
+
+      // here we are adding some extra constraints on the value type
+      // we can relax these later when we can ensure we can cast these properly
+      this.location.push('items')
+      if (prop.items.items) {
+        this.recordError("Arrays are currently not supported as element types of arrays")
+      }
+      if (prop.items.additionalProperties) {
+        this.recordError("Maps are currently not supported as element types of arrays")
+      }
+      this.location.pop()
+    }
 
     if (prop.additionalProperties) {
       this.validateTypedInterface(prop.additionalProperties)
@@ -131,12 +144,11 @@ class V1Validator {
       // we can relax these later when we can ensure we can cast these properly
       this.location.push('additionalProperties')
       if (prop.additionalProperties.items) {
-        this.recordError("Arrays are currently not supported for value types of maps")
+        this.recordError("Arrays are currently not supported as value types of maps")
       }
       if (prop.additionalProperties.additionalProperties) {
-        this.recordError("Maps are currently not supported for value types of maps")
+        this.recordError("Maps are currently not supported as value types of maps")
       }
-
       this.location.pop()
     }
   }

diff --git a/tests/parser.test.ts b/tests/parser.test.ts
@@ -17,6 +17,7 @@ test("parse-invalid-v1-document", () => {
   expect(errors).toBeInstanceOf(Array)
 
   const paths = errors!.map(e => e.path)
+  //console.log(JSON.stringify(errors!, null, 4))
   expect(paths).toStrictEqual([
     "#/exports/invalidFunc1/input",
     "#/exports/invalidFunc1/output",
@@ -27,6 +28,7 @@ test("parse-invalid-v1-document", () => {
     "#/components/schemas/ComplexObject/properties/aMapOfMapsOfNullableDateArrays/additionalProperties",
     "#/components/schemas/ComplexObject/properties/aMapOfMapsOfNullableDateArrays/additionalProperties",
     "#/components/schemas/ComplexObject/properties/aMapOfMapsOfNullableDateArrays/additionalProperties/additionalProperties",
+    "#/components/schemas/ComplexObject/properties/anArrayOfMaps/items",
   ])
 })
 

diff --git a/tests/schemas/v1-invalid-doc.yaml b/tests/schemas/v1-invalid-doc.yaml
@@ -47,4 +47,10 @@ components:
                 nullable: true
                 type: string
                 format: date-time
+        anArrayOfMaps:
+          description: an illegal array of maps
+          items:
+            additionalProperties:
+              type: string
+              format: date-time