fix(model-visitor.ts): support for when strict option is on

fix #10 #11
nartc · Feb 5, 2020 · 6fb95ee · 6fb95ee
1 parent 11e4abb
commit 6fb95ee
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/ast-utils.ts b/src/ast-utils.ts
@@ -24,6 +24,10 @@ export function isPrimitiveType(type: tss.Type): boolean {
   );
 }
 
+export function isNullableUnionType(type: tss.Type): boolean {
+  return type.isUnion() && (type as any)?.isNullableType();
+}
+
 export function isAnyType(
   type: tss.Type,
   typeChecker: tss.TypeChecker,

diff --git a/src/model-visitor.ts b/src/model-visitor.ts
@@ -5,6 +5,7 @@ import {
   hasPropertyKey,
   isAnyType,
   isArrayType,
+  isNullableUnionType,
   isPrimitiveType,
   isTypeLiteral,
 } from './ast-utils';
@@ -165,11 +166,15 @@ export class ModelVisitor {
       return undefined;
     }
 
-    const type = typeChecker.getTypeAtLocation(node);
+    let type = typeChecker.getTypeAtLocation(node);
     if (!type) {
       return undefined;
     }
 
+    if (isNullableUnionType(type)) {
+      type = type.getNonNullableType();
+    }
+
     if (
       isPrimitiveType(type) ||
       isTypeLiteral(type) ||