fix: put properties in alphbetical order; other improvements

stencila · Mar 26, 2019 · 0342ec7 · 0342ec7
1 parent 6f0093a
commit 0342ec7
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 23 deletions.
diff --git a/schema/Person.schema.yaml b/schema/Person.schema.yaml
@@ -6,22 +6,6 @@ description: A person (alive, dead, undead, or fictional). https://schema.org/Pe
 allOf:
   - $ref: Thing.schema.yaml
   - properties:
-      emails:
-        '@id': schema:email
-        type: array
-        items:
-          type: string
-          format: email
-      familyNames:
-        '@id': schema:familyName
-        type: array
-        items:
-          type: string
-      givenNames:
-        '@id': schema:givenName
-        type: array
-        items:
-          type: string
       affiliations:
         '@id': schema:affiliation
         type: array
@@ -37,13 +21,29 @@ allOf:
         type: object
         items:
           $ref: ContactPoint.schema.yaml
+      emails:
+        '@id': schema:email
+        type: array
+        items:
+          type: string
+          format: email
+      familyNames:
+        '@id': schema:familyName
+        type: array
+        items:
+          type: string
       funders:
         '@id': schema:funder
         type: array
         items:
           anyOf:
             - $ref: Organization.schema.yaml
             - $ref: Person.schema.yaml
+      givenNames:
+        '@id': schema:givenName
+        type: array
+        items:
+          type: string
       honorificPrefix:
         '@id': schema:honorificPrefix
         type: string
@@ -58,10 +58,3 @@ allOf:
         type: array
         items:
           - $ref: Organization.schema.yaml
-      owns:
-        '@id': schema:Product
-        type: array
-        items:
-          anyOf:
-            - '@id': schema:Organization
-            - '@id': schema:Person
diff --git a/schema/Product.schema.yaml b/schema/Product.schema.yaml
@@ -2,3 +2,8 @@ $schema: http://json-schema.org/draft-07/schema#
 $id: https://stencila.github.com/schema/Product.schema.json
 title: Product
 '@id': schema:Product
+description: |
+  Any offered product or service. For example: a pair of shoes; a concert ticket; the rental of a car; 
+  a haircut; or an episode of a TV show streamed online. https://schema.org/Product
+allOf:
+  - $ref: Thing.schema.yaml