fix: add DefinitionTypes to extractLiterals() (#1717)

vega · Jul 4, 2023 · d9ad8ba · d9ad8ba
1 parent 415a7a8
commit d9ad8ba
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 1 deletion.
diff --git a/src/Utils/extractLiterals.ts b/src/Utils/extractLiterals.ts
@@ -2,6 +2,7 @@ import { UnknownTypeError } from "../Error/UnknownTypeError";
 import { AliasType } from "../Type/AliasType";
 import { BaseType } from "../Type/BaseType";
 import { BooleanType } from "../Type/BooleanType";
+import { DefinitionType } from "../Type/DefinitionType";
 import { EnumType } from "../Type/EnumType";
 import { LiteralType } from "../Type/LiteralType";
 import { UnionType } from "../Type/UnionType";
@@ -20,7 +21,7 @@ function* _extractLiterals(type: BaseType): Iterable<string> {
         }
         return;
     }
-    if (type instanceof AliasType) {
+    if (type instanceof AliasType || type instanceof DefinitionType) {
         yield* _extractLiterals(type.getType());
         return;
     }

diff --git a/test/valid-data-other.test.ts b/test/valid-data-other.test.ts
@@ -41,6 +41,10 @@ describe("valid-data-other", () => {
     it("string-literals-null", assertValidSchema("string-literals-null", "MyObject"));
     it("string-template-literals", assertValidSchema("string-template-literals", "MyObject"));
     it("string-template-expression-literals", assertValidSchema("string-template-expression-literals", "MyObject"));
+    it(
+        "string-template-expression-literals-import",
+        assertValidSchema("string-template-expression-literals-import", "MyObject")
+    );
 
     it("namespace-deep-1", assertValidSchema("namespace-deep-1", "RootNamespace.Def"));
     it("namespace-deep-2", assertValidSchema("namespace-deep-2", "RootNamespace.SubNamespace.HelperA"));

diff --git a/test/valid-data/string-template-expression-literals-import/main.ts b/test/valid-data/string-template-expression-literals-import/main.ts
@@ -0,0 +1,5 @@
+import { MyType } from './types';
+
+export interface MyObject {
+    value: `_${MyType}`;
+}
diff --git a/test/valid-data/string-template-expression-literals-import/schema.json b/test/valid-data/string-template-expression-literals-import/schema.json
@@ -0,0 +1,23 @@
+{
+  "$ref": "#/definitions/MyObject",
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "definitions": {
+    "MyObject": {
+      "additionalProperties": false,
+      "properties": {
+        "value": {
+          "enum": [
+            "_one",
+            "_two",
+            "_three"
+          ],
+          "type": "string"
+        }
+      },
+      "required": [
+        "value"
+      ],
+      "type": "object"
+    }
+  }
+}
diff --git a/test/valid-data/string-template-expression-literals-import/types.ts b/test/valid-data/string-template-expression-literals-import/types.ts
@@ -0,0 +1 @@
+export type MyType = 'one' | 'two' | 'three';