Bug fix for non-generic dictionaries and json objects

FignumOld · Nov 10, 2017 · 7a1760e · 7a1760e
1 parent 2ff46da
commit 7a1760e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/LukasKabrt-typelite-076249af9d12/TypeLite/TypeLiteForTypeGap.csproj b/LukasKabrt-typelite-076249af9d12/TypeLite/TypeLiteForTypeGap.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.6;net452;net461</TargetFrameworks>
+    <TargetFrameworks>netstandard1.6;net452</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/TypeGap/TypeConverter.cs b/TypeGap/TypeConverter.cs
@@ -88,9 +88,19 @@ public string GetTypeScriptName(Type clrType)
                 return result;
             }
 
+            // these objects generally just mean json, so 'any' is appropriate.
+            if (clrType.Namespace == "Newtonsoft.Json.Linq")
+            {
+                return "any";
+            }
+
             // Dictionaries -- these should come before IEnumerables, because they also implement IEnumerable
             if (clrType.IsIDictionary())
             {
+                if (clrType.GenericTypeArguments.Length != 2)
+                    return "{ [key: string]: any }";
+
+                // TODO: can we use Map<> instead? this will break if the first argument is not string | number.
                 return $"{{ [key: {GetTypeScriptName(clrType.GetDnxCompatible().GetGenericArguments()[0])}]: {GetTypeScriptName(clrType.GetDnxCompatible().GetGenericArguments()[1])} }}";
             }
 

diff --git a/TypeGap/TypeGap.csproj b/TypeGap/TypeGap.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.6;net452;net461</TargetFrameworks>
+    <TargetFrameworks>netstandard1.6;net452</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.6' ">