Merge branch 'nagareyama' into loader-cache

Author: alfonsogarciacaro

.vscode/launch.json

@@ -4,6 +4,17 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
+        {
+            "name": "Fable TCP server",
+            "type": "coreclr",
+            "request": "launch",
+            "program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/netcoreapp2.1/Fable.Cli.dll",
+            "args": ["start", "--port", "61225"],
+            "cwd": "${workspaceFolder}",
+            "stopAtEntry": false,
+            "console": "internalConsole"
+        },
+
         {
             "type": "node",
             "name": "fable-splitter",
@@ -42,6 +53,7 @@
             "program": "${workspaceRoot}/src/quicktest/bin/QuickTest.js",
             "args": ["--help"],
             "cwd": "${workspaceRoot}/src/quicktest",
+            "sourceMaps": false,
             "stopOnEntry": true
         },
         {

src/Fable.Cli/Fable.Cli.fsproj

@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <!-- Allow users with dotnet SDK 3 to run Fable, see #1910 -->
     <RollForward>Major</RollForward>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>

src/Fable.Core/Fable.Core.JsInterop.fs

@@ -33,6 +33,10 @@ let (==>) (key: string) (v: obj): string*obj = jsNative
 /// E.g. `createNew myCons (arg1, arg2)` in JS becomes `new myCons(arg1, arg2)`
 let createNew (o: obj) (args: obj): obj = jsNative
 
+/// Destructure a tuple of arguments and applies to literal JS code as with EmitAttribute.
+/// E.g. `emitJs "$0 + $1" (arg1, arg2)` in JS becomes `arg1 + arg2`
+let emitJs (jsCode: string) (args: obj): 'T = jsNative
+
 /// Create a literal JS object from a collection of key-value tuples.
 /// E.g. `createObj [ "a" ==> 5 ]` in JS becomes `{ a: 5 }`
 let createObj (fields: #seq<string*obj>): obj = jsNative

src/Fable.Core/Fable.Core.Types.fs

@@ -20,6 +20,7 @@ type MangleAttribute() =
 /// More info: http://fable.io/docs/interacting.html#Erase-attribute
 type EraseAttribute() =
     inherit Attribute()
+    new (caseRules: CaseRules) = EraseAttribute()
 
 /// The module, type, function... is globally accessible in JS.
 /// More info: http://fable.io/docs/interacting.html#Import-attribute

src/Fable.Transforms/AST/AST.Fable.fs

@@ -25,7 +25,6 @@ type Type =
     | List of genericArg: Type
     | FunctionType of FunctionTypeKind * returnType: Type
     | GenericParam of name: string
-    | ErasedUnion of genericArgs: Type list
     | DeclaredType of FSharpEntity * genericArgs: Type list
     | AnonymousRecordType of fieldNames: string [] * genericArgs: Type list
 
@@ -37,7 +36,6 @@ type Type =
         | FunctionType (LambdaType argType, returnType) -> [ argType; returnType ]
         | FunctionType (DelegateType argTypes, returnType) -> argTypes @ [ returnType ]
         | Tuple gen -> gen
-        | ErasedUnion gen -> gen
         | DeclaredType (_, gen) -> gen
         | _ -> []
 
@@ -53,64 +51,71 @@ type Type =
             let argTypes, returnType = List.splitLast newGen
             FunctionType(DelegateType argTypes, returnType)
         | Tuple _ -> Tuple newGen
-        | ErasedUnion _ -> ErasedUnion newGen
         | DeclaredType (ent, _) -> DeclaredType(ent, newGen)
         | t -> t
 
-type ModuleMemberInfo =
-    { Name: string
-      IsValue: bool
-      IsPublic: bool
-      IsMutable: bool
-      IsEntryPoint: bool
-      HasSpread: bool
-      Range: SourceLocation option }
+type MemberInfo(name, ?declaringEntity, ?hasSpread, ?isValue, ?range) =
+    member _.Name: string = name
+    member _.IsValue = defaultArg isValue false
+    member _.HasSpread = defaultArg hasSpread false
+    member _.DeclaringEntity: FSharpEntity option = declaringEntity
+    member _.Range: SourceLocation option = range
+
+type ModuleMemberInfo(name, ?declaringEntity, ?hasSpread, ?isValue, ?isPublic,
+                      ?isInstance, ?isMutable, ?isEntryPoint, ?range) =
+    inherit MemberInfo(name, ?declaringEntity=declaringEntity, ?hasSpread=hasSpread, ?isValue=isValue, ?range=range)
+
+    member _.IsPublic = defaultArg isPublic false
+    member _.IsInstance = defaultArg isInstance false
+    member _.IsMutable = defaultArg isMutable false
+    member _.IsEntryPoint = defaultArg isEntryPoint false
+
+type AttachedMemberInfo(name, declaringEntity, ?hasSpread, ?isValue,
+                        ?isGetter, ?isSetter, ?isEnumerator, ?range) =
+    inherit MemberInfo(name, ?declaringEntity=declaringEntity, ?hasSpread=hasSpread, ?isValue=isValue, ?range=range)
+
+    member _.IsGetter = defaultArg isGetter false
+    member _.IsSetter = defaultArg isSetter false
+    member _.IsEnumerator = defaultArg isEnumerator false
 
-type AttachedMemberInfo =
-    { Name: string
-      EntityName: string
-      IsValue: bool
-      IsGetter: bool
-      IsSetter: bool
-      IsEnumerator: bool
-      HasSpread: bool
-      Range: SourceLocation option }
     member this.IsMethod =
         not this.IsValue && not this.IsGetter && not this.IsSetter && not this.IsEnumerator
 
-type ClassImplicitConstructorInfo =
-    { Name: string
-      Entity: FSharpEntity
-      EntityName: string
-      IsEntityPublic: bool
-      IsConstructorPublic: bool
-      HasSpread: bool
-      Base: Expr option
-      Arguments: Ident list
-      BoundConstructorThis: Ident
-      Body: Expr }
-
-type UnionConstructorInfo =
-    { Entity: FSharpEntity
-      EntityName: string
-      IsPublic: bool }
-
-type CompilerGeneratedConstructorInfo =
-    { Entity: FSharpEntity
-      EntityName: string
-      IsPublic: bool }
-
-type ConstructorKind =
-    | ClassImplicitConstructor of ClassImplicitConstructorInfo
-    | UnionConstructor of UnionConstructorInfo
-    | CompilerGeneratedConstructor of CompilerGeneratedConstructorInfo
+type ConstructorInfo(entity, entityName, ?isEntityPublic, ?isUnion, ?range) =
+    member _.Entity: FSharpEntity = entity
+    member _.EntityName: string = entityName
+    member _.IsEntityPublic = defaultArg isEntityPublic false
+    member _.IsUnion = defaultArg isUnion false
+    member _.Range: SourceLocation option = range
+
+type ClassImplicitConstructorInfo(entity, constructorName, entityName,
+                                  arguments, boundThis, body, baseCall,
+                                  ?hasSpread, ?isConstructorPublic,
+                                  ?isEntityPublic, ?range) =
+    inherit ConstructorInfo(entity, entityName, ?isEntityPublic=isEntityPublic, ?range=range)
+
+    member _.ConstructorName: string = constructorName
+    member _.Arguments: Ident list = arguments
+    member _.BoundThis: Ident = boundThis
+    member _.Body: Expr = body
+    member _.BaseCall: Expr option = baseCall
+    member _.IsConstructorPublic = defaultArg isConstructorPublic false
+    member _.HasSpread = defaultArg hasSpread false
+
+    member _.WithBodyAndBaseCall(body, baseCall) =
+        ClassImplicitConstructorInfo(entity, constructorName, entityName, arguments, boundThis,
+            body, baseCall, ?hasSpread=hasSpread, ?isConstructorPublic=isConstructorPublic,
+            ?isEntityPublic=isEntityPublic, ?range=range)
 
 type Declaration =
     | ActionDeclaration of Expr
     /// Note: Non-attached type members become module members
     | ModuleMemberDeclaration of args: Ident list * body: Expr * ModuleMemberInfo
-    | AttachedMemberDeclaration of args: Ident list * body: Expr * AttachedMemberInfo
-    | ConstructorDeclaration of ConstructorKind * SourceLocation option
+    /// Interface and abstract class implementations
+    | AttachedMemberDeclaration of args: Ident list * body: Expr * AttachedMemberInfo * declaringEntity: FSharpEntity
+    /// For unions, records and structs
+    | CompilerGeneratedConstructorDeclaration of ConstructorInfo
+    | ClassImplicitConstructorDeclaration of ClassImplicitConstructorInfo
 
 type File(sourcePath, decls, ?usedVarNames, ?inlineDependencies) =
     member __.SourcePath: string = sourcePath
@@ -179,7 +184,6 @@ type ValueKind =
     | NewTuple of Expr list
     | NewRecord of Expr list * NewRecordKind * genArgs: Type list
     | NewUnion of Expr list * FSharpUnionCase * FSharpEntity * genArgs: Type list
-    | NewErasedUnion of Expr list * genericArgs: Type list
     member this.Type =
         match this with
         | TypeInfo _ -> MetaType
@@ -200,7 +204,6 @@ type ValueKind =
             | DeclaredRecord ent -> DeclaredType(ent, genArgs)
             | AnonymousRecord fieldNames -> AnonymousRecordType(fieldNames, genArgs)
         | NewUnion (_, _, ent, genArgs) -> DeclaredType(ent, genArgs)
-        | NewErasedUnion (_, genArgs) -> ErasedUnion genArgs
 
 type LoopKind =
     | While of guard: Expr * body: Expr
@@ -210,55 +213,32 @@ type FunctionKind =
     | Lambda of arg: Ident
     | Delegate of args: Ident list
 
-type SpreadKind =
-    | NoSpread
-    /// The ... spread operator will be applied to last argument
-    | SeqSpread
-    /// If the argument is a tuple apply its members as separate arguments
-    /// (Used for dynamic calls like `foo?bar(4, 5, 6)`)
-    | TupleSpread
-
-type CallKind =
-    /// Constructor calls will add the `new` keyword in JS
-    | ConstructorCall of Expr
-    /// Static calls contain a direct reference to the function and will pass `ThisArg` as first argument
-    | StaticCall of Expr
-    /// Instance calls will be applied to `ThisArg` (optionally through member access)
-    | InstanceCall of memb: Expr option
-
-type SignatureKind =
-    /// Argument expected types will be checked for the uncurrying optimization
-    | Typed of Type list
-    /// Nested function arguments will be automatically uncurried
-    | AutoUncurrying
-    /// Arguments won't be uncurried
-    | NoUncurrying
-
-type ArgInfo =
+type CallInfo =
     { ThisArg: Expr option
       Args: Expr list
       /// Argument types as defined in the method signature, this may be slightly different to types of actual argument expressions.
       /// E.g.: signature accepts 'a->'b->'c (2-arity) but we pass int->int->int->int (3-arity)
-      SignatureArgTypes: SignatureKind
-      Spread: SpreadKind
-      IsBaseCall: bool
-      IsSelfConstructorCall: bool }
+      SignatureArgTypes: Type list
+      HasSpread: bool
+      AutoUncurrying: bool
+      /// Must apply `new` keyword when converted to JS
+      IsJsConstructor: bool }
 
 type ReplaceCallInfo =
     { CompiledName: string
       OverloadSuffix: Lazy<string>
       /// See ArgIngo.SignatureArgTypes
       SignatureArgTypes: Type list
-      Spread: SpreadKind
+      HasSpread: bool
       IsModuleValue: bool
       IsInterface: bool
       DeclaringEntityFullName: string
       GenericArgs: (string * Type) list }
 
 type OperationKind =
-    | Call of kind: CallKind * info: ArgInfo
+    | Call of callee: Expr * info: CallInfo
     | CurriedApply of applied: Expr * args: Expr list
-    | Emit of macro: string * args: ArgInfo option
+    | Emit of macro: string * args: CallInfo option
     | UnaryOperation of UnaryOperator * Expr
     | BinaryOperation of BinaryOperator * left: Expr * right: Expr
     | LogicalOperation of LogicalOperator * left: Expr * right: Expr