fix(InlineContent): Remove Array and Object from InlineContent

See stencila/schema#274 (review)
stencila · Jun 20, 2021 · a844439 · a844439
1 parent e955f27
commit a844439
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 12 deletions.
diff --git a/python/stencila/schema/types.py b/python/stencila/schema/types.py
@@ -4391,7 +4391,7 @@ class CitationIntentEnumeration(Enum):
 """
 Union type for valid inline content.
 """
-InlineContent = Union["AudioObject", "Cite", "CiteGroup", "CodeExpression", "CodeFragment", "Delete", "Emphasis", "ImageObject", "Link", "MathFragment", "NontextualAnnotation", "Note", "Quote", "Strong", "Subscript", "Superscript", "VideoObject", None, bool, int, float, Array["InlineContent"], Dict[str, Any], str]
+InlineContent = Union["AudioObject", "Cite", "CiteGroup", "CodeExpression", "CodeFragment", "Delete", "Emphasis", "ImageObject", "Link", "MathFragment", "NontextualAnnotation", "Note", "Quote", "Strong", "Subscript", "Superscript", "VideoObject", None, bool, int, float, 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, NontextualAnnotation, Note, Quote, Strong, Subscript, Superscript, VideoObject, "NULL", "logical", "numeric", Array(InlineContent), "list", "character")
+InlineContent <- Union(AudioObject, Cite, CiteGroup, CodeExpression, CodeFragment, Delete, Emphasis, ImageObject, Link, MathFragment, NontextualAnnotation, Note, Quote, Strong, Subscript, Superscript, VideoObject, "NULL", "logical", "numeric", "character")
 
 
 #' All type schemas that are derived from Mark

diff --git a/rust/src/types.rs b/rust/src/types.rs
@@ -5364,8 +5364,6 @@ pub enum InlineContent {
     Boolean(Boolean),
     Integer(Integer),
     Number(Number),
-    Vec<InlineContent>(Vec<InlineContent>),
-    Object(Object),
     String(String),
 }
 
@@ -5494,7 +5492,7 @@ pub enum Node {
     Number(Number),
     String(String),
     Object(Object),
-    Vec<Node>(Vec<Node>),
+    Array(Vec<Node>),
 }
 
 /// All type schemas that are derived from Thing

diff --git a/schema/InlineContent.schema.yaml b/schema/InlineContent.schema.yaml
@@ -30,8 +30,4 @@ anyOf:
   - type: boolean
   - type: integer
   - type: number
-  - type: array
-    items:
-      $ref: InlineContent
-  - type: object
   - type: string
diff --git a/ts/bindings/rust.ts b/ts/bindings/rust.ts
@@ -334,7 +334,7 @@ export function unionSchemaToEnum(
       ) {
         return `    ${type}(${type}Simple),\n`
       }
-      let name = type === 'Vec<Node>' ? 'Array' : type
+      const name = type === 'Vec<Node>' ? 'Array' : type
       return `    ${name}(${type}),\n`
     })
     .join('')

diff --git a/ts/types.ts b/ts/types.ts
@@ -2116,8 +2116,6 @@ export type InlineContent =
   | null
   | boolean
   | number
-  | Array<InlineContent>
-  | Object
   | string
 
 /**