chore: upgrade Vega-Lite and rebuild schemas (#1326)

vega · Jul 10, 2022 · d81e3bb · d81e3bb
1 parent dc8a190
commit d81e3bb
Show file tree

Hide file tree

Showing 11 changed files with 310 additions and 298 deletions.
diff --git a/package.json b/package.json
@@ -77,7 +77,7 @@
     "prettier": "^2.5.1",
     "ts-node": "^10.4.0",
     "vega": "^5.21.0",
-    "vega-lite": "^5.2.0"
+    "vega-lite": "^5.3.0"
   },
   "scripts": {
     "prepublishOnly": "yarn build",

diff --git a/test/valid-data/annotation-example/schema.json b/test/valid-data/annotation-example/schema.json
@@ -6,17 +6,19 @@
       "type": "string"
     },
     "MyObject": {
+      "additionalProperties": false,
       "examples": [
-        { "nested": "hello" }
+        {
+          "nested": "hello"
+        }
       ],
-      "additionalProperties": false,
       "properties": {
         "nested": {
+          "$ref": "#/definitions/MyNestedObject",
           "examples": [
             "Hello world",
             "This string rocks"
-          ],
-          "$ref": "#/definitions/MyNestedObject"
+          ]
         }
       },
       "required": [

diff --git a/test/valid-data/annotation-id/schema.json b/test/valid-data/annotation-id/schema.json
@@ -1,25 +1,25 @@
 {
-   "$id": "Test",
-   "$schema": "http://json-schema.org/draft-07/schema#",
-   "$ref": "#/definitions/MyObject",
-   "definitions": {
-     "MyNestedObject": {
-       "$id": "#MyNestedObject",
-       "additionalProperties": false,
-       "type": "object"
-     },
-     "MyObject": {
-       "$id": "#MyObject",
-       "additionalProperties": false,
-       "properties":  {
-         "nested":  {
-           "$ref": "#/definitions/MyNestedObject"
-         }
-       },
-       "required":  [
-         "nested"
-       ],
-       "type": "object"
-     }
-   }
- }
+  "$id": "Test",
+  "$ref": "#/definitions/MyObject",
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "definitions": {
+    "MyNestedObject": {
+      "$id": "#MyNestedObject",
+      "additionalProperties": false,
+      "type": "object"
+    },
+    "MyObject": {
+      "$id": "#MyObject",
+      "additionalProperties": false,
+      "properties": {
+        "nested": {
+          "$ref": "#/definitions/MyNestedObject"
+        }
+      },
+      "required": [
+        "nested"
+      ],
+      "type": "object"
+    }
+  }
+}
diff --git a/test/valid-data/annotation-ref/schema.json b/test/valid-data/annotation-ref/schema.json
@@ -5,19 +5,20 @@
     "MyObject": {
       "additionalProperties": false,
       "properties": {
-        "nested": {
+        "myObject": {
           "$ref": "http://json-schema.org/draft-07/schema#",
-          "title": "Nested title",
-          "description": "Nested description"
+          "description": "MyObject description",
+          "title": "MyObject title"
         },
-        "myObject": {
+        "nested": {
           "$ref": "http://json-schema.org/draft-07/schema#",
-          "title": "MyObject title",
-          "description": "MyObject description"
+          "description": "Nested description",
+          "title": "Nested title"
         }
       },
       "required": [
-        "nested", "myObject"
+        "nested",
+        "myObject"
       ],
       "type": "object"
     }

diff --git a/test/valid-data/string-template-expression-literals/schema.json b/test/valid-data/string-template-expression-literals/schema.json
@@ -1,37 +1,37 @@
 {
-    "$ref": "#/definitions/MyObject",
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "definitions": {
-        "MyObject": {
-            "additionalProperties": false,
-            "properties": {
-                "_foo": {
-                    "enum": [
-                        "__ok_id",
-                        "__fail_id",
-                        "__abort_id"
-                    ],
-                    "type": "string"
-                },
-                "foo": {
-                    "enum": [
-                        "ok",
-                        "fail",
-                        "abort"
-                    ],
-                    "type": "string"
-                },
-                "ok": {
-                    "const": "id_ok",
-                    "type": "string"
-                }
-            },
-            "required": [
-                "foo",
-                "_foo",
-                "ok"
-            ],
-            "type": "object"
+  "$ref": "#/definitions/MyObject",
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "definitions": {
+    "MyObject": {
+      "additionalProperties": false,
+      "properties": {
+        "_foo": {
+          "enum": [
+            "__ok_id",
+            "__fail_id",
+            "__abort_id"
+          ],
+          "type": "string"
+        },
+        "foo": {
+          "enum": [
+            "ok",
+            "fail",
+            "abort"
+          ],
+          "type": "string"
+        },
+        "ok": {
+          "const": "id_ok",
+          "type": "string"
         }
+      },
+      "required": [
+        "foo",
+        "_foo",
+        "ok"
+      ],
+      "type": "object"
     }
+  }
 }
diff --git a/test/valid-data/string-template-literals/schema.json b/test/valid-data/string-template-literals/schema.json
@@ -1,23 +1,23 @@
 {
-    "$ref": "#/definitions/MyObject",
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "definitions": {
-        "MyObject": {
-            "additionalProperties": false,
-            "properties": {
-                "foo": {
-                    "enum": [
-                        "ok",
-                        "fail",
-                        "abort"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "foo"
-            ],
-            "type": "object"
+  "$ref": "#/definitions/MyObject",
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "definitions": {
+    "MyObject": {
+      "additionalProperties": false,
+      "properties": {
+        "foo": {
+          "enum": [
+            "ok",
+            "fail",
+            "abort"
+          ],
+          "type": "string"
         }
+      },
+      "required": [
+        "foo"
+      ],
+      "type": "object"
     }
+  }
 }
diff --git a/test/valid-data/type-intersection-recursive-interface/schema.json b/test/valid-data/type-intersection-recursive-interface/schema.json
@@ -1,40 +1,40 @@
 {
-    "$ref": "#/definitions/Intersection",
-    "$schema": "http://json-schema.org/draft-07/schema#",
-    "definitions": {
-      "Container": {
-        "additionalProperties": false,
-        "properties": {
-          "children": {
-            "items": {
-              "$ref": "#/definitions/Container"
-            },
-            "type": "array"
-          }
-        },
-        "required": [
-          "children"
-        ],
-        "type": "object"
+  "$ref": "#/definitions/Intersection",
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "definitions": {
+    "Container": {
+      "additionalProperties": false,
+      "properties": {
+        "children": {
+          "items": {
+            "$ref": "#/definitions/Container"
+          },
+          "type": "array"
+        }
       },
-      "Intersection": {
-        "additionalProperties": false,
-        "properties": {
-          "children": {
-            "items": {
-              "$ref": "#/definitions/Container"
-            },
-            "type": "array"
+      "required": [
+        "children"
+      ],
+      "type": "object"
+    },
+    "Intersection": {
+      "additionalProperties": false,
+      "properties": {
+        "children": {
+          "items": {
+            "$ref": "#/definitions/Container"
           },
-          "x": {
-            "type": "number"
-          }
+          "type": "array"
         },
-        "required": [
-          "children",
-          "x"
-        ],
-        "type": "object"
-      }
+        "x": {
+          "type": "number"
+        }
+      },
+      "required": [
+        "children",
+        "x"
+      ],
+      "type": "object"
     }
   }
+}