Add test, use uniqueTypeArray

vega · Apr 21, 2024 · 512274d · 512274d
1 parent 47af8b9
commit 512274d
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 11 deletions.
diff --git a/src/NodeParser/MappedTypeNodeParser.ts b/src/NodeParser/MappedTypeNodeParser.ts
@@ -18,6 +18,7 @@ import { derefAnnotatedType, derefType } from "../Utils/derefType.js";
 import { getKey } from "../Utils/nodeKey.js";
 import { preserveAnnotation } from "../Utils/preserveAnnotation.js";
 import { removeUndefined } from "../Utils/removeUndefined.js";
+import { uniqueTypeArray } from "../Utils/uniqueTypeArray.js";
 
 export class MappedTypeNodeParser implements SubNodeParser {
     public constructor(
@@ -102,8 +103,7 @@ export class MappedTypeNodeParser implements SubNodeParser {
     }
 
     protected getProperties(node: ts.MappedTypeNode, keyListType: UnionType, context: Context): ObjectProperty[] {
-        return keyListType
-            .getFlattenedTypes(derefType)
+        return uniqueTypeArray(keyListType.getFlattenedTypes(derefType))
             .filter((type): type is LiteralType => type instanceof LiteralType)
             .map((type) => [type, this.mapKey(node, type, context)])
             .filter((value): value is [LiteralType, LiteralType] => value[1] instanceof LiteralType)

diff --git a/src/Utils/uniqueArray.ts b/src/Utils/uniqueArray.ts
diff --git a/test/valid-data-type.test.ts b/test/valid-data-type.test.ts
@@ -102,6 +102,7 @@ describe("valid-data-type", () => {
     it("type-mapped-additional-props", assertValidSchema("type-mapped-additional-props", "MyObject"));
     it("type-mapped-array", assertValidSchema("type-mapped-array", "MyObject"));
     it("type-mapped-union-intersection", assertValidSchema("type-mapped-union-intersection", "MyObject"));
+    it("type-mapped-union-union", assertValidSchema("type-mapped-union-union", "MyType"));
     it("type-mapped-enum", assertValidSchema("type-mapped-enum", "MyObject"));
     it("type-mapped-enum-optional", assertValidSchema("type-mapped-enum-optional", "MyObject"));
     it("type-mapped-enum-null", assertValidSchema("type-mapped-enum-null", "MyObject"));

diff --git a/test/valid-data/type-mapped-union/main.ts → ...alid-data/type-mapped-union-union/main.ts b/test/valid-data/type-mapped-union/main.ts → ...alid-data/type-mapped-union-union/main.ts
diff --git a/.../valid-data/type-mapped-union/schema.json → ...-data/type-mapped-union-union/schema.json b/.../valid-data/type-mapped-union/schema.json → ...-data/type-mapped-union-union/schema.json