diff --git a/python/stencila/schema/types.py b/python/stencila/schema/types.py index 7745c02bce..405be999cc 100644 --- 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 index 8723db02a4..a72e30c97a 100644 --- 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 index ae2a730320..b8019ada62 100644 --- a/rust/src/types.rs +++ b/rust/src/types.rs @@ -5364,8 +5364,6 @@ pub enum InlineContent { Boolean(Boolean), Integer(Integer), Number(Number), - Vec(Vec), - Object(Object), String(String), } @@ -5494,7 +5492,7 @@ pub enum Node { Number(Number), String(String), Object(Object), - Vec(Vec), + Array(Vec), } /// All type schemas that are derived from Thing diff --git a/schema/InlineContent.schema.yaml b/schema/InlineContent.schema.yaml index cf67805c2a..483d1f3eb0 100644 --- 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 index c06d28e501..9f794ce400 100644 --- 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' ? 'Array' : type + const name = type === 'Vec' ? 'Array' : type return ` ${name}(${type}),\n` }) .join('') diff --git a/ts/types.ts b/ts/types.ts index b52a73ecb5..670b5c82f6 100644 --- a/ts/types.ts +++ b/ts/types.ts @@ -2116,8 +2116,6 @@ export type InlineContent = | null | boolean | number - | Array - | Object | string /**