fix: improve generation of jsonld

Gulpfile.js

@@ -74,14 +74,17 @@ function jsonld() {
                 '@id': cid
               }
             }
+          } else {
+            console.error(`Warning: @id is not defined at the top level in ${file.path}`)
           }
 
           // Create a [`Property`](https://meta.schema.org/Property)
           // TODO: Implement schema:rangeIncludes property - requires the
           // resolving `$refs`. See https://github.com/epoberezkin/ajv/issues/125#issuecomment-408960384
           // for an approach to that.
-          if (schema.properties) {
-            for (let [name, property] of Object.entries(schema.properties)) {
+          const typeProperties = schema.properties || (schema.allOf && schema.allOf[1] && schema.allOf[1].properties)
+          if (typeProperties) {
+            for (let [name, property] of Object.entries(typeProperties)) {
               const pid = property['@id']
               if (!pid) continue
               if (pid.startsWith('stencila:')) {
@@ -94,6 +97,9 @@ function jsonld() {
                     'schema:domainIncludes': [{ '@id': cid }]
                   }
                 } else {
+                  if (properties[name]['@id'] !== pid) {
+                    throw new Error(`Property "${name}" has more than one @id "${properties[name]['@id']}" and "${pid}"`)
+                  }
                   properties[name]['schema:domainIncludes'].push({ '@id': cid })
                 }
               } else {

schema/Document.schema.yaml

@@ -1,6 +1,7 @@
 $schema: http://json-schema.org/draft-07/schema#
 $id: https://stencila.github.com/schema/Document.schema.json
 title: Document
+'@id': stencila:Document
 description: |
   An executable document.
 allOf:

schema/Environment.schema.yaml

@@ -1,6 +1,7 @@
 $schema: https://json-schema.org/draft-07/schema
 $id: https://stencila.github.com/schema/Environment.schema.json
 title: Environment
+'@id': stencila:Environment
 description: A computational environment.
 properties:
   type:

schema/Include.schema.yaml

@@ -1,6 +1,7 @@
 $schema: http://json-schema.org/draft-07/schema#
 $id: https://stencila.github.com/schema/Include.schema.json
 title: Include
+'@id': stencila:Include
 description: |
   A directive to include content from an external source (e.g. file, URL) or content.
 type: object

schema/Sheet.schema.yaml

@@ -1,6 +1,7 @@
 $schema: http://json-schema.org/draft-07/schema#
 $id: https://stencila.github.com/schema/Sheet.schema.json
 title: Sheet
+'@id': stencila:Sheet
 description: |
   A sheet within an executable document.
 allOf:

schema/Table.schema.yaml

@@ -1,19 +1,15 @@
 $schema: http://json-schema.org/draft-07/schema#
 $id: https://stencila.github.com/schema/Table.schema.json
 title: Table
+'@id': stencila:Table
 description: |
   A table within an executable document.
 type: object
 properties:
-  type:
-    description: The type of node.
-    type: string
-    const: Table
-  value:
+  cells:
     '@id': stencila:cells
     description: |
       An array of cells in the table.
     type: array
     items:
       $ref: TableCell.schema.yaml
-additionalProperties: false

schema/TableCell.schema.yaml

@@ -1,6 +1,7 @@
 $schema: http://json-schema.org/draft-07/schema#
 $id: https://stencila.github.com/schema/TableCell.schema.json
 title: TableCell
+'@id': stencila:TableCell
 description: |
   A cell within a `Table`.
 type: object

schema/Text.schema.yaml

@@ -1,6 +1,7 @@
 $schema: http://json-schema.org/draft-07/schema#
 $id: https://stencila.github.com/schema/Text.schema.json
 title: Text
+'@id': stencila:Text
 description: Some text
 type: object
 properties: