Skip to content

Commit

Permalink
fix(Thing): IMages property should be an array
Browse files Browse the repository at this point in the history
  • Loading branch information
nokome committed Feb 23, 2020
1 parent fcf99d0 commit 83fe1ba
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 34 deletions.
58 changes: 29 additions & 29 deletions py/stencila/schema/types.py
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ class Thing(Entity):
identifiers: Optional[Array[Union[str, "PropertyValue"]]] = None
"""Any kind of identifier for any kind of Thing."""

images: Optional[Union[str, "ImageObject"]] = None
images: Optional[Array[Union[str, "ImageObject"]]] = None
"""Images of the item."""

name: Optional[str] = None
Expand All @@ -555,7 +555,7 @@ def __init__(
description: Optional[Union[str, Array["Node"]]] = None,
id: Optional[str] = None,
identifiers: Optional[Array[Union[str, "PropertyValue"]]] = None,
images: Optional[Union[str, "ImageObject"]] = None,
images: Optional[Array[Union[str, "ImageObject"]]] = None,
meta: Optional[Dict[str, Any]] = None,
name: Optional[str] = None,
url: Optional[str] = None
Expand Down Expand Up @@ -601,7 +601,7 @@ def __init__(
description: Optional[Union[str, Array["Node"]]] = None,
id: Optional[str] = None,
identifiers: Optional[Array[Union[str, "PropertyValue"]]] = None,
images: Optional[Union[str, "ImageObject"]] = None,
images: Optional[Array[Union[str, "ImageObject"]]] = None,
logo: Optional[Union[str, "ImageObject"]] = None,
meta: Optional[Dict[str, Any]] = None,
reviews: Optional[Array[str]] = None,
Expand Down Expand Up @@ -648,7 +648,7 @@ def __init__(
emails: Optional[Array[str]] = None,
id: Optional[str] = None,
identifiers: Optional[Array[Union[str, "PropertyValue"]]] = None,
images: Optional[Union[str, "ImageObject"]] = None,
images: Optional[Array[Union[str, "ImageObject"]]] = None,
meta: Optional[Dict[str, Any]] = None,
name: Optional[str] = None,
telephoneNumbers: Optional[Array[str]] = None,
Expand Down Expand Up @@ -761,7 +761,7 @@ def __init__(
funders: Optional[Array[Union["Person", "Organization"]]] = None,
id: Optional[str] = None,
identifiers: Optional[Array[Union[str, "PropertyValue"]]] = None,
images: Optional[Union[str, "ImageObject"]] = None,
images: Optional[Array[Union[str, "ImageObject"]]] = None,
isPartOf: Optional["CreativeWorkTypes"] = None,
keywords: Optional[Array[str]] = None,
licenses: Optional[Array[Union[str, "CreativeWorkTypes"]]] = None,
Expand Down Expand Up @@ -844,7 +844,7 @@ def __init__(
funders: Optional[Array[Union["Person", "Organization"]]] = None,
id: Optional[str] = None,
identifiers: Optional[Array[Union[str, "PropertyValue"]]] = None,
images: Optional[Union[str, "ImageObject"]] = None,
images: Optional[Array[Union[str, "ImageObject"]]] = None,
isPartOf: Optional["CreativeWorkTypes"] = None,
keywords: Optional[Array[str]] = None,
licenses: Optional[Array[Union[str, "CreativeWorkTypes"]]] = None,
Expand Down Expand Up @@ -916,7 +916,7 @@ def __init__(
funders: Optional[Array[Union["Person", "Organization"]]] = None,
id: Optional[str] = None,
identifiers: Optional[Array[Union[str, "PropertyValue"]]] = None,
images: Optional[Union[str, "ImageObject"]] = None,
images: Optional[Array[Union[str, "ImageObject"]]] = None,
isPartOf: Optional["CreativeWorkTypes"] = None,
keywords: Optional[Array[str]] = None,
licenses: Optional[Array[Union[str, "CreativeWorkTypes"]]] = None,
Expand Down Expand Up @@ -986,7 +986,7 @@ def __init__(
funders: Optional[Array[Union["Person", "Organization"]]] = None,
id: Optional[str] = None,
identifiers: Optional[Array[Union[str, "PropertyValue"]]] = None,
images: Optional[Union[str, "ImageObject"]] = None,
images: Optional[Array[Union[str, "ImageObject"]]] = None,
isPartOf: Optional["CreativeWorkTypes"] = None,
keywords: Optional[Array[str]] = None,
licenses: Optional[Array[Union[str, "CreativeWorkTypes"]]] = None,
Expand Down Expand Up @@ -1081,7 +1081,7 @@ def __init__(
funders: Optional[Array[Union["Person", "Organization"]]] = None,
id: Optional[str] = None,
identifiers: Optional[Array[Union[str, "PropertyValue"]]] = None,
images: Optional[Union[str, "ImageObject"]] = None,
images: Optional[Array[Union[str, "ImageObject"]]] = None,
isPartOf: Optional["CreativeWorkTypes"] = None,
keywords: Optional[Array[str]] = None,
licenses: Optional[Array[Union[str, "CreativeWorkTypes"]]] = None,
Expand Down Expand Up @@ -1168,7 +1168,7 @@ def __init__(
funders: Optional[Array[Union["Person", "Organization"]]] = None,
id: Optional[str] = None,
identifiers: Optional[Array[Union[str, "PropertyValue"]]] = None,
images: Optional[Union[str, "ImageObject"]] = None,
images: Optional[Array[Union[str, "ImageObject"]]] = None,
isPartOf: Optional["CreativeWorkTypes"] = None,
keywords: Optional[Array[str]] = None,
licenses: Optional[Array[Union[str, "CreativeWorkTypes"]]] = None,
Expand Down Expand Up @@ -1244,7 +1244,7 @@ def __init__(
description: Optional[Union[str, Array["Node"]]] = None,
id: Optional[str] = None,
identifiers: Optional[Array[Union[str, "PropertyValue"]]] = None,
images: Optional[Union[str, "ImageObject"]] = None,
images: Optional[Array[Union[str, "ImageObject"]]] = None,
meta: Optional[Dict[str, Any]] = None,
url: Optional[str] = None,
validator: Optional["ArrayValidator"] = None
Expand Down Expand Up @@ -1318,7 +1318,7 @@ def __init__(
funders: Optional[Array[Union["Person", "Organization"]]] = None,
id: Optional[str] = None,
identifiers: Optional[Array[Union[str, "PropertyValue"]]] = None,
images: Optional[Union[str, "ImageObject"]] = None,
images: Optional[Array[Union[str, "ImageObject"]]] = None,
isPartOf: Optional["CreativeWorkTypes"] = None,
keywords: Optional[Array[str]] = None,
label: Optional[str] = None,
Expand Down Expand Up @@ -1421,7 +1421,7 @@ def __init__(
fundedItems: Optional[Array["Thing"]] = None,
id: Optional[str] = None,
identifiers: Optional[Array[Union[str, "PropertyValue"]]] = None,
images: Optional[Union[str, "ImageObject"]] = None,
images: Optional[Array[Union[str, "ImageObject"]]] = None,
meta: Optional[Dict[str, Any]] = None,
name: Optional[str] = None,
sponsors: Optional[Array[Union["Person", "Organization"]]] = None,
Expand Down Expand Up @@ -1502,7 +1502,7 @@ def __init__(
funders: Optional[Array[Union["Person", "Organization"]]] = None,
id: Optional[str] = None,
identifiers: Optional[Array[Union[str, "PropertyValue"]]] = None,
images: Optional[Union[str, "ImageObject"]] = None,
images: Optional[Array[Union[str, "ImageObject"]]] = None,
isPartOf: Optional["CreativeWorkTypes"] = None,
keywords: Optional[Array[str]] = None,
licenses: Optional[Array[Union[str, "CreativeWorkTypes"]]] = None,
Expand Down Expand Up @@ -1872,7 +1872,7 @@ def __init__(
funders: Optional[Array[Union["Person", "Organization"]]] = None,
id: Optional[str] = None,
identifiers: Optional[Array[Union[str, "PropertyValue"]]] = None,
images: Optional[Union[str, "ImageObject"]] = None,
images: Optional[Array[Union[str, "ImageObject"]]] = None,
meta: Optional[Dict[str, Any]] = None,
name: Optional[str] = None,
sponsors: Optional[Array[Union["Person", "Organization"]]] = None,
Expand Down Expand Up @@ -1942,7 +1942,7 @@ def __init__(
funders: Optional[Array[Union["Organization", "Person"]]] = None,
id: Optional[str] = None,
identifiers: Optional[Array[Union[str, "PropertyValue"]]] = None,
images: Optional[Union[str, "ImageObject"]] = None,
images: Optional[Array[Union[str, "ImageObject"]]] = None,
legalName: Optional[str] = None,
logo: Optional[Union[str, "ImageObject"]] = None,
meta: Optional[Dict[str, Any]] = None,
Expand Down Expand Up @@ -2116,7 +2116,7 @@ def __init__(
funders: Optional[Array[Union["Person", "Organization"]]] = None,
id: Optional[str] = None,
identifiers: Optional[Array[Union[str, "PropertyValue"]]] = None,
images: Optional[Union[str, "ImageObject"]] = None,
images: Optional[Array[Union[str, "ImageObject"]]] = None,
isPartOf: Optional["CreativeWorkTypes"] = None,
issns: Optional[Array[str]] = None,
keywords: Optional[Array[str]] = None,
Expand Down Expand Up @@ -2221,7 +2221,7 @@ def __init__(
honorificSuffix: Optional[str] = None,
id: Optional[str] = None,
identifiers: Optional[Array[Union[str, "PropertyValue"]]] = None,
images: Optional[Union[str, "ImageObject"]] = None,
images: Optional[Array[Union[str, "ImageObject"]]] = None,
jobTitle: Optional[str] = None,
memberOf: Optional[Array["Organization"]] = None,
meta: Optional[Dict[str, Any]] = None,
Expand Down Expand Up @@ -2286,7 +2286,7 @@ def __init__(
description: Optional[Union[str, Array["Node"]]] = None,
id: Optional[str] = None,
identifiers: Optional[Array[Union[str, "PropertyValue"]]] = None,
images: Optional[Union[str, "ImageObject"]] = None,
images: Optional[Array[Union[str, "ImageObject"]]] = None,
logo: Optional[Union[str, "ImageObject"]] = None,
meta: Optional[Dict[str, Any]] = None,
name: Optional[str] = None,
Expand Down Expand Up @@ -2328,7 +2328,7 @@ def __init__(
description: Optional[Union[str, Array["Node"]]] = None,
id: Optional[str] = None,
identifiers: Optional[Array[Union[str, "PropertyValue"]]] = None,
images: Optional[Union[str, "ImageObject"]] = None,
images: Optional[Array[Union[str, "ImageObject"]]] = None,
meta: Optional[Dict[str, Any]] = None,
name: Optional[str] = None,
propertyID: Optional[str] = None,
Expand Down Expand Up @@ -2387,7 +2387,7 @@ def __init__(
funders: Optional[Array[Union["Person", "Organization"]]] = None,
id: Optional[str] = None,
identifiers: Optional[Array[Union[str, "PropertyValue"]]] = None,
images: Optional[Union[str, "ImageObject"]] = None,
images: Optional[Array[Union[str, "ImageObject"]]] = None,
isPartOf: Optional["CreativeWorkTypes"] = None,
issueNumber: Optional[Union[str, int]] = None,
keywords: Optional[Array[str]] = None,
Expand Down Expand Up @@ -2482,7 +2482,7 @@ def __init__(
funders: Optional[Array[Union["Person", "Organization"]]] = None,
id: Optional[str] = None,
identifiers: Optional[Array[Union[str, "PropertyValue"]]] = None,
images: Optional[Union[str, "ImageObject"]] = None,
images: Optional[Array[Union[str, "ImageObject"]]] = None,
isPartOf: Optional["CreativeWorkTypes"] = None,
keywords: Optional[Array[str]] = None,
licenses: Optional[Array[Union[str, "CreativeWorkTypes"]]] = None,
Expand Down Expand Up @@ -2617,7 +2617,7 @@ def __init__(
funders: Optional[Array[Union["Person", "Organization"]]] = None,
id: Optional[str] = None,
identifiers: Optional[Array[Union[str, "PropertyValue"]]] = None,
images: Optional[Union[str, "ImageObject"]] = None,
images: Optional[Array[Union[str, "ImageObject"]]] = None,
isPartOf: Optional["CreativeWorkTypes"] = None,
keywords: Optional[Array[str]] = None,
licenses: Optional[Array[Union[str, "CreativeWorkTypes"]]] = None,
Expand Down Expand Up @@ -2693,7 +2693,7 @@ def __init__(
extends: Optional[Array["SoftwareEnvironment"]] = None,
id: Optional[str] = None,
identifiers: Optional[Array[Union[str, "PropertyValue"]]] = None,
images: Optional[Union[str, "ImageObject"]] = None,
images: Optional[Array[Union[str, "ImageObject"]]] = None,
meta: Optional[Dict[str, Any]] = None,
removes: Optional[Array["SoftwareSourceCode"]] = None,
url: Optional[str] = None
Expand Down Expand Up @@ -2791,7 +2791,7 @@ def __init__(
environment: Optional["SoftwareEnvironment"] = None,
id: Optional[str] = None,
identifiers: Optional[Array[Union[str, "PropertyValue"]]] = None,
images: Optional[Union[str, "ImageObject"]] = None,
images: Optional[Array[Union[str, "ImageObject"]]] = None,
memoryLimit: Optional[float] = None,
memoryRequest: Optional[float] = None,
meta: Optional[Dict[str, Any]] = None,
Expand Down Expand Up @@ -2904,7 +2904,7 @@ def __init__(
funders: Optional[Array[Union["Person", "Organization"]]] = None,
id: Optional[str] = None,
identifiers: Optional[Array[Union[str, "PropertyValue"]]] = None,
images: Optional[Union[str, "ImageObject"]] = None,
images: Optional[Array[Union[str, "ImageObject"]]] = None,
isPartOf: Optional["CreativeWorkTypes"] = None,
keywords: Optional[Array[str]] = None,
licenses: Optional[Array[Union[str, "CreativeWorkTypes"]]] = None,
Expand Down Expand Up @@ -3077,7 +3077,7 @@ def __init__(
funders: Optional[Array[Union["Person", "Organization"]]] = None,
id: Optional[str] = None,
identifiers: Optional[Array[Union[str, "PropertyValue"]]] = None,
images: Optional[Union[str, "ImageObject"]] = None,
images: Optional[Array[Union[str, "ImageObject"]]] = None,
isPartOf: Optional["CreativeWorkTypes"] = None,
keywords: Optional[Array[str]] = None,
licenses: Optional[Array[Union[str, "CreativeWorkTypes"]]] = None,
Expand Down Expand Up @@ -3274,7 +3274,7 @@ def __init__(
funders: Optional[Array[Union["Person", "Organization"]]] = None,
id: Optional[str] = None,
identifiers: Optional[Array[Union[str, "PropertyValue"]]] = None,
images: Optional[Union[str, "ImageObject"]] = None,
images: Optional[Array[Union[str, "ImageObject"]]] = None,
isPartOf: Optional["CreativeWorkTypes"] = None,
keywords: Optional[Array[str]] = None,
licenses: Optional[Array[Union[str, "CreativeWorkTypes"]]] = None,
Expand Down Expand Up @@ -3355,7 +3355,7 @@ def __init__(
description: Optional[Union[str, Array["Node"]]] = None,
id: Optional[str] = None,
identifiers: Optional[Array[Union[str, "PropertyValue"]]] = None,
images: Optional[Union[str, "ImageObject"]] = None,
images: Optional[Array[Union[str, "ImageObject"]]] = None,
meta: Optional[Dict[str, Any]] = None,
mountOptions: Optional[Array[str]] = None,
mountSource: Optional[str] = None,
Expand Down
2 changes: 1 addition & 1 deletion r/R/types.R
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ Thing <- function(
self[["alternateNames"]] <- check_property("Thing", "alternateNames", FALSE, missing(alternateNames), Array("character"), alternateNames)
self[["description"]] <- check_property("Thing", "description", FALSE, missing(description), Union("character", Array(Node)), description)
self[["identifiers"]] <- check_property("Thing", "identifiers", FALSE, missing(identifiers), Array(Union("character", PropertyValue)), identifiers)
self[["images"]] <- check_property("Thing", "images", FALSE, missing(images), Union("character", ImageObject), images)
self[["images"]] <- check_property("Thing", "images", FALSE, missing(images), Array(Union("character", ImageObject)), images)
self[["name"]] <- check_property("Thing", "name", FALSE, missing(name), "character", name)
self[["url"]] <- check_property("Thing", "url", FALSE, missing(url), "character", url)
class(self) <- c(class(self), "Thing")
Expand Down
10 changes: 6 additions & 4 deletions schema/Thing.schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,12 @@ properties:
images:
'@id': schema:image
description: Images of the item.
anyOf:
- type: string
format: uri
- $ref: ImageObject
type: array
items:
anyOf:
- type: string
format: uri
- $ref: ImageObject
name:
'@id': schema:name
description: The name of the item.
Expand Down

0 comments on commit 83fe1ba

Please sign in to comment.