Add preliminary support for Mapped Types

src/Glutinum.Converter/GlueAST.fs

@@ -266,6 +266,18 @@ type GlueUtilityType =
     | Record of GlueRecord
 // | ReadOnly of GlueType
 
+type GlueMappedType =
+    {
+        TypeParameter: GlueTypeParameter
+        Type: GlueType option
+    }
+
+type GlueIndexedAccessType =
+    {
+        IndexType: GlueType
+        ObjectType: GlueType
+    }
+
 [<RequireQualifiedAccess>]
 type GlueType =
     | Discard
@@ -278,7 +290,7 @@ type GlueType =
     | Union of GlueTypeUnion
     | Literal of GlueLiteral
     | KeyOf of GlueType
-    | IndexedAccessType of GlueType
+    | IndexedAccessType of GlueIndexedAccessType
     | ModuleDeclaration of GlueModuleDeclaration
     | ClassDeclaration of GlueClassDeclaration
     | TypeReference of GlueTypeReference
@@ -295,6 +307,7 @@ type GlueType =
     | ExportDefault of GlueType
     | TemplateLiteral
     | UtilityType of GlueUtilityType
+    | MappedType of GlueMappedType
 
     member this.Name =
         match this with
@@ -340,3 +353,4 @@ type GlueType =
             match utilityType with
             | GlueUtilityType.Partial _
             | GlueUtilityType.Record _ -> "obj"
+        | MappedType _ -> "anonymous"

src/Glutinum.Converter/Glutinum.Converter.fsproj

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Version>0.1.0-alpha-001</Version>
@@ -12,6 +11,7 @@
     <Compile Include="Utils/List.fs" />
     <Compile Include="Log.fs" />
     <Compile Include="TypeScript.fs" />
+    <Compile Include="TypeScriptHelpers.fs" />
     <Compile Include="GlueAST.fs" />
     <Compile Include="Reader/Types.fs" />
     <Compile Include="Reader/Utils.fs" />
@@ -29,6 +29,7 @@
     <Compile Include="Reader/TypeOperatorNode.fs" />
     <Compile Include="Reader/TypeParameters.fs" />
     <Compile Include="Reader/UnionTypeNode.fs" />
+    <Compile Include="Reader/MappedTypeNode.fs" />
     <Compile Include="Reader/VariableStatement.fs" />
     <Compile Include="Reader/ExportAssignment.fs" />
     <Compile Include="Reader/Documentation.fs" />
@@ -47,4 +48,4 @@
     <PackageReference Include="Fable.Promise" />
     <PackageReference Include="Glutinum.Chalk" />
   </ItemGroup>
-</Project>
+</Project>

src/Glutinum.Converter/Reader/Declaration.fs

@@ -4,6 +4,7 @@ open Glutinum.Converter.GlueAST
 open Glutinum.Converter.Reader.Utils
 open Glutinum.Converter.Reader.Types
 open TypeScript
+open TypeScriptHelpers
 open Fable.Core.JsInterop
 
 let readDeclaration
@@ -179,6 +180,6 @@ let readDeclaration
     | _ ->
         generateReaderError
             "declaration"
-            $"Unsupported kind %A{declaration.kind}"
+            $"Unsupported kind {SyntaxKind.name declaration.kind} in {__SOURCE_FILE__}"
             declaration
         |> failwith

src/Glutinum.Converter/Reader/IndexedAccessType.fs

@@ -3,30 +3,59 @@ module Glutinum.Converter.Reader.IndexedAccessType
 open Glutinum.Converter.GlueAST
 open Glutinum.Converter.Reader.Types
 open TypeScript
+open TypeScriptHelpers
 
 let readIndexedAccessType
     (reader: ITypeScriptReader)
     (declaration: Ts.IndexedAccessType)
     : GlueType
     =
 
-    let nodeType = declaration.indexType :?> Ts.TypeNode
+    let indexType =
+        let idxNodeType = declaration.indexType :?> Ts.TypeNode
 
-    let typ =
-        match nodeType.kind with
+        match idxNodeType.kind with
         | Ts.SyntaxKind.TypeOperator ->
             let typeOperatorNode = declaration.indexType :?> Ts.TypeOperatorNode
             reader.ReadTypeOperatorNode typeOperatorNode
 
+        | Ts.SyntaxKind.NumberKeyword ->
+            // failwith "Got number keyword"
+            let numberKeywordNode = declaration.indexType :?> Ts.KeywordTypeNode
+            reader.ReadTypeNode(numberKeywordNode)
+
+        | unsupported ->
+            let warning =
+                Utils.generateReaderError
+                    "readIndexedAccessType"
+                    $"Unsupported node kind {SyntaxKind.name unsupported} in {__SOURCE_FILE__}:{__LINE__}"
+                    idxNodeType
+
+            reader.Warnings.Add warning
+
+            GlueType.Discard
+
+    let objectType =
+        let objNodeType = declaration.objectType :?> Ts.TypeNode
+
+        match objNodeType.kind with
+        | Ts.SyntaxKind.ParenthesizedType ->
+            let pType = declaration.objectType :?> Ts.ParenthesizedTypeNode
+            reader.ReadTypeNode pType
+
         | unsupported ->
             let warning =
                 Utils.generateReaderError
                     "readIndexedAccessType"
-                    $"Unsupported node kind %A{unsupported}"
-                    nodeType
+                    $"Unsupported node kind {SyntaxKind.name unsupported} in {__SOURCE_FILE__}:{__LINE__}"
+                    objNodeType
 
             reader.Warnings.Add warning
 
             GlueType.Discard
 
-    GlueType.IndexedAccessType typ
+    GlueType.IndexedAccessType
+        {
+            IndexType = indexType
+            ObjectType = objectType
+        }

src/Glutinum.Converter/Reader/MappedTypeNode.fs

@@ -0,0 +1,24 @@
+module Glutinum.Converter.Reader.MappedTypeNode
+
+open Glutinum.Converter.GlueAST
+open Glutinum.Converter.Reader.Types
+open TypeScript
+
+let readMappedTypeNode
+    (reader: ITypeScriptReader)
+    (mappedTypeNode: Ts.MappedTypeNode)
+    : GlueType
+    =
+
+    let typParam =
+        // TODO: Make a single reader.ReadTypeParameter method
+        reader.ReadTypeParameters(
+            Some(ResizeArray([ mappedTypeNode.typeParameter ]))
+        )
+        |> List.head
+
+    {
+        TypeParameter = typParam
+        Type = mappedTypeNode.``type`` |> Option.map reader.ReadNode
+    }
+    |> GlueType.MappedType

src/Glutinum.Converter/Reader/Node.fs

@@ -3,6 +3,7 @@ module Glutinum.Converter.Reader.Node
 open Glutinum.Converter.GlueAST
 open Glutinum.Converter.Reader.Types
 open TypeScript
+open TypeScriptHelpers
 
 let readNode (reader: ITypeScriptReader) (node: Ts.Node) : GlueType =
     match node.kind with
@@ -47,11 +48,13 @@ let readNode (reader: ITypeScriptReader) (node: Ts.Node) : GlueType =
 
     | Ts.SyntaxKind.ExportDeclaration -> GlueType.Discard
 
+    | Ts.SyntaxKind.BooleanKeyword -> reader.ReadTypeNode(node :?> Ts.TypeNode)
+
     | unsupported ->
         let warning =
             Utils.generateReaderError
                 "node"
-                $"Unsupported node kind %A{unsupported}"
+                $"Unsupported node kind {SyntaxKind.name unsupported} at {__SOURCE_FILE__}"
                 node
 
         reader.Warnings.Add warning

src/Glutinum.Converter/Reader/Parameters.fs

@@ -3,6 +3,7 @@ module Glutinum.Converter.Reader.Parameters
 open Glutinum.Converter.GlueAST
 open Glutinum.Converter.Reader.Types
 open TypeScript
+open TypeScriptHelpers
 
 let readParameters
     (reader: ITypeScriptReader)
@@ -23,7 +24,7 @@ let readParameters
             | _ ->
                 Utils.generateReaderError
                     "name"
-                    $"Unsupported kind %A{nameNode.kind}"
+                    $"Unsupported kind {SyntaxKind.name nameNode.kind} in {__SOURCE_FILE__}"
                     nameNode
                 |> reader.Warnings.Add
 

src/Glutinum.Converter/Reader/TypeAliasDeclaration.fs

@@ -25,6 +25,10 @@ let readTypeAliasDeclaration
             let declaration = declaration.``type`` :?> Ts.IndexedAccessType
             reader.ReadIndexedAccessType declaration
 
+        | Ts.SyntaxKind.MappedType ->
+            let mappedTypeNode = declaration.``type`` :?> Ts.MappedTypeNode
+            reader.ReadMappedTypeNode mappedTypeNode
+
         | _ -> reader.ReadTypeNode declaration.``type``
 
     {

src/Glutinum.Converter/Reader/TypeNode.fs

@@ -3,6 +3,7 @@ module Glutinum.Converter.Reader.TypeNode
 open Glutinum.Converter.GlueAST
 open Glutinum.Converter.Reader.Types
 open TypeScript
+open TypeScriptHelpers
 open Fable.Core.JsInterop
 open Fable.Core.JS
 open Glutinum.Converter.Reader.Utils
@@ -37,6 +38,7 @@ let private readTypeUsingFlags (reader: ITypeScriptReader) (typ: Ts.Type) =
             | _ -> reader.ReadNode declaration
 
         | None -> GlueType.Primitive GluePrimitive.Any
+
     | HasTypeFlags Ts.TypeFlags.String ->
         GlueType.Primitive GluePrimitive.String
     | HasTypeFlags Ts.TypeFlags.Number ->
@@ -100,15 +102,14 @@ module UtilityType =
             if aliasTypeArguments.Count <> 1 then
                 GlueType.Discard
             else
-                let symbol = aliasTypeArguments.[0].symbol
+                let symbol = aliasTypeArguments.[0].getSymbol ()
 
-                if isNull symbol || symbol.members.IsNone then
-                    GlueType.Unknown
-                else
+                match symbol |> Option.bind _.members with
+                | None -> GlueType.Unknown
+                | Some members ->
 
                     // Take any of the members
-                    let (_, refMember) =
-                        symbol.members.Value.entries () |> Seq.head
+                    let (_, refMember) = members.entries () |> Seq.head
 
                     let originalType = refMember.declarations.Value[0].parent
 
@@ -223,7 +224,25 @@ let readTypeNode
 
         let typ = checker.getTypeAtLocation !!typeNodeQuery.exprName
 
-        readTypeUsingFlags reader typ
+        // This is safe as both cases have a `kind` field
+        let exprNameKind: Ts.SyntaxKind = typeNodeQuery.exprName?kind
+        // This logic is highly overlapping with readTypeUsingFlags
+        // It should be refactored to achieve a sane flow
+        match typ.flags, typ.getSymbol (), exprNameKind with
+        | HasTypeFlags Ts.TypeFlags.Object, None, Ts.SyntaxKind.Identifier ->
+            let exprName: Ts.Identifier = !!typeNodeQuery.exprName
+
+            let aliasSymbol = checker.getSymbolAtLocation(exprName).Value
+
+            let typNode: Ts.TypeNode =
+                aliasSymbol.declarations.Value[0]?``type``
+
+            match typNode.kind with
+            | Ts.SyntaxKind.TypeOperator ->
+                reader.ReadTypeOperatorNode(unbox typNode)
+            | _ -> readTypeUsingFlags reader typ
+
+        | _ -> readTypeUsingFlags reader typ
 
     | Ts.SyntaxKind.LiteralType ->
         let literalTypeNode = typeNode :?> Ts.LiteralTypeNode
@@ -392,10 +411,14 @@ let readTypeNode
 
     | Ts.SyntaxKind.TemplateLiteralType -> GlueType.TemplateLiteral
 
+    | Ts.SyntaxKind.IndexedAccessType ->
+        let indexedAccessType = typeNode :?> Ts.IndexedAccessType
+        reader.ReadIndexedAccessType indexedAccessType
+
     | _ ->
         generateReaderError
             "type node"
-            $"Unsupported kind %A{typeNode.kind}"
+            $"Unsupported kind {SyntaxKind.name typeNode.kind} in {__SOURCE_FILE__}"
             typeNode
         |> reader.Warnings.Add
 

src/Glutinum.Converter/Reader/TypeScriptReader.fs

@@ -8,6 +8,7 @@ open Glutinum.Converter.Reader.EnumDeclaration
 open Glutinum.Converter.Reader.FunctionDeclaration
 open Glutinum.Converter.Reader.IndexedAccessType
 open Glutinum.Converter.Reader.InterfaceDeclaration
+open Glutinum.Converter.Reader.MappedTypeNode
 open Glutinum.Converter.Reader.ModuleDeclaration
 open Glutinum.Converter.Reader.Declaration
 open Glutinum.Converter.Reader.Node
@@ -146,3 +147,9 @@ type TypeScriptReader(checker: Ts.TypeChecker) =
             : GlueType
             =
             readNamedTupleMember this namedTupleMember
+
+        member this.ReadMappedTypeNode
+            (declaration: Ts.MappedTypeNode)
+            : GlueType
+            =
+            readMappedTypeNode this declaration

src/Glutinum.Converter/Reader/Types.fs

@@ -55,6 +55,8 @@ type ITypeScriptReader =
     abstract ReadIndexedAccessType:
         declaration: Ts.IndexedAccessType -> GlueType
 
+    abstract ReadMappedTypeNode: declaration: Ts.MappedTypeNode -> GlueType
+
     abstract ReadTypeParameters:
         typeParametersOpt: ResizeArray<Ts.TypeParameterDeclaration> option ->
             GlueTypeParameter list