fix: null check on composed types

microsoft · Aug 19, 2024 · ed4888d · ed4888d
1 parent d6953fb
commit ed4888d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Kiota.Builder/Writers/TypeScript/CodeFunctionWriter.cs b/src/Kiota.Builder/Writers/TypeScript/CodeFunctionWriter.cs
@@ -146,7 +146,7 @@ private void WriteSerializationFunctionForCodeUnionTypes(CodeComposedTypeBase co
         }
 
         var paramName = composedParam.Name.ToFirstCharacterLowerCase();
-        writer.WriteLine($"if ({paramName} === undefined) return;");
+        writer.WriteLine($"if ({paramName} === undefined || {paramName} === null) return;");
         WriteDiscriminatorSwitchBlock(discriminatorInfo, paramName, codeElement, writer);
     }
 
@@ -190,7 +190,7 @@ private void WriteDiscriminatorSwitchBlock(DiscriminatorInformation discriminato
     private void WriteSerializationFunctionForTypeComposedOfPrimitives(CodeComposedTypeBase composedType, CodeParameter composedParam, CodeFunction method, LanguageWriter writer)
     {
         var paramName = composedParam.Name.ToFirstCharacterLowerCase();
-        writer.WriteLine($"if ({paramName} === undefined) return;");
+        writer.WriteLine($"if ({paramName} === undefined || {paramName} === null) return;");
         writer.StartBlock($"switch (typeof {paramName}) {{");
 
         foreach (var type in composedType.GetPrimitiveTypes(IsComposedPrimitive))
@@ -220,7 +220,7 @@ private static void WriteApiConstructorBody(CodeFile parentFile, CodeMethod meth
         if (method.Parameters.OfKind(CodeParameterKind.RequestAdapter)?.Name.ToFirstCharacterLowerCase() is not string requestAdapterArgumentName) return;
         if (!string.IsNullOrEmpty(method.BaseUrl))
         {
-            writer.StartBlock($"if ({requestAdapterArgumentName}.baseUrl === undefined || {requestAdapterArgumentName}.baseUrl === \"\") {{");
+            writer.StartBlock($"if ({requestAdapterArgumentName}.baseUrl === undefined || {requestAdapterArgumentName}.baseUrl === null || {requestAdapterArgumentName}.baseUrl === \"\") {{");
             writer.WriteLine($"{requestAdapterArgumentName}.baseUrl = \"{method.BaseUrl}\";");
             writer.CloseBlock();
         }

diff --git a/tests/Kiota.Builder.Tests/Writers/TypeScript/TypeScriptConventionServiceTests.cs b/tests/Kiota.Builder.Tests/Writers/TypeScript/TypeScriptConventionServiceTests.cs
@@ -22,7 +22,7 @@ public void TranslateType_ReturnsCorrectTranslation_WhenComposedTypeIsNotNull()
         var result = TypeScriptConventionService.TranslateTypescriptType(composedType);
         Assert.Equal("Test", result);
     }
-    
+
     public CodeType CurrentType()
     {
         CodeType currentType = new CodeType { Name = "SomeType" };