Merge branch 'vega:next' into next

vega · Sep 3, 2022 · d0d51a7 · d0d51a7
2 parents f6d4d24 + 3124c34
commit d0d51a7
Show file tree

Hide file tree

Showing 3 changed files with 526 additions and 405 deletions.
diff --git a/package.json b/package.json
@@ -50,7 +50,7 @@
     "json5": "^2.2.1",
     "normalize-path": "^3.0.0",
     "safe-stable-stringify": "^2.3.1",
-    "typescript": "~4.7.4"
+    "typescript": "~4.8.2"
   },
   "devDependencies": {
     "@auto-it/conventional-commits": "^10.37.4",
@@ -72,7 +72,7 @@
     "eslint": "^8.20.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "jest": "^28.1.3",
+    "jest": "^29.0.1",
     "jest-junit": "^14.0.0",
     "prettier": "^2.7.1",
     "ts-node": "^10.9.1",

diff --git a/src/TypeFormatter/UnionTypeFormatter.ts b/src/TypeFormatter/UnionTypeFormatter.ts
@@ -56,7 +56,9 @@ export class UnionTypeFormatter implements SubTypeFormatter {
 
         // Flatten anyOf inside anyOf unless the anyOf has an annotation
         for (const def of definitions) {
-            if (Object.keys(def) === ["anyOf"]) {
+            const keys = Object.keys(def);
+
+            if (keys.length === 1 && keys[0] === "anyOf") {
                 flattenedDefinitions.push(...(def.anyOf as any));
             } else {
                 flattenedDefinitions.push(def);