fix(InlineContent): Add array and object to valid inline content

stencila · Jun 2, 2021 · 7483e80 · 7483e80
1 parent cfcb195
commit 7483e80
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/python/stencila/schema/types.py b/python/stencila/schema/types.py
@@ -4390,7 +4390,7 @@ class CitationIntentEnumeration(Enum):
 """
 Union type for valid inline content.
 """
-InlineContent = Union["AudioObject", "Cite", "CiteGroup", "CodeExpression", "CodeFragment", "Delete", "Emphasis", "ImageObject", "Link", "MathFragment", "MediaObject", "NontextualAnnotation", "Note", "Quote", "Strong", "Subscript", "Superscript", "VideoObject", None, bool, int, float, str]
+InlineContent = Union["AudioObject", "Cite", "CiteGroup", "CodeExpression", "CodeFragment", "Delete", "Emphasis", "ImageObject", "Link", "MathFragment", "MediaObject", "NontextualAnnotation", "Note", "Quote", "Strong", "Subscript", "Superscript", "VideoObject", None, bool, int, float, Array[Any], Dict[str, Any], str]
 
 
 """

diff --git a/r/R/types.R b/r/R/types.R
@@ -4484,7 +4484,7 @@ GrantTypes <- Union(Grant, MonetaryGrant)
 #'
 #' @return A `list` of class `Union` describing valid subtypes of this type
 #' @export
-InlineContent <- Union(AudioObject, Cite, CiteGroup, CodeExpression, CodeFragment, Delete, Emphasis, ImageObject, Link, MathFragment, MediaObject, NontextualAnnotation, Note, Quote, Strong, Subscript, Superscript, VideoObject, "NULL", "logical", "numeric", "character")
+InlineContent <- Union(AudioObject, Cite, CiteGroup, CodeExpression, CodeFragment, Delete, Emphasis, ImageObject, Link, MathFragment, MediaObject, NontextualAnnotation, Note, Quote, Strong, Subscript, Superscript, VideoObject, "NULL", "logical", "numeric", Array(Any()), "list", "character")
 
 
 #' All type schemas that are derived from Mark

diff --git a/rust/src/types.rs b/rust/src/types.rs
@@ -4908,6 +4908,8 @@ pub enum InlineContent {
     Bool(Bool),
     Integer(Integer),
     Number(Number),
+    Array(Array),
+    Object(Object),
     String(String),
 }
 

diff --git a/schema/InlineContent.schema.yaml b/schema/InlineContent.schema.yaml
@@ -34,4 +34,6 @@ anyOf:
   - type: boolean
   - type: integer
   - type: number
+  - type: array
+  - type: object
   - type: string
diff --git a/ts/bindings/typescript.ts b/ts/bindings/typescript.ts
@@ -313,7 +313,7 @@ export const generateTypeMaps = async (): Promise<string> => {
     T extends { type: string } & object = { type: string }
   > = { [key in T['type']]: key }
 
-  type Primitives = undefined | null | boolean | string | number;
+  type Primitives = undefined | null | boolean | number | string | object;
   ` +
     files
       .map((file) => {