chore: update to VL 5.2 and rebuild schemas (#1037)

vega · Nov 28, 2021 · fb2d238 · fb2d238
1 parent f70e8ba
commit fb2d238
Show file tree

Hide file tree

Showing 15 changed files with 1,034 additions and 659 deletions.
diff --git a/package.json b/package.json
@@ -45,37 +45,37 @@
   },
   "dependencies": {
     "@types/json-schema": "^7.0.9",
-    "commander": "^8.2.0",
+    "commander": "^8.3.0",
     "glob": "^7.2.0",
     "safe-stable-stringify": "^2.2.0",
     "json5": "^2.2.0",
     "typescript": "~4.5.2"
   },
   "devDependencies": {
-    "@auto-it/conventional-commits": "^10.32.1",
-    "@auto-it/first-time-contributor": "^10.32.1",
-    "@babel/core": "^7.15.8",
-    "@babel/preset-env": "^7.15.8",
-    "@babel/preset-typescript": "^7.15.0",
-    "@types/glob": "^7.1.4",
-    "@types/jest": "^27.0.2",
-    "@types/node": "^16.10.3",
-    "@typescript-eslint/eslint-plugin": "^4.33.0",
-    "@typescript-eslint/parser": "^4.33.0",
-    "ajv": "^8.6.3",
+    "@auto-it/conventional-commits": "^10.32.3",
+    "@auto-it/first-time-contributor": "^10.32.3",
+    "@babel/core": "^7.16.0",
+    "@babel/preset-env": "^7.16.4",
+    "@babel/preset-typescript": "^7.16.0",
+    "@types/glob": "^7.2.0",
+    "@types/jest": "^27.0.3",
+    "@types/node": "^16.11.10",
+    "@typescript-eslint/eslint-plugin": "^5.4.0",
+    "@typescript-eslint/parser": "^5.4.0",
+    "ajv": "^8.8.2",
     "ajv-formats": "^2.1.1",
-    "auto": "^10.32.1",
+    "auto": "^10.32.3",
     "chai": "^4.3.4",
     "cross-env": "^7.0.3",
-    "eslint": "^7.32.0",
+    "eslint": "^8.3.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "jest": "^27.2.4",
+    "jest": "^27.3.1",
     "jest-junit": "^13.0.0",
-    "prettier": "^2.4.1",
-    "ts-node": "^10.2.1",
+    "prettier": "^2.5.0",
+    "ts-node": "^10.4.0",
     "vega": "^5.21.0",
-    "vega-lite": "^5.1.1"
+    "vega-lite": "^5.2.0"
   },
   "scripts": {
     "prepublishOnly": "yarn build",

diff --git a/src/NodeParser.ts b/src/NodeParser.ts
@@ -40,10 +40,8 @@ export class Context {
 
     public getArgument(parameterName: string): BaseType | undefined {
         const index: number = this.parameters.indexOf(parameterName);
-        if (index < 0 || !this.arguments[index]) {
-            if (this.defaultArgument.has(parameterName)) {
-                return this.defaultArgument.get(parameterName)!;
-            }
+        if ((index < 0 || !this.arguments[index]) && this.defaultArgument.has(parameterName)) {
+            return this.defaultArgument.get(parameterName)!;
         }
 
         return this.arguments[index];

diff --git a/test/valid-data/annotation-deprecated-empty/schema.json b/test/valid-data/annotation-deprecated-empty/schema.json
@@ -3,8 +3,8 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "definitions": {
     "MyObject": {
-      "deprecated": "",
       "additionalProperties": false,
+      "deprecated": "",
       "type": "object"
     }
   }

diff --git a/test/valid-data/annotation-empty/schema.json b/test/valid-data/annotation-empty/schema.json
@@ -3,8 +3,8 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "definitions": {
     "MyObject": {
-      "customEmptyAnnotation": "",
       "additionalProperties": false,
+      "customEmptyAnnotation": "",
       "type": "object"
     }
   }

diff --git a/test/valid-data/any-unknown/schema.json b/test/valid-data/any-unknown/schema.json
@@ -5,10 +5,8 @@
     "MyObject": {
       "additionalProperties": false,
       "properties": {
-        "value1": {
-        },
-        "value2": {
-        }
+        "value1": {},
+        "value2": {}
       },
       "required": [
         "value1",

diff --git a/test/valid-data/ignore-export/schema.json b/test/valid-data/ignore-export/schema.json
@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "definitions": {
     "A": {
-      "type": "object",
+      "additionalProperties": false,
       "properties": {
         "a": {
           "type": "string"
@@ -11,10 +11,10 @@
       "required": [
         "a"
       ],
-      "additionalProperties": false
+      "type": "object"
     },
     "B": {
-      "type": "object",
+      "additionalProperties": false,
       "properties": {
         "b": {
           "type": "string"
@@ -23,7 +23,7 @@
       "required": [
         "b"
       ],
-      "additionalProperties": false
+      "type": "object"
     }
   }
 }
diff --git a/test/valid-data/symbol/schema.json b/test/valid-data/symbol/schema.json
@@ -5,8 +5,7 @@
     "MyObject": {
       "additionalProperties": false,
       "properties": {
-        "foo": {
-        }
+        "foo": {}
       },
       "required": [
         "foo"

diff --git a/test/valid-data/type-aliases-local-namespace/schema.json b/test/valid-data/type-aliases-local-namespace/schema.json
@@ -5,8 +5,7 @@
     "B.B": {
       "additionalProperties": false,
       "properties": {
-        "b": {
-        }
+        "b": {}
       },
       "required": [
         "b"

diff --git a/test/valid-data/type-indexed-access-object-2/schema.json b/test/valid-data/type-indexed-access-object-2/schema.json
@@ -9,8 +9,7 @@
           "type": "string"
         },
         {
-          "not": {
-          }
+          "not": {}
         }
       ]
     }

diff --git a/test/valid-data/undefined-alias/schema.json b/test/valid-data/undefined-alias/schema.json
@@ -3,8 +3,7 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "definitions": {
     "MyType": {
-      "not": {
-      }
+      "not": {}
     }
   }
 }
diff --git a/test/valid-data/undefined-property/schema.json b/test/valid-data/undefined-property/schema.json
@@ -6,8 +6,7 @@
       "additionalProperties": false,
       "properties": {
         "a": {
-          "not": {
-          }
+          "not": {}
         },
         "b": {
           "type": "null"

diff --git a/test/valid-data/undefined-union/schema.json b/test/valid-data/undefined-union/schema.json
@@ -5,8 +5,7 @@
     "MyType": {
       "anyOf": [
         {
-          "not": {
-          }
+          "not": {}
         },
         {
           "type": "string"

diff --git a/test/valid-data/unique-symbol/schema.json b/test/valid-data/unique-symbol/schema.json
@@ -5,10 +5,8 @@
     "MyObject": {
       "additionalProperties": false,
       "properties": {
-        "bar": {
-        },
-        "foo": {
-        }
+        "bar": {},
+        "foo": {}
       },
       "required": [
         "foo",

diff --git a/test/vega-lite/schema.json b/test/vega-lite/schema.json