fix: some erros with types and anyOf

stencila · Mar 25, 2019 · dbebc50 · dbebc50
1 parent 324a63d
commit dbebc50
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 11 deletions.
diff --git a/schema/Brand.schema.yaml b/schema/Brand.schema.yaml
@@ -7,10 +7,11 @@ allOf:
   - $ref: Thing.schema.yaml
   - properties:
       logo:
+        '@id': schema:logo
         type: array
         items:
-          type: 
-             - $ref: url.schema.yaml
+          anyOf:
+             - $ref: URL.schema.yaml
              - $ref: ImageObject.schema.yaml             
       review:
         '@id': schema:review

diff --git a/schema/ContactPoint.schema.yaml b/schema/ContactPoint.schema.yaml
@@ -17,6 +17,7 @@ allOf:
           type: string
           format: email
       telephone:
+         '@id': schema:telephone
          type: string
       productsSupported:
          '@id': schema:productsSupported

diff --git a/schema/Organization.schema.yaml b/schema/Organization.schema.yaml
@@ -11,15 +11,18 @@ allOf:
         type: string
       brand:
         '@id': schema:brand
-        type:
+        type: object
+        items:
            $ref: Brand.schema.yaml
       contactPoint:
          '@id': schema:contactPoint
-         type:
+         type: object
+         items:
             $ref: ContactPoint.schema.yaml
       department:
          '@id': schema:department
-         type:
+         type: object
+         items:
             $ref: Organization.schema.yaml
       email:
          type: string
@@ -28,17 +31,18 @@ allOf:
           '@id': schema:funder
           type: array
           items:
-             - $ref: Organization.schema.yaml
-             - $ref: Person.schema.yaml
+             anyOf:
+                - $ref: Organization.schema.yaml
+                - $ref: Person.schema.yaml
       legalName:
           '@id': schema:legalName
           type: string
       logo:
         '@id': schema:logo
         type: array
         items:
-          type: 
-             - $ref: url.schema.yaml
+          anyOf: 
+             - $ref: URL.schema.yaml
              - $ref: ImageObject.schema.yaml             
       owns:
          '@id': schema:owns

diff --git a/schema/Person.schema.yaml b/schema/Person.schema.yaml
@@ -41,8 +41,9 @@ allOf:
           '@id': schema:funder
           type: array
           items:
-             - $ref: Organization.schema.yaml
-             - $ref: Person.schema.yaml
+             anyOf:
+                - $ref: Organization.schema.yaml
+                - $ref: Person.schema.yaml
       honorificPrefix:
            '@id': schema:honorificPrefix
            type: string