Fix type literal as return type for function + Add more type literal …

…tests

Fix #58

src/Glutinum.Converter/Transform.fs

@@ -299,12 +299,14 @@ let private transformExports
         |> List.collect (
             function
             | GlueType.Variable info ->
+                let name, context = sanitizeNameAndPushScope info.Name context
+
                 {
                     Attributes = [ FSharpAttribute.Import(info.Name, "module") ]
-                    Name = Naming.sanitizeName info.Name
+                    Name = name
                     Parameters = []
                     TypeParameters = []
-                    Type = (transformType context) info.Type
+                    Type = transformType context info.Type
                     IsOptional = false
                     IsStatic = true
                     Accessor = None
@@ -314,9 +316,11 @@ let private transformExports
                 |> List.singleton
 
             | GlueType.FunctionDeclaration info ->
+                let name, context = sanitizeNameAndPushScope info.Name context
+
                 {
                     Attributes = [ FSharpAttribute.Import(info.Name, "module") ]
-                    Name = Naming.sanitizeName info.Name
+                    Name = name
                     Parameters =
                         info.Parameters |> List.map (transformParameter context)
                     TypeParameters =
@@ -332,6 +336,7 @@ let private transformExports
 
             | GlueType.ClassDeclaration info ->
                 // TODO: Handle constructor overloads
+                let name, context = sanitizeNameAndPushScope info.Name context
 
                 info.Constructors
                 |> List.map (fun (GlueConstructor parameters) ->
@@ -345,7 +350,7 @@ let private transformExports
                                     FSharpAttribute.EmitMacroConstructor
                                         info.Name
                             ]
-                        Name = Naming.sanitizeName info.Name
+                        Name = name
                         Parameters =
                             parameters |> List.map (transformParameter context)
                         TypeParameters =
@@ -1200,6 +1205,7 @@ let rec private transformToFsharp
         | GlueType.Discard
         | GlueType.TupleType _
         | GlueType.IntersectionType _
+        | GlueType.TypeLiteral _
         | GlueType.ThisType _ -> FSharpType.Discard
     )
 

tests/specs/references/typeLiteral/returnType/classMethod.d.ts

@@ -0,0 +1,3 @@
+export class Test {
+    now(): { day: number, month: number, year: number }
+}

tests/specs/references/typeLiteral/returnType/classMethod.fsx

@@ -0,0 +1,32 @@
+module rec Glutinum
+
+open Fable.Core
+open System
+
+[<Erase>]
+type Exports =
+    interface end
+
+[<AllowNullLiteral>]
+type Test =
+    abstract member now: unit -> Test.now
+
+module Test =
+
+    [<Global>]
+    [<AllowNullLiteral>]
+    type now
+        [<ParamObject; Emit("$0")>]
+        (
+            day: float,
+            month: float,
+            year: float
+        ) =
+
+        member val day : float = nativeOnly with get, set
+        member val month : float = nativeOnly with get, set
+        member val year : float = nativeOnly with get, set
+
+(***)
+#r "nuget: Fable.Core"
+(***)

tests/specs/references/typeLiteral/returnType/function.d.ts

@@ -0,0 +1 @@
+export function Test(): { a: string, b: number }

tests/specs/references/typeLiteral/returnType/function.fsx

@@ -0,0 +1,25 @@
+module rec Glutinum
+
+open Fable.Core
+open System
+
+[<Erase>]
+type Exports =
+    [<Import("Test", "module")>]
+    static member Test () : Test = nativeOnly
+
+[<Global>]
+[<AllowNullLiteral>]
+type Test
+    [<ParamObject; Emit("$0")>]
+    (
+        a: string,
+        b: float
+    ) =
+
+    member val a : string = nativeOnly with get, set
+    member val b : float = nativeOnly with get, set
+
+(***)
+#r "nuget: Fable.Core"
+(***)

tests/specs/references/typeLiteral/returnType/typeAliasMethod.d.ts

@@ -0,0 +1,3 @@
+export type Test = {
+    now(): { day: number, month: number, year: number }
+}

tests/specs/references/typeLiteral/returnType/typeAliasMethod.fsx

@@ -0,0 +1,28 @@
+module rec Glutinum
+
+open Fable.Core
+open System
+
+[<AllowNullLiteral>]
+type Test =
+    abstract member now: unit -> Test.now
+
+module Test =
+
+    [<Global>]
+    [<AllowNullLiteral>]
+    type now
+        [<ParamObject; Emit("$0")>]
+        (
+            day: float,
+            month: float,
+            year: float
+        ) =
+
+        member val day : float = nativeOnly with get, set
+        member val month : float = nativeOnly with get, set
+        member val year : float = nativeOnly with get, set
+
+(***)
+#r "nuget: Fable.Core"
+(***)

tests/specs/references/typeLiteral/typeAlias/arguments.d.ts

@@ -0,0 +1,3 @@
+export class Test {
+    date(config: { day: number, month: number, year: number }): string
+}

tests/specs/references/typeLiteral/typeAlias/arguments.fsx

@@ -0,0 +1,34 @@
+module rec Glutinum
+
+open Fable.Core
+open System
+
+[<Erase>]
+type Exports =
+    interface end
+
+[<AllowNullLiteral>]
+type Test =
+    abstract member date: config: Test.date.config -> string
+
+module Test =
+
+    module date =
+
+        [<Global>]
+        [<AllowNullLiteral>]
+        type config
+            [<ParamObject; Emit("$0")>]
+            (
+                day: float,
+                month: float,
+                year: float
+            ) =
+
+            member val day : float = nativeOnly with get, set
+            member val month : float = nativeOnly with get, set
+            member val year : float = nativeOnly with get, set
+
+(***)
+#r "nuget: Fable.Core"
+(***)