Skip to content

Commit

Permalink
fix: correct layer spec type to be circular
Browse files Browse the repository at this point in the history
  • Loading branch information
@domoritz
domoritz committed Mar 5, 2020
1 parent 449e1af commit 10cb260
Show file tree
Hide file tree
Showing 7 changed files with 54 additions and 167 deletions.
174 changes: 31 additions & 143 deletions build/vega-lite-schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7371,7 +7371,7 @@
}
]
},
"GenericConcatSpec<alias-src/spec/index.ts-1542-1923-src/spec/index.ts-0-2730<def-alias-src/spec/unit.ts-1814-2057-src/spec/unit.ts-0-2249659491184,def-interface-src/spec/layer.ts-760-1287-src/spec/layer.ts-0-15531006326072,def-interface-src/spec/repeat.ts-411-1175-src/spec/repeat.ts-0-1285491144667,def-alias-src/channeldef.ts-7211-7254-src/channeldef.ts-0-41067>>": {
"NormalizedConcatSpec<GenericSpec>": {
"additionalProperties": false,
"description": "Base interface for a generalized concatenation specification.",
"properties": {
Expand Down Expand Up @@ -7412,7 +7412,7 @@
"concat": {
"description": "A list of views to be concatenated.",
"items": {
"$ref": "#/definitions/GenericSpec<FacetedUnitSpec,LayerSpec,RepeatSpec,Field>"
"$ref": "#/definitions/NormalizedSpec"
},
"type": "array"
},
Expand Down Expand Up @@ -7474,7 +7474,7 @@
],
"type": "object"
},
"GenericConcatSpec<alias-src/spec/index.ts-1542-1923-src/spec/index.ts-0-2730<def-alias-src/spec/unit.ts-1814-2057-src/spec/unit.ts-0-2249659491184,def-interface-src/spec/layer.ts-760-1287-src/spec/layer.ts-0-15531006326072,interface-src/spec/repeat.ts-411-1175-src/spec/repeat.ts-0-1285,def-alias-src/channeldef.ts-7178-7211-src/channeldef.ts-0-41067>>": {
"ConcatSpec<GenericSpec>": {
"additionalProperties": false,
"description": "Base interface for a generalized concatenation specification.",
"properties": {
Expand Down Expand Up @@ -7515,7 +7515,7 @@
"concat": {
"description": "A list of views to be concatenated.",
"items": {
"$ref": "#/definitions/GenericSpec<FacetedUnitSpec,LayerSpec,interface-src/spec/repeat.ts-411-1175-src/spec/repeat.ts-0-1285,FieldName>"
"$ref": "#/definitions/Spec"
},
"type": "array"
},
Expand Down Expand Up @@ -7815,7 +7815,7 @@
],
"type": "object"
},
"GenericHConcatSpec<alias-src/spec/index.ts-1542-1923-src/spec/index.ts-0-2730<def-alias-src/spec/unit.ts-1814-2057-src/spec/unit.ts-0-2249659491184,def-interface-src/spec/layer.ts-760-1287-src/spec/layer.ts-0-15531006326072,def-interface-src/spec/repeat.ts-411-1175-src/spec/repeat.ts-0-1285491144667,def-alias-src/channeldef.ts-7211-7254-src/channeldef.ts-0-41067>>": {
"NormalizedHConcatSpec<GenericSpec>": {
"additionalProperties": false,
"description": "Base interface for a horizontal concatenation specification.",
"properties": {
Expand Down Expand Up @@ -7849,7 +7849,7 @@
"hconcat": {
"description": "A list of views to be concatenated and put into a row.",
"items": {
"$ref": "#/definitions/GenericSpec<FacetedUnitSpec,LayerSpec,RepeatSpec,Field>"
"$ref": "#/definitions/NormalizedSpec"
},
"type": "array"
},
Expand Down Expand Up @@ -7889,7 +7889,7 @@
],
"type": "object"
},
"GenericHConcatSpec<alias-src/spec/index.ts-1542-1923-src/spec/index.ts-0-2730<def-alias-src/spec/unit.ts-1814-2057-src/spec/unit.ts-0-2249659491184,def-interface-src/spec/layer.ts-760-1287-src/spec/layer.ts-0-15531006326072,interface-src/spec/repeat.ts-411-1175-src/spec/repeat.ts-0-1285,def-alias-src/channeldef.ts-7178-7211-src/channeldef.ts-0-41067>>": {
"HConcatSpec<GenericSpec>": {
"additionalProperties": false,
"description": "Base interface for a horizontal concatenation specification.",
"properties": {
Expand Down Expand Up @@ -7923,7 +7923,7 @@
"hconcat": {
"description": "A list of views to be concatenated and put into a row.",
"items": {
"$ref": "#/definitions/GenericSpec<FacetedUnitSpec,LayerSpec,interface-src/spec/repeat.ts-411-1175-src/spec/repeat.ts-0-1285,FieldName>"
"$ref": "#/definitions/Spec"
},
"type": "array"
},
Expand Down Expand Up @@ -7963,7 +7963,7 @@
],
"type": "object"
},
"GenericSpec<FacetedUnitSpec,LayerSpec,RepeatSpec,Field>": {
"NormalizedSpec": {
"anyOf": [
{
"$ref": "#/definitions/FacetedUnitSpec"
Expand All @@ -7978,18 +7978,18 @@
"$ref": "#/definitions/GenericFacetSpec<FacetedUnitSpec,LayerSpec,Field>"
},
{
"$ref": "#/definitions/GenericConcatSpec<alias-src/spec/index.ts-1542-1923-src/spec/index.ts-0-2730<def-alias-src/spec/unit.ts-1814-2057-src/spec/unit.ts-0-2249659491184,def-interface-src/spec/layer.ts-760-1287-src/spec/layer.ts-0-15531006326072,def-interface-src/spec/repeat.ts-411-1175-src/spec/repeat.ts-0-1285491144667,def-alias-src/channeldef.ts-7211-7254-src/channeldef.ts-0-41067>>"
"$ref": "#/definitions/NormalizedConcatSpec<GenericSpec>"
},
{
"$ref": "#/definitions/GenericVConcatSpec<alias-src/spec/index.ts-1542-1923-src/spec/index.ts-0-2730<def-alias-src/spec/unit.ts-1814-2057-src/spec/unit.ts-0-2249659491184,def-interface-src/spec/layer.ts-760-1287-src/spec/layer.ts-0-15531006326072,def-interface-src/spec/repeat.ts-411-1175-src/spec/repeat.ts-0-1285491144667,def-alias-src/channeldef.ts-7211-7254-src/channeldef.ts-0-41067>>"
"$ref": "#/definitions/NormalizedVConcatSpec<GenericSpec>"
},
{
"$ref": "#/definitions/GenericHConcatSpec<alias-src/spec/index.ts-1542-1923-src/spec/index.ts-0-2730<def-alias-src/spec/unit.ts-1814-2057-src/spec/unit.ts-0-2249659491184,def-interface-src/spec/layer.ts-760-1287-src/spec/layer.ts-0-15531006326072,def-interface-src/spec/repeat.ts-411-1175-src/spec/repeat.ts-0-1285491144667,def-alias-src/channeldef.ts-7211-7254-src/channeldef.ts-0-41067>>"
"$ref": "#/definitions/NormalizedHConcatSpec<GenericSpec>"
}
],
"description": "Any specification in Vega-Lite."
},
"GenericSpec<FacetedUnitSpec,LayerSpec,interface-src/spec/repeat.ts-411-1175-src/spec/repeat.ts-0-1285,FieldName>": {
"Spec": {
"anyOf": [
{
"$ref": "#/definitions/FacetedUnitSpec"
Expand All @@ -8004,18 +8004,18 @@
"$ref": "#/definitions/GenericFacetSpec<FacetedUnitSpec,LayerSpec,FieldName>"
},
{
"$ref": "#/definitions/GenericConcatSpec<alias-src/spec/index.ts-1542-1923-src/spec/index.ts-0-2730<def-alias-src/spec/unit.ts-1814-2057-src/spec/unit.ts-0-2249659491184,def-interface-src/spec/layer.ts-760-1287-src/spec/layer.ts-0-15531006326072,interface-src/spec/repeat.ts-411-1175-src/spec/repeat.ts-0-1285,def-alias-src/channeldef.ts-7178-7211-src/channeldef.ts-0-41067>>"
"$ref": "#/definitions/ConcatSpec<GenericSpec>"
},
{
"$ref": "#/definitions/GenericVConcatSpec<alias-src/spec/index.ts-1542-1923-src/spec/index.ts-0-2730<def-alias-src/spec/unit.ts-1814-2057-src/spec/unit.ts-0-2249659491184,def-interface-src/spec/layer.ts-760-1287-src/spec/layer.ts-0-15531006326072,interface-src/spec/repeat.ts-411-1175-src/spec/repeat.ts-0-1285,def-alias-src/channeldef.ts-7178-7211-src/channeldef.ts-0-41067>>"
"$ref": "#/definitions/VConcatSpec<GenericSpec>"
},
{
"$ref": "#/definitions/GenericHConcatSpec<alias-src/spec/index.ts-1542-1923-src/spec/index.ts-0-2730<def-alias-src/spec/unit.ts-1814-2057-src/spec/unit.ts-0-2249659491184,def-interface-src/spec/layer.ts-760-1287-src/spec/layer.ts-0-15531006326072,interface-src/spec/repeat.ts-411-1175-src/spec/repeat.ts-0-1285,def-alias-src/channeldef.ts-7178-7211-src/channeldef.ts-0-41067>>"
"$ref": "#/definitions/HConcatSpec<GenericSpec>"
}
],
"description": "Any specification in Vega-Lite."
},
"GenericVConcatSpec<alias-src/spec/index.ts-1542-1923-src/spec/index.ts-0-2730<def-alias-src/spec/unit.ts-1814-2057-src/spec/unit.ts-0-2249659491184,def-interface-src/spec/layer.ts-760-1287-src/spec/layer.ts-0-15531006326072,def-interface-src/spec/repeat.ts-411-1175-src/spec/repeat.ts-0-1285491144667,def-alias-src/channeldef.ts-7211-7254-src/channeldef.ts-0-41067>>": {
"NormalizedVConcatSpec<GenericSpec>": {
"additionalProperties": false,
"description": "Base interface for a vertical concatenation specification.",
"properties": {
Expand Down Expand Up @@ -8079,7 +8079,7 @@
"vconcat": {
"description": "A list of views to be concatenated and put into a column.",
"items": {
"$ref": "#/definitions/GenericSpec<FacetedUnitSpec,LayerSpec,RepeatSpec,Field>"
"$ref": "#/definitions/NormalizedSpec"
},
"type": "array"
}
Expand All @@ -8089,7 +8089,7 @@
],
"type": "object"
},
"GenericVConcatSpec<alias-src/spec/index.ts-1542-1923-src/spec/index.ts-0-2730<def-alias-src/spec/unit.ts-1814-2057-src/spec/unit.ts-0-2249659491184,def-interface-src/spec/layer.ts-760-1287-src/spec/layer.ts-0-15531006326072,interface-src/spec/repeat.ts-411-1175-src/spec/repeat.ts-0-1285,def-alias-src/channeldef.ts-7178-7211-src/channeldef.ts-0-41067>>": {
"VConcatSpec<GenericSpec>": {
"additionalProperties": false,
"description": "Base interface for a vertical concatenation specification.",
"properties": {
Expand Down Expand Up @@ -8153,7 +8153,7 @@
"vconcat": {
"description": "A list of views to be concatenated and put into a column.",
"items": {
"$ref": "#/definitions/GenericSpec<FacetedUnitSpec,LayerSpec,interface-src/spec/repeat.ts-411-1175-src/spec/repeat.ts-0-1285,FieldName>"
"$ref": "#/definitions/Spec"
},
"type": "array"
}
Expand Down Expand Up @@ -12319,114 +12319,6 @@
}
]
},
"PartsMixins<BoxPlotPart>": {
"additionalProperties": false,
"properties": {
"box": {
"anyOf": [
{
"type": "boolean"
},
{
"$ref": "#/definitions/MarkConfig"
}
]
},
"median": {
"anyOf": [
{
"type": "boolean"
},
{
"$ref": "#/definitions/MarkConfig"
}
]
},
"outliers": {
"anyOf": [
{
"type": "boolean"
},
{
"$ref": "#/definitions/MarkConfig"
}
]
},
"rule": {
"anyOf": [
{
"type": "boolean"
},
{
"$ref": "#/definitions/MarkConfig"
}
]
},
"ticks": {
"anyOf": [
{
"type": "boolean"
},
{
"$ref": "#/definitions/MarkConfig"
}
]
}
},
"type": "object"
},
"PartsMixins<ErrorBandPart>": {
"additionalProperties": false,
"properties": {
"band": {
"anyOf": [
{
"type": "boolean"
},
{
"$ref": "#/definitions/MarkConfig"
}
]
},
"borders": {
"anyOf": [
{
"type": "boolean"
},
{
"$ref": "#/definitions/MarkConfig"
}
]
}
},
"type": "object"
},
"PartsMixins<ErrorBarPart>": {
"additionalProperties": false,
"properties": {
"rule": {
"anyOf": [
{
"type": "boolean"
},
{
"$ref": "#/definitions/MarkConfig"
}
]
},
"ticks": {
"anyOf": [
{
"type": "boolean"
},
{
"$ref": "#/definitions/MarkConfig"
}
]
}
},
"type": "object"
},
"PivotTransform": {
"additionalProperties": false,
"properties": {
Expand Down Expand Up @@ -13575,7 +13467,7 @@
"description": "The spacing in pixels between sub-views of the composition operator.\nAn object of the form `{\"row\": number, \"column\": number}` can be used to set\ndifferent spacing values for rows and columns.\n\n__Default value__: Depends on `\"spacing\"` property of [the view composition configuration](https://vega.github.io/vega-lite/docs/config.html#view-config) (`20` by default)"
},
"spec": {
"$ref": "#/definitions/GenericSpec<FacetedUnitSpec,LayerSpec,interface-src/spec/repeat.ts-411-1175-src/spec/repeat.ts-0-1285,FieldName>",
"$ref": "#/definitions/Spec",
"description": "A specification of the view that gets repeated."
},
"title": {
Expand Down Expand Up @@ -14878,10 +14770,6 @@
],
"type": "string"
},
"Spec": {
"$ref": "#/definitions/GenericSpec<FacetedUnitSpec,LayerSpec,RepeatSpec,Field>",
"description": "Spec with composite marks and repeat."
},
"SphereGenerator": {
"additionalProperties": false,
"properties": {
Expand Down Expand Up @@ -15865,7 +15753,7 @@
],
"type": "object"
},
"TopLevelGenericConcatSpec<Spec>": {
"TopLevelNormalizedConcatSpec<GenericSpec>": {
"additionalProperties": false,
"properties": {
"$schema": {
Expand Down Expand Up @@ -15925,7 +15813,7 @@
"concat": {
"description": "A list of views to be concatenated.",
"items": {
"$ref": "#/definitions/Spec"
"$ref": "#/definitions/NormalizedSpec"
},
"type": "array"
},
Expand Down Expand Up @@ -16003,7 +15891,7 @@
],
"type": "object"
},
"TopLevelGenericHConcatSpec<Spec>": {
"TopLevelNormalizedHConcatSpec<GenericSpec>": {
"additionalProperties": false,
"properties": {
"$schema": {
Expand Down Expand Up @@ -16064,7 +15952,7 @@
"hconcat": {
"description": "A list of views to be concatenated and put into a row.",
"items": {
"$ref": "#/definitions/Spec"
"$ref": "#/definitions/NormalizedSpec"
},
"type": "array"
},
Expand Down Expand Up @@ -16112,7 +16000,7 @@
],
"type": "object"
},
"TopLevelGenericVConcatSpec<Spec>": {
"TopLevelNormalizedVConcatSpec<GenericSpec>": {
"additionalProperties": false,
"properties": {
"$schema": {
Expand Down Expand Up @@ -16211,7 +16099,7 @@
"vconcat": {
"description": "A list of views to be concatenated and put into a column.",
"items": {
"$ref": "#/definitions/Spec"
"$ref": "#/definitions/NormalizedSpec"
},
"type": "array"
}
Expand Down Expand Up @@ -16485,7 +16373,7 @@
"description": "The spacing in pixels between sub-views of the composition operator.\nAn object of the form `{\"row\": number, \"column\": number}` can be used to set\ndifferent spacing values for rows and columns.\n\n__Default value__: Depends on `\"spacing\"` property of [the view composition configuration](https://vega.github.io/vega-lite/docs/config.html#view-config) (`20` by default)"
},
"spec": {
"$ref": "#/definitions/GenericSpec<FacetedUnitSpec,LayerSpec,interface-src/spec/repeat.ts-411-1175-src/spec/repeat.ts-0-1285,FieldName>",
"$ref": "#/definitions/Spec",
"description": "A specification of the view that gets repeated."
},
"title": {
Expand Down Expand Up @@ -16687,13 +16575,13 @@
"$ref": "#/definitions/TopLevelRepeatSpec"
},
{
"$ref": "#/definitions/TopLevelGenericConcatSpec<Spec>"
"$ref": "#/definitions/TopLevelNormalizedConcatSpec<GenericSpec>"
},
{
"$ref": "#/definitions/TopLevelGenericVConcatSpec<Spec>"
"$ref": "#/definitions/TopLevelNormalizedVConcatSpec<GenericSpec>"
},
{
"$ref": "#/definitions/TopLevelGenericHConcatSpec<Spec>"
"$ref": "#/definitions/TopLevelNormalizedHConcatSpec<GenericSpec>"
}
],
"description": "A Vega-Lite top-level specification.\nThis is the root class for all Vega-Lite specifications.\n(The json schema is generated from this type.)"
Expand Down
7 changes: 3 additions & 4 deletions examples/specs/parallel_coordinate.vl.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"field": "sepalWidth"
}]
}
},{
}, {
"encoding": {
"x": {"type": "nominal", "field": "key"},
"y": {"value": 0}
Expand All @@ -66,8 +66,7 @@
}, {
"mark": {"type": "tick", "style": "tick", "size": 8, "color": "#ccc"}
}]
},{

}, {
"encoding": {
"x": {"type": "nominal", "field": "key"},
"y": {"value": 150}
Expand All @@ -80,7 +79,7 @@
}, {
"mark": {"type": "tick", "style": "tick", "size": 8, "color": "#ccc"}
}]
},{
}, {
"encoding": {
"x": {"type": "nominal", "field": "key"},
"y": {"value": 300}
Expand Down
Loading

0 comments on commit 10cb260

Please sign in to comment.