chore: simplify schema

vega · Mar 5, 2020 · 17c1e81 · 17c1e81
1 parent 5899f3e
commit 17c1e81
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/build/vega-lite-schema.json b/build/vega-lite-schema.json
@@ -7621,7 +7621,7 @@
       ],
       "type": "object"
     },
-    "GenericFacetSpec<FacetedUnitSpec,LayerSpec,Field>": {
+    "NormalizedFacetSpec": {
       "additionalProperties": false,
       "description": "Base interface for a facet specification.",
       "properties": {
@@ -7740,7 +7740,7 @@
       ],
       "type": "object"
     },
-    "GenericFacetSpec<FacetedUnitSpec,LayerSpec,FieldName>": {
+    "FacetSpec": {
       "additionalProperties": false,
       "description": "Base interface for a facet specification.",
       "properties": {
@@ -8019,7 +8019,7 @@
           "$ref": "#/definitions/RepeatSpec"
         },
         {
-          "$ref": "#/definitions/GenericFacetSpec<FacetedUnitSpec,LayerSpec,Field>"
+          "$ref": "#/definitions/NormalizedFacetSpec"
         },
         {
           "$ref": "#/definitions/NormalizedConcatSpec<GenericSpec>"
@@ -8045,7 +8045,7 @@
           "$ref": "#/definitions/RepeatSpec"
         },
         {
-          "$ref": "#/definitions/GenericFacetSpec<FacetedUnitSpec,LayerSpec,FieldName>"
+          "$ref": "#/definitions/FacetSpec"
         },
         {
           "$ref": "#/definitions/ConcatSpec<GenericSpec>"

diff --git a/scripts/rename-schema.sh b/scripts/rename-schema.sh
@@ -7,8 +7,8 @@ perl -pi -e s,'<Field\,','<',g build/vega-lite-schema.json
 perl -pi -e s,'<StandardType>','',g build/vega-lite-schema.json
 
 perl -pi -e s,'CompositeEncoding','Encoding',g build/vega-lite-schema.json
-perl -pi -e s,'Generic(.*)<FacetedUnitSpec\,LayerSpec\,.*\,FieldName>','\1',g build/vega-lite-schema.json
-perl -pi -e s,'Generic(.*)<FacetedUnitSpec\,LayerSpec\,.*\,Field>','Normalized\1',g build/vega-lite-schema.json
+perl -pi -e s,'Generic(.*)<FacetedUnitSpec\,LayerSpec\,?.*\,FieldName>','\1',g build/vega-lite-schema.json
+perl -pi -e s,'Generic(.*)<FacetedUnitSpec\,LayerSpec\,?.*\,Field>','Normalized\1',g build/vega-lite-schema.json
 
 perl -pi -e s,'ValueDef(.*)\<\(number\|\\\"width\\\"\)\>','XValueDef\1',g build/vega-lite-schema.json
 perl -pi -e s,'ValueDef(.*)\<\(number\|\\\"height\\\"\)\>','YValueDef\1',g build/vega-lite-schema.json