feat: allow dereferencing references that are circular

fixes #1276
vega · Mar 3, 2023 · 8d550bb · 8d550bb
1 parent b692d84
commit 8d550bb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/Type/ReferenceType.ts b/src/Type/ReferenceType.ts
@@ -36,6 +36,10 @@ export class ReferenceType extends BaseType {
         return this.type;
     }
 
+    public hasType(): boolean {
+        return this.type != null;
+    }
+
     public setType(type: BaseType): void {
         this.type = type;
         this.setId(type.getId());

diff --git a/src/Utils/derefType.ts b/src/Utils/derefType.ts
@@ -4,13 +4,14 @@ import { BaseType } from "../Type/BaseType";
 import { DefinitionType } from "../Type/DefinitionType";
 import { ReferenceType } from "../Type/ReferenceType";
 
+/**
+ * Dereference the type as far as possible.
+ */
 export function derefType(type: BaseType): BaseType {
-    if (
-        type instanceof ReferenceType ||
-        type instanceof DefinitionType ||
-        type instanceof AliasType ||
-        type instanceof AnnotatedType
-    ) {
+    if (type instanceof DefinitionType || type instanceof AliasType || type instanceof AnnotatedType) {
+        return derefType(type.getType());
+    }
+    if (type instanceof ReferenceType && type.hasType()) {
         return derefType(type.getType());
     }