Added missing common/info.yaml / common/info.json

... also added the `info` property to cohorts & genomicVariations, for consistency. Referencing #199

Note: the info.yaml file was added previously but probably got lost in some branch shuffling...

framework/json/configuration/entryTypeDefinition.json

@@ -8,10 +8,10 @@
         },
         "aCollectionOf": {
             "description": "If the entry type is a collection of other entry types, (e.g. a Dataset is a collection of Records), then this attribute must list the entry types that could be included. One collection type could be defined as included more than one entry type (e.g. a Dataset could include Individuals or Genomic Variants), in such cases the entries are alternative, meaning that a given instance of this entry type could be of only one of the types (e.g. a given Dataset contains Individuals, while another Dataset could contain Genomic Variants, but not both at once).",
-            "type": "array",
             "items": {
                 "$ref": "../common/basicElement.json"
-            }
+            },
+            "type": "array"
         },
         "additionallySupportedSchemas": {
             "description": "List of additional schemas that could be used for this concept in this instance of Beacon.",
@@ -71,4 +71,4 @@
     ],
     "title": "",
     "type": "object"
-}
+}

models/json/beacon-v2-default-model/cohorts/defaultSchema.json

@@ -273,6 +273,9 @@
             "description": "Inclusion criteria used for defining the cohort. It is assumed that all cohort participants will match such criteria.",
             "type": "object"
         },
+        "info": {
+            "$ref": "../common/info.json"
+        },
         "name": {
             "description": "Name of the cohort. For `user-defined` this field could be generated upon the query, e.g. a value that is a concatenationor some representation of the user query.",
             "examples": [

models/json/beacon-v2-default-model/common/info.json

@@ -0,0 +1,6 @@
+{
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "description": "Placeholder to allow the Beacon models to return additional information. It is recommended to encapsulate additional informations in this attribute instead of directly adding attributes at the schema's root level in order to avoid collision in the names of attributes in future versions of the specification.",
+    "title": "Info",
+    "type": "object"
+}

models/json/beacon-v2-default-model/genomicVariations/defaultSchema.json

@@ -540,6 +540,9 @@
         "identifiers": {
             "$ref": "#/$defs/Identifiers"
         },
+        "info": {
+            "$ref": "../common/info.json"
+        },
         "molecularAttributes": {
             "$ref": "#/$defs/MolecularAttributes"
         },

models/src/beacon-v2-default-model/biosamples/defaultSchema.yaml

@@ -161,6 +161,7 @@ properties:
     example: {}
   info:
     $ref: ../common/info.yaml
+
 required:
   - id
   - biosampleStatus

models/src/beacon-v2-default-model/cohorts/defaultSchema.yaml

@@ -75,6 +75,9 @@ properties:
     type: array
     items:
       $ref: '#/$defs/CollectionEvent'
+  info:
+    $ref: ../common/info.yaml
+
 $defs:
   CollectionEvent:
     description: TBD

models/src/beacon-v2-default-model/common/info.yaml

@@ -0,0 +1,9 @@
+$schema: https://json-schema.org/draft/2020-12/schema
+title: Info
+description: >-
+  Placeholder to allow the Beacon models to return additional information.
+  It is recommended to encapsulate additional informations in this attribute
+  instead of directly adding attributes at the schema's root level in
+  order to avoid collision in the names of attributes in future versions of
+  the specification.
+type: object

models/src/beacon-v2-default-model/datasets/defaultSchema.yaml

@@ -39,11 +39,12 @@ properties:
       3986 format).
     examples:
       - https://example.org/wiki/Main_Page
-  info:
-    $ref: ../common/info.yaml
   dataUseConditions:
     description: Data use conditions applying to this dataset.
     $ref: ../common/dataUseConditions.yaml
+  info:
+    $ref: ../common/info.yaml
+
 required:
   - id
   - name

models/src/beacon-v2-default-model/genomicVariations/defaultSchema.yaml

@@ -42,6 +42,9 @@ properties:
     type: array
     items:
       $ref: '#/$defs/FrequencyInPopulations'
+  info:
+    $ref: ../common/info.yaml
+
 $defs:
   LegacyVariation:
     type: object