fix(Review, Comment): Move comments to CreativeWork

schema/Comment.schema.yaml

@@ -1,23 +1,18 @@
 title: Comment
 '@id': schema:Comment
 extends: CreativeWork
-role: primary
+role: secondary
 status: stable
 category: metadata
 description: A comment on an item, e.g on a Article, or SoftwareSourceCode.
 $comment: |
   Use the `about` property to define the item that a comment is on.
   The `content` property should be used for the structured content of the
-  Comment, in preference to the schema.org `text` property which is is expected to
-  have the plain text content.
+  comment, in preference to the schema.org `text` property (which is expected to
+  be plain text). Replies to a comment can be added to its `comments` property
+  or have their `parentItem` set to the parent comment.
 properties:
   parentItem:
     '@id': schema:parentItem
-    description: The parent Comment of this Comment.
+    description: The parent comment of this comment.
     $ref: Comment
-  replies:
-    '@id': stencila:replies
-    description: Comments made in reply to this comment. The inverse of parentItem.
-    type: array
-    items:
-      $ref: Comment

schema/CreativeWork.schema.yaml

@@ -31,6 +31,12 @@ properties:
           anyOf:
             - $ref: Person
             - $ref: Organization
+  comments:
+    '@id': schema:comment
+    description: Comments about this creative work.
+    type: array
+    items:
+      $ref: Comment
   content:
     # We have added "content" because the existing schema.org property "text" implies
     # only unstructured text content.

schema/Review.schema.yaml

@@ -1,14 +1,14 @@
 title: Review
 '@id': schema:Review
 extends: CreativeWork
-role: primary
+role: secondary
 status: stable
 category: metadata
 description: A review of an item, e.g of an Article, or SoftwareSourceCode.
 $comment: |
   Use the `content` property for the structured content of the review in
-  preference to the schema.org `text` or `reviewBody` properties which
-  have plain text as the expected type of this property.
+  preference to the schema.org `text` or `reviewBody` properties (which
+  have plain text as the expected type).
 properties:
   itemReviewed:
     '@id': schema:itemReviewed
@@ -17,14 +17,4 @@ properties:
   reviewAspect:
     '@id': schema:reviewAspect
     description: The part or facet of the item that is being reviewed.
-    anyOf:
-      - type: integer
-      - type: string
-  comments:
-    '@id': stencila:comments
-    description: Comments, usually on specific parts of the item reviewed, that form part of the review.
-    $comment: |
-      This is a custom property which allows us to associate Comments with a review.
-    type: array
-    items:
-      $ref: Comment
+    type: string