From 0587e0c84e09f1ea6398b24709c3dd2d46f66b46 Mon Sep 17 00:00:00 2001 From: Lawrence Babb Date: Thu, 31 Oct 2024 08:37:54 -0400 Subject: [PATCH] added Element PR from gks-core to add Extensions --- docs/source/concepts/AdditionalDataTypes/Code.rst | 2 +- docs/source/concepts/AdditionalDataTypes/Coding.rst | 2 +- docs/source/concepts/AdditionalDataTypes/Entity.rst | 2 +- docs/source/concepts/AdditionalDataTypes/Extension.rst | 2 +- docs/source/concepts/AdditionalDataTypes/IRI.rst | 2 +- docs/source/def/gks-core | 1 + docs/source/def/gks.common/core-im | 1 - docs/source/def/gks.common/data-types | 1 - schema/vrs/def/Expression.rst | 4 ++++ schema/vrs/json/Expression | 9 +++++++++ schema/vrs/vrs-source.yaml | 1 - submodules/gks-core | 2 +- 12 files changed, 20 insertions(+), 9 deletions(-) create mode 120000 docs/source/def/gks-core delete mode 120000 docs/source/def/gks.common/core-im delete mode 120000 docs/source/def/gks.common/data-types diff --git a/docs/source/concepts/AdditionalDataTypes/Code.rst b/docs/source/concepts/AdditionalDataTypes/Code.rst index d0ac5a1d..73cbe548 100644 --- a/docs/source/concepts/AdditionalDataTypes/Code.rst +++ b/docs/source/concepts/AdditionalDataTypes/Code.rst @@ -3,4 +3,4 @@ Code !!!! -.. include:: ../../def/gks.common/core-im/Code.rst \ No newline at end of file +.. include:: ../../def/gks-core/Code.rst \ No newline at end of file diff --git a/docs/source/concepts/AdditionalDataTypes/Coding.rst b/docs/source/concepts/AdditionalDataTypes/Coding.rst index 8e1b73d4..15a24769 100644 --- a/docs/source/concepts/AdditionalDataTypes/Coding.rst +++ b/docs/source/concepts/AdditionalDataTypes/Coding.rst @@ -3,4 +3,4 @@ Coding !!!!!! -.. include:: ../../def/gks.common/core-im/Coding.rst \ No newline at end of file +.. include:: ../../def/gks-core/Coding.rst \ No newline at end of file diff --git a/docs/source/concepts/AdditionalDataTypes/Entity.rst b/docs/source/concepts/AdditionalDataTypes/Entity.rst index d448ad58..3fdf9e8f 100644 --- a/docs/source/concepts/AdditionalDataTypes/Entity.rst +++ b/docs/source/concepts/AdditionalDataTypes/Entity.rst @@ -3,4 +3,4 @@ Entity !!!!!! -.. include:: ../../def/gks.common/core-im/Entity.rst \ No newline at end of file +.. include:: ../../def/gks-core/Entity.rst \ No newline at end of file diff --git a/docs/source/concepts/AdditionalDataTypes/Extension.rst b/docs/source/concepts/AdditionalDataTypes/Extension.rst index e409351b..d6ab7a09 100644 --- a/docs/source/concepts/AdditionalDataTypes/Extension.rst +++ b/docs/source/concepts/AdditionalDataTypes/Extension.rst @@ -3,4 +3,4 @@ Extension !!!!!!!!! -.. include:: ../../def/gks.common/core-im/Extension.rst \ No newline at end of file +.. include:: ../../def/gks-core/Extension.rst \ No newline at end of file diff --git a/docs/source/concepts/AdditionalDataTypes/IRI.rst b/docs/source/concepts/AdditionalDataTypes/IRI.rst index 204704b7..241ff898 100644 --- a/docs/source/concepts/AdditionalDataTypes/IRI.rst +++ b/docs/source/concepts/AdditionalDataTypes/IRI.rst @@ -3,4 +3,4 @@ IRI !!! -.. include:: ../../def/gks.common/core-im/IRI.rst \ No newline at end of file +.. include:: ../../def/gks-core/IRI.rst \ No newline at end of file diff --git a/docs/source/def/gks-core b/docs/source/def/gks-core new file mode 120000 index 00000000..cce93bd3 --- /dev/null +++ b/docs/source/def/gks-core @@ -0,0 +1 @@ +../../../schema/gks-core/def \ No newline at end of file diff --git a/docs/source/def/gks.common/core-im b/docs/source/def/gks.common/core-im deleted file mode 120000 index f247edb1..00000000 --- a/docs/source/def/gks.common/core-im +++ /dev/null @@ -1 +0,0 @@ -../../../../schema/core-im/def \ No newline at end of file diff --git a/docs/source/def/gks.common/data-types b/docs/source/def/gks.common/data-types deleted file mode 120000 index 8552583e..00000000 --- a/docs/source/def/gks.common/data-types +++ /dev/null @@ -1 +0,0 @@ -../../../../schema/data-types/def \ No newline at end of file diff --git a/schema/vrs/def/Expression.rst b/schema/vrs/def/Expression.rst index 07688266..da11129c 100644 --- a/schema/vrs/def/Expression.rst +++ b/schema/vrs/def/Expression.rst @@ -25,6 +25,10 @@ Some Expression attributes are inherited from :ref:`gks-core:Element`. - string - 0..1 - The 'logical' identifier of the data element in the system of record, e.g. a UUID. This 'id' is unique within a given system, but may or may not be globally unique outside the system. It is used within a system to reference an object from another. + * - extensions + - :ref:`Extension` + - 0..m + - A list of extensions to the Entity, that allow for capture of information not directly supported by elements defined in the model. * - syntax - string - 1..1 diff --git a/schema/vrs/json/Expression b/schema/vrs/json/Expression index c4598fa3..f30b7664 100644 --- a/schema/vrs/json/Expression +++ b/schema/vrs/json/Expression @@ -10,6 +10,15 @@ "type": "string", "description": "The 'logical' identifier of the data element in the system of record, e.g. a UUID. This 'id' is unique within a given system, but may or may not be globally unique outside the system. It is used within a system to reference an object from another." }, + "extensions": { + "type": "array", + "ordered": false, + "items": { + "$ref": "/ga4gh/schema/gks-core/1.x/json/Extension" + }, + "description": "A list of extensions to the Entity, that allow for capture of information not directly supported by elements defined in the model.", + "$comment": "Extension objects have a key-value data structure that allows definition of custom fields in the data itself. Extensions are not expected to be natively understood, but may be used for pre-negotiated exchange of message attributes between systems." + }, "syntax": { "type": "string", "enum": [ diff --git a/schema/vrs/vrs-source.yaml b/schema/vrs/vrs-source.yaml index f9d9cac4..8e2b4a49 100644 --- a/schema/vrs/vrs-source.yaml +++ b/schema/vrs/vrs-source.yaml @@ -456,7 +456,6 @@ $defs: # Numerics, Comparators, and Ranges Range: - inherits: gks-core:Element maturity: trial use description: An inclusive range of values bounded by one or more integers. type: array diff --git a/submodules/gks-core b/submodules/gks-core index a9565e00..98aee8f8 160000 --- a/submodules/gks-core +++ b/submodules/gks-core @@ -1 +1 @@ -Subproject commit a9565e00ff8885ba42378ee21373469375035862 +Subproject commit 98aee8f8386899336838876c1b4661297bfea171