fix: Also mark some function return types as optional

mrousavy · Aug 6, 2024 · 17299bd · 17299bd
1 parent ef50863
commit 17299bd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/packages/nitrogen/src/syntax/createType.ts b/packages/nitrogen/src/syntax/createType.ts
@@ -127,7 +127,7 @@ export function createType(type: TSMorphType, isOptional: boolean): Type {
     // It's a function!
     const callSignature = getFunctionCallSignature(type)
     const funcReturnType = callSignature.getReturnType()
-    const returnType = createType(funcReturnType, false)
+    const returnType = createType(funcReturnType, funcReturnType.isNullable())
     const parameters = callSignature.getParameters().map((p) => {
       const declaration = p.getValueDeclarationOrThrow()
       const parameterType = p.getTypeAtLocation(declaration)

diff --git a/packages/nitrogen/src/syntax/getInterfaceProperties.ts b/packages/nitrogen/src/syntax/getInterfaceProperties.ts
@@ -8,7 +8,11 @@ export function getInterfaceProperties(
   return interfaceType.getProperties().map((prop) => {
     const declaration = prop.getValueDeclarationOrThrow()
     const propType = prop.getTypeAtLocation(declaration)
-    const refType = createNamedType(prop.getName(), propType, prop.isOptional())
+    const refType = createNamedType(
+      prop.getName(),
+      propType,
+      prop.isOptional() || propType.isNullable()
+    )
     return refType
   })
 }