Transform TypeScriptReader from an object expression to an interfac…

…e `ITypeScriptReader` to work around a bug in Fable See fable-compiler/Fable#3779
glutinum-org · Mar 9, 2024 · 523d567 · 523d567
1 parent 85fd7a7
commit 523d567
Show file tree

Hide file tree

Showing 20 changed files with 36 additions and 26 deletions.
diff --git a/src/Glutinum.Build/Web.fs b/src/Glutinum.Build/Web.fs
@@ -61,6 +61,7 @@ let handle (args: string list) =
             |> CmdLine.appendRaw "fable"
             |> CmdLine.appendRaw "--noCache"
             |> CmdLine.appendRaw "--verbose"
+            |> CmdLine.appendPrefix "--define" "DEBUG"
             |> CmdLine.toString,
             workingDirectory = "src/Glutinum.Web"
         )

diff --git a/src/Glutinum.Converter.CLI/packages.lock.json b/src/Glutinum.Converter.CLI/packages.lock.json
@@ -4,9 +4,9 @@
     ".NETStandard,Version=v2.0": {
       "Fable.Core": {
         "type": "Direct",
-        "requested": "[4.2.0, )",
-        "resolved": "4.2.0",
-        "contentHash": "ikacgHRLZpNVS33oBzl4uDHXZJDH660SaNPYCDGvFb7Hhm4WCXq0qTik8bpPJAhCnLDVrXLCAIoGKsKQ5pfx2A=="
+        "requested": "[4.3.0, )",
+        "resolved": "4.3.0",
+        "contentHash": "sbK+hYs7H7I3b3sbgttI4GlvQfNPcIqSz1qPSagF3QbVA46KJ/pWSXC/Dwv0s9M6AeRGmoqcIeD7GUaLn41zkA=="
       },
       "FSharp.Core": {
         "type": "Direct",

diff --git a/src/Glutinum.Converter/Read.fs b/src/Glutinum.Converter/Read.fs
@@ -1,12 +1,14 @@
 module rec Glutinum.Converter.Read
 
 open TypeScript
+open Glutinum.Converter.Reader.Types
+open Glutinum.Converter.Reader.TypeScriptReader
 
 let readSourceFile
     (checker: Ts.TypeChecker)
     (sourceFile: option<Ts.SourceFile>)
     =
-    let reader = Reader.TypeScriptReader.typeScriptReader checker
+    let reader: ITypeScriptReader = TypeScriptReader(checker)
 
     {|
         GlueAST =

diff --git a/src/Glutinum.Converter/Reader/ClassDeclaration.fs b/src/Glutinum.Converter/Reader/ClassDeclaration.fs
@@ -5,7 +5,7 @@ open Glutinum.Converter.Reader.Types
 open TypeScript
 
 let readClassDeclaration
-    (reader: TypeScriptReader)
+    (reader: ITypeScriptReader)
     (classDeclaration: Ts.ClassDeclaration)
     : GlueClassDeclaration
     =

diff --git a/src/Glutinum.Converter/Reader/EnumDeclaration.fs b/src/Glutinum.Converter/Reader/EnumDeclaration.fs
@@ -76,7 +76,7 @@ let private readEnumMembers
     |}
 
 let readEnumDeclaration
-    (reader: TypeScriptReader)
+    (reader: ITypeScriptReader)
     (enumDeclaration: Ts.EnumDeclaration)
     : GlueEnum
     =

diff --git a/src/Glutinum.Converter/Reader/FunctionDeclaration.fs b/src/Glutinum.Converter/Reader/FunctionDeclaration.fs
@@ -6,7 +6,7 @@ open TypeScript
 open Fable.Core.JsInterop
 
 let readFunctionDeclaration
-    (reader: TypeScriptReader)
+    (reader: ITypeScriptReader)
     (declaration: Ts.FunctionDeclaration)
     : GlueFunctionDeclaration
     =

diff --git a/src/Glutinum.Converter/Reader/IndexedAccessType.fs b/src/Glutinum.Converter/Reader/IndexedAccessType.fs
@@ -5,7 +5,7 @@ open Glutinum.Converter.Reader.Types
 open TypeScript
 
 let readIndexedAccessType
-    (reader: TypeScriptReader)
+    (reader: ITypeScriptReader)
     (declaration: Ts.IndexedAccessType)
     : GlueType
     =

diff --git a/src/Glutinum.Converter/Reader/InterfaceDeclaration.fs b/src/Glutinum.Converter/Reader/InterfaceDeclaration.fs
@@ -5,7 +5,7 @@ open Glutinum.Converter.GlueAST
 open Glutinum.Converter.Reader.Types
 
 let readInterfaceDeclaration
-    (reader: TypeScriptReader)
+    (reader: ITypeScriptReader)
     (declaration: Ts.InterfaceDeclaration)
     : GlueInterface
     =

diff --git a/src/Glutinum.Converter/Reader/ModuleDeclaration.fs b/src/Glutinum.Converter/Reader/ModuleDeclaration.fs
@@ -5,7 +5,7 @@ open Glutinum.Converter.Reader.Types
 open TypeScript
 
 let readModuleDeclaration
-    (reader: TypeScriptReader)
+    (reader: ITypeScriptReader)
     (declaration: Ts.ModuleDeclaration)
     : GlueModuleDeclaration
     =

diff --git a/src/Glutinum.Converter/Reader/NamedDeclaration.fs b/src/Glutinum.Converter/Reader/NamedDeclaration.fs
@@ -6,7 +6,7 @@ open TypeScript
 open Fable.Core.JsInterop
 
 let readNamedDeclaration
-    (reader: TypeScriptReader)
+    (reader: ITypeScriptReader)
     (declaration: Ts.NamedDeclaration)
     : GlueMember
     =

diff --git a/src/Glutinum.Converter/Reader/Node.fs b/src/Glutinum.Converter/Reader/Node.fs
@@ -4,7 +4,7 @@ open Glutinum.Converter.GlueAST
 open Glutinum.Converter.Reader.Types
 open TypeScript
 
-let readNode (reader: TypeScriptReader) (node: Ts.Node) : GlueType =
+let readNode (reader: ITypeScriptReader) (node: Ts.Node) : GlueType =
     match node.kind with
     | Ts.SyntaxKind.EnumDeclaration ->
         reader.ReadEnumDeclaration(node :?> Ts.EnumDeclaration)
@@ -39,6 +39,8 @@ let readNode (reader: TypeScriptReader) (node: Ts.Node) : GlueType =
                 $"Unsupported node kind %A{unsupported}"
                 node
 
+        printfn "Warning: %s" warning
+
         reader.Warnings.Add warning
 
         GlueType.Discard
diff --git a/src/Glutinum.Converter/Reader/Parameters.fs b/src/Glutinum.Converter/Reader/Parameters.fs
@@ -5,7 +5,7 @@ open Glutinum.Converter.Reader.Types
 open TypeScript
 
 let readParameters
-    (reader: TypeScriptReader)
+    (reader: ITypeScriptReader)
     (parameters: ResizeArray<Ts.ParameterDeclaration>)
     =
     parameters

diff --git a/src/Glutinum.Converter/Reader/TypeAliasDeclaration.fs b/src/Glutinum.Converter/Reader/TypeAliasDeclaration.fs
@@ -5,7 +5,7 @@ open Glutinum.Converter.Reader.Types
 open TypeScript
 
 let readTypeAliasDeclaration
-    (reader: TypeScriptReader)
+    (reader: ITypeScriptReader)
     (declaration: Ts.TypeAliasDeclaration)
     : GlueType
     =

diff --git a/src/Glutinum.Converter/Reader/TypeNode.fs b/src/Glutinum.Converter/Reader/TypeNode.fs
@@ -7,7 +7,11 @@ open Fable.Core.JsInterop
 open Fable.Core.JS
 open Glutinum.Converter.Reader.Utils
 
-let readTypeNode (reader: TypeScriptReader) (typeNode: Ts.TypeNode) : GlueType =
+let readTypeNode
+    (reader: ITypeScriptReader)
+    (typeNode: Ts.TypeNode)
+    : GlueType
+    =
     let checker = reader.checker
 
     match typeNode.kind with

diff --git a/src/Glutinum.Converter/Reader/TypeOperatorNode.fs b/src/Glutinum.Converter/Reader/TypeOperatorNode.fs
@@ -6,7 +6,7 @@ open TypeScript
 open Fable.Core.JsInterop
 
 let readTypeOperatorNode
-    (reader: TypeScriptReader)
+    (reader: ITypeScriptReader)
     (node: Ts.TypeOperatorNode)
     =
 

diff --git a/src/Glutinum.Converter/Reader/TypeParameters.fs b/src/Glutinum.Converter/Reader/TypeParameters.fs
@@ -6,7 +6,7 @@ open TypeScript
 open Fable.Core.JsInterop
 
 let readTypeParameters
-    (reader: TypeScriptReader)
+    (reader: ITypeScriptReader)
     (typeParameters: ResizeArray<Ts.TypeParameterDeclaration> option)
     : GlueTypeParameter list
     =

diff --git a/src/Glutinum.Converter/Reader/TypeScriptReader.fs b/src/Glutinum.Converter/Reader/TypeScriptReader.fs
@@ -19,10 +19,11 @@ open Glutinum.Converter.Reader.TypeParameters
 open Glutinum.Converter.Reader.UnionTypeNode
 open Glutinum.Converter.Reader.VariableStatement
 
-let typeScriptReader checker =
+type TypeScriptReader(checker: Ts.TypeChecker) =
     let warnings = ResizeArray<string>()
 
-    { new TypeScriptReader(checker) with
+    interface ITypeScriptReader with
+
         override _.checker: Ts.TypeChecker = checker
 
         member _.Warnings = warnings
@@ -70,7 +71,7 @@ let typeScriptReader checker =
             readTypeAliasDeclaration this typeAliasDeclaration
 
         member this.ReadTypeNode(typNode: Ts.TypeNode) : GlueType =
-            this.ReadTypeNode(Some typNode)
+            (this :> ITypeScriptReader).ReadTypeNode(Some typNode)
 
         member this.ReadTypeNode(typNode: Ts.TypeNode option) : GlueType =
             match typNode with
@@ -112,4 +113,3 @@ let typeScriptReader checker =
             : GlueTypeParameter list
             =
             readTypeParameters this typeParametersOpt
-    }
diff --git a/src/Glutinum.Converter/Reader/Types.fs b/src/Glutinum.Converter/Reader/Types.fs
@@ -1,12 +1,13 @@
 module Glutinum.Converter.Reader.Types
 
+open Fable.Core
 open TypeScript
 open Glutinum.Converter.GlueAST
 
 exception TypeScriptReaderException of message: string
 
-[<AbstractClass>]
-type TypeScriptReader(checker: Ts.TypeChecker) =
+[<Mangle>]
+type ITypeScriptReader =
     abstract checker: Ts.TypeChecker with get
     abstract Warnings: ResizeArray<string> with get
 

diff --git a/src/Glutinum.Converter/Reader/UnionTypeNode.fs b/src/Glutinum.Converter/Reader/UnionTypeNode.fs
@@ -7,7 +7,7 @@ open TypeScript
 open Fable.Core.JsInterop
 
 let rec private readUnionTypeCases
-    (reader: TypeScriptReader)
+    (reader: ITypeScriptReader)
     (unionTypeNode: Ts.UnionTypeNode)
     : GlueTypeUnion
     =
@@ -143,7 +143,7 @@ let rec private readUnionTypeCases
     |> GlueTypeUnion
 
 let readUnionTypeNode
-    (reader: TypeScriptReader)
+    (reader: ITypeScriptReader)
     (unionTypeNode: Ts.UnionTypeNode)
     : GlueType
     =

diff --git a/src/Glutinum.Converter/Reader/VariableStatement.fs b/src/Glutinum.Converter/Reader/VariableStatement.fs
@@ -6,7 +6,7 @@ open TypeScript
 open Fable.Core.JsInterop
 
 let readVariableStatement
-    (reader: TypeScriptReader)
+    (reader: ITypeScriptReader)
     (statement: Ts.VariableStatement)
     : GlueType
     =