Fix typo in the rename script

vega · Jun 11, 2017 · ba37042 · ba37042
1 parent 28a18bc
commit ba37042
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/build/vega-lite-schema.json b/build/vega-lite-schema.json
@@ -1294,13 +1294,13 @@
       ],
       "description": "Generic type for conditional channelDef.\nF defines the underlying FieldDef type while V defines the underlying ValueDef type."
     },
-    "ConditionTextDef": {
+    "ConditionalTextDef": {
       "anyOf": [
         {
-          "$ref": "#/definitions/ConditionTextFieldDef"
+          "$ref": "#/definitions/ConditionalTextFieldDef"
         },
         {
-          "$ref": "#/definitions/ConditionTextValueDef"
+          "$ref": "#/definitions/ConditionalTextValueDef"
         },
         {
           "$ref": "#/definitions/ConditionOnlyTextDef"
@@ -1450,7 +1450,7 @@
       ],
       "type": "object"
     },
-    "ConditionTextFieldDef": {
+    "ConditionalTextFieldDef": {
       "additionalProperties": false,
       "description": "A FieldDef with ConditionValueDef\n{\n   condition: {value: ...},\n   field: ...,\n   ...\n}",
       "properties": {
@@ -1549,7 +1549,7 @@
       ],
       "type": "object"
     },
-    "ConditionTextValueDef": {
+    "ConditionalTextValueDef": {
       "additionalProperties": false,
       "description": "A ValueDef with ConditionValueDef | FieldDef\n{\n   condition: {field: ...} | {value: ...},\n   value: ...,\n}",
       "properties": {
@@ -1958,11 +1958,11 @@
           "description": "Size of the mark.\n- For `point`, `square` and `circle`\n– the symbol size, or pixel area of the mark.\n- For `bar` and `tick` – the bar and tick's size.\n- For `text` – the text's font size.\n- Size is currently unsupported for `line` and `area`."
         },
         "text": {
-          "$ref": "#/definitions/ConditionTextDef",
+          "$ref": "#/definitions/ConditionalTextDef",
           "description": "Text of the `text` mark."
         },
         "tooltip": {
-          "$ref": "#/definitions/ConditionTextDef",
+          "$ref": "#/definitions/ConditionalTextDef",
           "description": "The tooltip text to show upon mouse hover."
         },
         "x": {
@@ -2068,11 +2068,11 @@
           "description": "Size of the mark.\n- For `point`, `square` and `circle`\n– the symbol size, or pixel area of the mark.\n- For `bar` and `tick` – the bar and tick's size.\n- For `text` – the text's font size.\n- Size is currently unsupported for `line` and `area`."
         },
         "text": {
-          "$ref": "#/definitions/ConditionTextDef",
+          "$ref": "#/definitions/ConditionalTextDef",
           "description": "Text of the `text` mark."
         },
         "tooltip": {
-          "$ref": "#/definitions/ConditionTextDef",
+          "$ref": "#/definitions/ConditionalTextDef",
           "description": "The tooltip text to show upon mouse hover."
         },
         "x": {

diff --git a/scripts/rename-schema.sh b/scripts/rename-schema.sh
@@ -19,14 +19,14 @@ perl -pi -e s,'ValueDef<number>','NumberValueDef',g build/vega-lite-schema.json
 
 perl -pi -e s,'Condition<(.*)>','Condition\1',g build/vega-lite-schema.json
 
-perl -pi -e s,'Conditional<TextFieldDef\,TextValueDef>','ConditionTextDef',g build/vega-lite-schema.json
-perl -pi -e s,'ConditionalFieldDef<TextFieldDef\,TextValueDef>','ConditionTextFieldDef',g build/vega-lite-schema.json
-perl -pi -e s,'ConditionalValueDef<TextFieldDef\,TextValueDef>','ConditionTextValueDef',g build/vega-lite-schema.json
+perl -pi -e s,'Conditional<TextFieldDef\,TextValueDef>','ConditionalTextDef',g build/vega-lite-schema.json
+perl -pi -e s,'ConditionalFieldDef<TextFieldDef\,TextValueDef>','ConditionalTextFieldDef',g build/vega-lite-schema.json
+perl -pi -e s,'ConditionalValueDef<TextFieldDef\,TextValueDef>','ConditionalTextValueDef',g build/vega-lite-schema.json
 perl -pi -e s,'ConditionOnlyDef<TextFieldDef\,TextValueDef>','ConditionOnlyTextDef',g build/vega-lite-schema.json
 
-perl -pi -e s,'Conditional<LegendFieldDef\,(.*)ValueDef>','Condition\1LegendDef',g build/vega-lite-schema.json
-perl -pi -e s,'ConditionalFieldDef<LegendFieldDef\,(.*)ValueDef>','Condition\1LegendFieldDef',g build/vega-lite-schema.json
-perl -pi -e s,'ConditionalValueDef<LegendFieldDef\,(.*)ValueDef>','Condition\1LegendValueDef',g build/vega-lite-schema.json
+perl -pi -e s,'Conditional<LegendFieldDef\,(.*)ValueDef>','Conditional\1LegendDef',g build/vega-lite-schema.json
+perl -pi -e s,'ConditionalFieldDef<LegendFieldDef\,(.*)ValueDef>','Conditional\1LegendFieldDef',g build/vega-lite-schema.json
+perl -pi -e s,'ConditionalValueDef<LegendFieldDef\,(.*)ValueDef>','Conditional\1LegendValueDef',g build/vega-lite-schema.json
 perl -pi -e s,'ConditionOnlyDef<LegendFieldDef\,(.*)ValueDef>','ConditionOnly\1LegendDef',g build/vega-lite-schema.json
 
 perl -pi -e s,'LogicalOperand<string>','LogicalOperand',g build/vega-lite-schema.json