Merge pull request #45 from SupernaviX/string-literals-inline

Fixes issue #42
YousefED · Jul 5, 2016 · b7df3ae · b7df3ae
2 parents 4e5b351 + 08985ad
commit b7df3ae
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 3 deletions.
diff --git a/test/programs/string-literals-inline/main.ts b/test/programs/string-literals-inline/main.ts
@@ -0,0 +1,3 @@
+class MyObject {
+	foo: "ok" | "fail" | "abort"
+}
diff --git a/test/programs/string-literals-inline/schema.json b/test/programs/string-literals-inline/schema.json
@@ -0,0 +1,17 @@
+{
+    "type": "object",
+    "properties": {
+        "foo": {
+            "type": "string",
+            "enum": [
+                "ok",
+                "fail",
+                "abort"
+            ]
+        }
+    },
+    "required": [
+        "foo"
+    ],
+    "$schema": "http://json-schema.org/draft-04/schema#"
+}
diff --git a/test/schema.test.ts b/test/schema.test.ts
@@ -40,6 +40,7 @@ describe("schema", function () {
 
     assertSchema("enums-string", "main.ts", "MyObject");
     assertSchema("string-literals", "main.ts", "MyObject");
+    assertSchema("string-literals-inline", "main.ts", "MyObject");
 
     assertSchema("array-types", "main.ts", "MyArray");
     assertSchema("map-types", "main.ts", "MyObject");

diff --git a/typescript-json-schema.js b/typescript-json-schema.js
diff --git a/typescript-json-schema.js.map b/typescript-json-schema.js.map
diff --git a/typescript-json-schema.ts b/typescript-json-schema.ts
@@ -371,7 +371,7 @@ const fullName = tc.typeToString(clazzType, undefined, ts.TypeFormatFlags.UseFul
             }
 
             // aliased types must be handled slightly different
-            const asTypeAliasRef = asRef && ((reffedType && this.args.useTypeAliasRef) || isStringEnum);
+            const asTypeAliasRef = asRef && reffedType && (this.args.useTypeAliasRef || isStringEnum);
             if (!asTypeAliasRef) {
                 if (isRawType || (typ.getFlags() & ts.TypeFlags.Anonymous)) {
                     asRef = false; // raw types and inline types cannot be reffed,