Fix fable-standalone build

Author: alfonsogarciacaro

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

@@ -217,6 +217,11 @@ type EmitInfo =
       Args: Expr list
       IsJsStatement: bool }
 
+type ImportInfo =
+    { Selector: Expr
+      Path: Expr
+      IsCompilerGenerated: bool }
+
 type OperationKind =
     | Unary of UnaryOperator * Expr
     | Binary of BinaryOperator * left: Expr * right: Expr
@@ -264,7 +269,7 @@ type Expr =
     | Operation of OperationKind * typ: Type * range: SourceLocation option
 
     // JS related: imports and statements
-    | Import of selector: Expr * path: Expr * Type * SourceLocation option
+    | Import of ImportInfo * Type * SourceLocation option
     | Emit of EmitInfo * typ: Type * range: SourceLocation option
 
     // Pattern matching
@@ -291,7 +296,7 @@ type Expr =
         | Call(_,_,t,_)
         | CurriedApply(_,_,t,_)
         | TypeCast (_, t)
-        | Import (_, _, t, _)
+        | Import (_, t, _)
         | Curry (_, _, t, _)
         | ObjectExpr (_, t, _)
         | Operation (_, t, _)
@@ -323,7 +328,7 @@ type Expr =
         | Call(_,_,_,r)
         | CurriedApply(_,_,_,r)
         | Emit (_,_,r)
-        | Import(_,_,_,r)
+        | Import(_,_,r)
         | Curry(_,_,_,r)
         | Value (_, r)
         | IfThenElse (_, _, _, r)

src/Fable.Transforms/FSharp2Fable.Util.fs

@@ -1042,7 +1042,7 @@ module Util =
             let path =
                 FsMemberFunctionOrValue.SourcePath memb
                 |> fixImportedRelativePath com path
-            makeCustomImport typ selector path |> Some
+            makeImportCompilerGenerated typ selector path |> Some
         | _ -> None
 
     let tryGlobalOrImportedEntity (com: ICompiler) (ent: Fable.Entity) =
@@ -1056,7 +1056,7 @@ module Util =
                 if selector = Naming.placeholder then ent.DisplayName
                 else selector
             fixImportedRelativePath com path ent.SourcePath
-            |> makeCustomImport Fable.Any selector |> Some
+            |> makeImportCompilerGenerated Fable.Any selector |> Some
         | _ -> None
 
     let isErasedOrStringEnumEntity (ent: Fable.Entity) =
@@ -1095,7 +1095,7 @@ module Util =
             if file = com.CurrentFile then
                 makeIdentExpr entityName
             elif ent.IsPublic then
-                makeInternalImport com Fable.Any entityName file
+                makeImportInternal com Fable.Any entityName file
             else
                 error "Cannot inline functions that reference private entities"
 
@@ -1124,7 +1124,7 @@ module Util =
             // If the overload suffix changes, we need to recompile the files that call this member
             if hasOverloadSuffix then
                 com.AddInlineDependency(file)
-            makeInternalImport com typ memberName file
+            makeImportInternal com typ memberName file
         else
             defaultArg (memb.TryGetFullDisplayName()) memb.CompiledName
             |> sprintf "Cannot reference private members from other files: %s"

src/Fable.Transforms/FSharp2Fable.fs

@@ -914,24 +914,24 @@ let private transformImport com r typ isMutable isPublic name selector path =
     [Fable.MemberDeclaration
         { Ident = ident
           Args = []
-          Body = Fable.Import(selector, path, typ, r)
+          Body = makeImportUserGenerated r typ selector path
           UsedNames = Set.empty
           Info = info }]
 
 let private transformMemberValue (com: IFableCompiler) ctx isPublic name (memb: FSharpMemberOrFunctionOrValue) (value: FSharpExpr) =
     let value = transformExpr com ctx value |> run
     match value with
     // Accept import expressions, e.g. let foo = import "foo" "myLib"
-    | Fable.Import(selector, path, typ, r) ->
+    | Fable.Import(info, typ, r) when not info.IsCompilerGenerated ->
         match typ with
         | Fable.LambdaType(_, Fable.LambdaType(_, _)) ->
             "Change declaration of member: " + name + "\n"
             + "Importing JS functions with multiple arguments as `let add: int->int->int` won't uncurry parameters." + "\n"
             + "Use following syntax: `let add (x:int) (y:int): int = import ...`"
             |> addError com ctx.InlinePath None
         | _ -> ()
-        let selector = importExprSelector memb selector
-        transformImport com r typ memb.IsMutable isPublic name selector path
+        let selector = importExprSelector memb info.Selector
+        transformImport com r typ memb.IsMutable isPublic name selector info.Path
     | fableValue ->
         let info = MemberDeclInfo(memb.Attributes, isValue=true, isPublic=isPublic, isMutable=memb.IsMutable)
         [Fable.MemberDeclaration
@@ -953,11 +953,11 @@ let private transformMemberFunction (com: IFableCompiler) ctx isPublic name (mem
     let body = transformExpr com bodyCtx body |> run
     match body with
     // Accept import expressions, e.g. let foo x y = import "foo" "myLib"
-    | Fable.Import(selector, path, _, r) ->
+    | Fable.Import(info, _, r) when not info.IsCompilerGenerated ->
         // Use the full function type
         let typ = makeType Map.empty memb.FullType
-        let selector = importExprSelector memb selector
-        transformImport com r typ false isPublic name selector path
+        let selector = importExprSelector memb info.Selector
+        transformImport com r typ false isPublic name selector info.Path
     | body ->
         // If this is a static constructor, call it immediately
         if memb.CompiledName = ".cctor" then

src/Fable.Transforms/Fable2Babel.fs

@@ -1124,9 +1124,9 @@ module Util =
     let transformBindingExprBody (com: IBabelCompiler) ctx (var: Fable.Ident) (value: Fable.Expr) =
         match value with
         // Check imports with name placeholder
-        | Fable.Import((Fable.Value(Fable.StringConstant Naming.placeholder,_)), path, _, r) ->
+        | Fable.Import({ Selector = Fable.Value(Fable.StringConstant Naming.placeholder,_); Path = path }, _, r) ->
             transformImport com ctx r (makeStrConst var.Name) path
-        | Function(_,Fable.Import(Fable.Value(Fable.StringConstant Naming.placeholder,_), path, _, r)) ->
+        | Function(_,Fable.Import({ Selector = Fable.Value(Fable.StringConstant Naming.placeholder,_); Path = path }, _, r)) ->
             transformImport com ctx r (makeStrConst var.Name) path
         | Function(args, body) ->
             let name = Some var.Name
@@ -1390,7 +1390,7 @@ module Util =
 
         | Fable.IdentExpr id -> upcast ident id
 
-        | Fable.Import(selector, path, _, r) ->
+        | Fable.Import({ Selector = selector; Path = path }, _, r) ->
             transformImport com ctx r selector path
 
         | Fable.Test(expr, kind, range) ->
@@ -1467,7 +1467,7 @@ module Util =
         | Fable.IdentExpr id ->
             [|identAsExpr id |> resolveExpr id.Type returnStrategy|]
 
-        | Fable.Import(selector, path, t, r) ->
+        | Fable.Import({ Selector = selector; Path = path }, t, r) ->
             [|transformImport com ctx r selector path |> resolveExpr t returnStrategy|]
 
         | Fable.Test(expr, kind, range) ->

src/Fable.Transforms/FableTransforms.fs

@@ -8,7 +8,9 @@ let visit f e =
     match e with
     | IdentExpr _ -> e
     | TypeCast(e, t) -> TypeCast(f e, t)
-    | Import(e1, e2, t, r) -> Import(f e1, f e2, t, r)
+    | Import(info, t, r) ->
+        Import({ info with Selector = f info.Selector
+                           Path = f info.Path }, t, r)
     | Value(kind, r) ->
         match kind with
         | ThisValue _ | BaseValue _
@@ -89,10 +91,11 @@ let rec visitFromOutsideIn (f: Expr->Expr option) e =
     | Some e -> e
     | None -> visit (visitFromOutsideIn f) e
 
+// TODO: We should likely make this a property of Fable.Expr
 let getSubExpressions = function
     | IdentExpr _ -> []
     | TypeCast(e,_) -> [e]
-    | Import(e1,e2,_,_) -> [e1;e2]
+    | Import(info,_,_) -> [info.Selector; info.Path]
     | Value(kind,_) ->
         match kind with
         | ThisValue _ | BaseValue _

src/Fable.Transforms/Replacements.fs

@@ -27,11 +27,11 @@ type Helper =
         Call(callee, info, returnType, loc)
 
     static member LibValue(com, coreModule: string, coreMember: string, returnType: Type) =
-        makeLibRef com returnType coreMember coreModule
+        makeImportLib com returnType coreMember coreModule
 
     static member LibCall(com, coreModule: string, coreMember: string, returnType: Type, args: Expr list,
                            ?argTypes: Type list, ?thisArg: Expr, ?hasSpread: bool, ?isJsConstructor: bool, ?loc: SourceLocation) =
-        let callee = makeLibRef com Any coreMember coreModule
+        let callee = makeImportLib com Any coreMember coreModule
         let info = makeCallInfo thisArg args (defaultArg argTypes [])
         Call(callee, { info with HasSpread = defaultArg hasSpread false
                                  IsJsConstructor = defaultArg isJsConstructor false }, returnType, loc)
@@ -789,7 +789,7 @@ let makeEqualityComparer (com: ICompiler) ctx typArg =
     let body = equals com ctx None true (IdentExpr x) (IdentExpr y)
     let f = Delegate([x; y], body, None)
     objExpr ["Equals", f
-             "GetHashCode", makeLibRef com Any "structuralHash" "Util"]
+             "GetHashCode", makeImportLib com Any "structuralHash" "Util"]
 
 // TODO: Try to detect at compile-time if the object already implements `Compare`?
 let inline makeComparerFromEqualityComparer e =
@@ -927,29 +927,29 @@ let tryEntityRef (com: Fable.ICompiler) (ent: Entity) =
     match ent.FullName with
     | BuiltinDefinition BclDateTime
     | BuiltinDefinition BclDateTimeOffset -> makeIdentExpr "Date" |> Some
-    | BuiltinDefinition BclTimer -> makeLibRef com Any "default" "Timer" |> Some
+    | BuiltinDefinition BclTimer -> makeImportLib com Any "default" "Timer" |> Some
     | BuiltinDefinition BclInt64
-    | BuiltinDefinition BclUInt64 -> makeLibRef com Any "default" "Long" |> Some
-    | BuiltinDefinition BclDecimal -> makeLibRef com Any "default" "Decimal" |> Some
-    | BuiltinDefinition BclBigInt -> makeLibRef com Any "BigInteger" "BigInt/z" |> Some
-    | BuiltinDefinition(FSharpReference _) -> makeLibRef com Any "FSharpRef" "Types" |> Some
-    | BuiltinDefinition(FSharpResult _) -> makeLibRef com Any "Result" "Option" |> Some
-    | BuiltinDefinition(FSharpChoice _) -> makeLibRef com Any "Choice" "Option" |> Some
+    | BuiltinDefinition BclUInt64 -> makeImportLib com Any "default" "Long" |> Some
+    | BuiltinDefinition BclDecimal -> makeImportLib com Any "default" "Decimal" |> Some
+    | BuiltinDefinition BclBigInt -> makeImportLib com Any "BigInteger" "BigInt/z" |> Some
+    | BuiltinDefinition(FSharpReference _) -> makeImportLib com Any "FSharpRef" "Types" |> Some
+    | BuiltinDefinition(FSharpResult _) -> makeImportLib com Any "Result" "Option" |> Some
+    | BuiltinDefinition(FSharpChoice _) -> makeImportLib com Any "Choice" "Option" |> Some
     // | BuiltinDefinition BclGuid -> jsTypeof "string" expr
     // | BuiltinDefinition BclTimeSpan -> jsTypeof "number" expr
     // | BuiltinDefinition BclHashSet _ -> fail "MutableSet" // TODO:
     // | BuiltinDefinition BclDictionary _ -> fail "MutableMap" // TODO:
     // | BuiltinDefinition BclKeyValuePair _ -> fail "KeyValuePair" // TODO:
     // | BuiltinDefinition FSharpSet _ -> fail "Set" // TODO:
     // | BuiltinDefinition FSharpMap _ -> fail "Map" // TODO:
-    | Types.matchFail -> makeLibRef com Any "MatchFailureException" "Types" |> Some
+    | Types.matchFail -> makeImportLib com Any "MatchFailureException" "Types" |> Some
     | Types.exception_ -> makeIdentExpr "Error" |> Some
     | entFullName ->
         com.Options.precompiledLib
         |> Option.bind (fun tryLib -> tryLib entFullName)
         |> Option.map (fun (entityName, importPath) ->
             let entityName = Naming.sanitizeIdentForbiddenChars entityName |> Naming.checkJsKeywords
-            makeCustomImport Any entityName importPath)
+            makeImportCompilerGenerated Any entityName importPath)
 
 let tryJsConstructor com ent =
     if FSharp2Fable.Util.isReplacementCandidate ent then tryEntityRef com ent
@@ -1063,21 +1063,21 @@ let fableCoreLib (com: ICompiler) (ctx: Context) r t (i: CallInfo) (thisArg: Exp
                 | arg -> arg
             match arg with
             // TODO: Check this is not a fable-library import?
-            | Import(selector,path,_,_) ->
-                dynamicImport selector path |> Some
-            | NestedLambda(args, Call(Import(selector,path,_,_),info,_,_), None)
-                when argEquals args info.Args ->
-                dynamicImport selector path |> Some
+            | Import(info,_,_) ->
+                dynamicImport info.Selector info.Path |> Some
+            | NestedLambda(args, Call(Import(importInfo,_,_),callInfo,_,_), None)
+                when argEquals args callInfo.Args ->
+                dynamicImport importInfo.Selector importInfo.Path |> Some
             | _ ->
                 "The imported value is not coming from a different file"
                 |> addErrorAndReturnNull com ctx.InlinePath r |> Some
         | Naming.StartsWith "import" suffix, _ ->
             match suffix, args with
-            | "Member", [path]      -> Import(makeStrConst Naming.placeholder, path, t, r) |> Some
-            | "Default", [path]     -> Import(makeStrConst "default", path, t, r) |> Some
-            | "SideEffects", [path] -> Import(makeStrConst "", path, t, r) |> Some
-            | "All", [path]         -> Import(makeStrConst "*", path, t, r) |> Some
-            | _, [selector; path]   -> Import(selector, path, t, r) |> Some
+            | "Member", [path]      -> makeImportUserGenerated r t (makeStrConst Naming.placeholder) path |> Some
+            | "Default", [path]     -> makeImportUserGenerated r t (makeStrConst "default") path |> Some
+            | "SideEffects", [path] -> makeImportUserGenerated r t (makeStrConst "") path |> Some
+            | "All", [path]         -> makeImportUserGenerated r t (makeStrConst "*") path |> Some
+            | _, [selector; path]   -> makeImportUserGenerated r t (selector) path |> Some
             | _ -> None
         // Dynamic casting, erase
         | "op_BangHat", [arg] -> Some arg
@@ -1142,7 +1142,7 @@ let fableCoreLib (com: ICompiler) (ctx: Context) r t (i: CallInfo) (thisArg: Exp
 
 let getReference r t expr = get r t expr "contents"
 let setReference r expr value = Set(expr, Some(ExprKey(makeStrConst "contents")), value, r)
-let newReference com r t value = Helper.JsConstructorCall(makeLibRef com t "FSharpRef" "Types", t, [value], ?loc=r)
+let newReference com r t value = Helper.JsConstructorCall(makeImportLib com t "FSharpRef" "Types", t, [value], ?loc=r)
 
 let references (com: ICompiler) (ctx: Context) r t (i: CallInfo) (thisArg: Expr option) (args: Expr list) =
     match i.CompiledName, thisArg, args with
@@ -1182,10 +1182,10 @@ let getPrecompiledLibMangledName entityName memberName overloadSuffix isStatic =
 let precompiledLib r (t: Type) (i: CallInfo) (thisArg: Expr option) (args: Expr list) (entityName, importPath) =
     let mangledName = getPrecompiledLibMangledName entityName i.CompiledName i.OverloadSuffix.Value (Option.isNone thisArg)
     if i.IsModuleValue
-    then makeCustomImport t mangledName importPath
+    then makeImportCompilerGenerated t mangledName importPath
     else
         let argInfo = { makeCallInfo thisArg args i.SignatureArgTypes with HasSpread = i.HasSpread }
-        makeCustomImport Any mangledName importPath |> makeCall r t argInfo
+        makeImportCompilerGenerated Any mangledName importPath |> makeCall r t argInfo
 
 let fsFormat (com: ICompiler) (ctx: Context) r t (i: CallInfo) (thisArg: Expr option) (args: Expr list) =
     match i.CompiledName, thisArg, args with
@@ -1250,7 +1250,7 @@ let operators (com: ICompiler) (ctx: Context) r t (i: CallInfo) (thisArg: Expr o
     | "DefaultArg", _ ->
         Helper.LibCall(com, "Option", "defaultArg", t, args, i.SignatureArgTypes, ?loc=r) |> Some
     | "DefaultAsyncBuilder", _ ->
-        makeLibRef com t "singleton" "AsyncBuilder" |> Some
+        makeImportLib com t "singleton" "AsyncBuilder" |> Some
     // Erased operators.
     // KeyValuePair is already compiled as a tuple
     | ("KeyValuePattern"|"Identity"|"Box"|"Unbox"|"ToEnum"), [arg] -> TypeCast(arg, t) |> Some
@@ -2616,7 +2616,7 @@ let mailbox (com: ICompiler) (ctx: Context) r t (i: CallInfo) (thisArg: Expr opt
 
 let asyncBuilder (com: ICompiler) (ctx: Context) r t (i: CallInfo) (thisArg: Expr option) (args: Expr list) =
     match thisArg, i.CompiledName, args with
-    | _, "Singleton", _ -> makeLibRef com t "singleton" "AsyncBuilder" |> Some
+    | _, "Singleton", _ -> makeImportLib com t "singleton" "AsyncBuilder" |> Some
     // For Using we need to cast the argument to IDisposable
     | Some x, "Using", [arg; f] ->
         Helper.InstanceCall(x, "Using", t, [arg; f], i.SignatureArgTypes, ?loc=r) |> Some
@@ -2974,8 +2974,8 @@ let tryCall (com: ICompiler) (ctx: Context) r t (info: CallInfo) (thisArg: Expr
 
 let tryBaseConstructor com ctx (ent: Entity) (argTypes: Lazy<Type list>) genArgs args =
     match ent.FullName with
-    | Types.exception_ -> Some(makeLibRef com Any "Exception" "Types", args)
-    | Types.attribute -> Some(makeLibRef com Any "Attribute" "Types", args)
+    | Types.exception_ -> Some(makeImportLib com Any "Exception" "Types", args)
+    | Types.attribute -> Some(makeImportLib com Any "Attribute" "Types", args)
     | Types.dictionary ->
         let args =
             match argTypes.Value, args with
@@ -2990,7 +2990,7 @@ let tryBaseConstructor com ctx (ent: Entity) (argTypes: Lazy<Type list>) genArgs
                 [makeArray Any []; makeComparerFromEqualityComparer eqComp]
             | _ -> failwith "Unexpected dictionary constructor"
         let entityName = FSharp2Fable.Helpers.cleanNameAsJsIdentifier "MutableMap`2"
-        Some(makeLibRef com Any entityName "MutableMap", args)
+        Some(makeImportLib com Any entityName "MutableMap", args)
     | Types.hashset ->
         let args =
             match argTypes.Value, args with
@@ -3004,5 +3004,5 @@ let tryBaseConstructor com ctx (ent: Entity) (argTypes: Lazy<Type list>) genArgs
                 [makeArray Any []; makeComparerFromEqualityComparer eqComp]
             | _ -> failwith "Unexpected hashset constructor"
         let entityName = FSharp2Fable.Helpers.cleanNameAsJsIdentifier "MutableSet`1"
-        Some(makeLibRef com Any entityName "MutableSet", args)
+        Some(makeImportLib com Any entityName "MutableSet", args)
     | _ -> None

src/Fable.Transforms/Transforms.Util.fs

@@ -391,15 +391,22 @@ module AST =
         let ext = if com.Options.typescript then "" else Naming.targetFileExtension
         com.LibraryDir + "/" + moduleName + ext
 
-    let makeLibRef (com: ICompiler) t memberName moduleName =
-        Import(makeStrConst memberName, makeStrConst (getLibPath com moduleName), t, None)
-
-    let makeCustomImport t (selector: string) (path: string) =
-        Import(selector.Trim() |> makeStrConst, path.Trim() |> makeStrConst, t, None)
-
-    let makeInternalImport (com: ICompiler) t (selector: string) (path: string) =
-        let path = Path.getRelativeFileOrDirPath false com.CurrentFile false path
-        Import(makeStrConst selector, makeStrConst path, t, None)
+    let makeImportUserGenerated r t selector path =
+        Import({ Selector = selector
+                 Path = path
+                 IsCompilerGenerated = false }, t, r)
+
+    let makeImportCompilerGenerated t (selector: string) (path: string) =
+        Import({ Selector = selector.Trim() |> makeStrConst
+                 Path = path.Trim() |> makeStrConst
+                 IsCompilerGenerated = true }, t, None)
+
+    let makeImportLib (com: ICompiler) t memberName moduleName =
+        makeImportCompilerGenerated t memberName (getLibPath com moduleName)
+
+    let makeImportInternal (com: ICompiler) t (selector: string) (path: string) =
+        Path.getRelativeFileOrDirPath false com.CurrentFile false path
+        |> makeImportCompilerGenerated t selector
 
     let makeCallInfo thisArg args argTypes =
         { ThisArg = thisArg

src/fable-standalone/splitter.config.js

@@ -23,7 +23,9 @@ const fableOptions = {
   // extra: { saveAst: "./ast" }
 };
 
+const portArgIndex = process.argv.indexOf("--port");
 module.exports = {
+  port: portArgIndex >= 0 ? process.argv[portArgIndex + 1] : undefined,
   cli: { path: resolve("../Fable.Cli") },
   entry: resolve("./src/Fable.Standalone.fsproj"),
   outDir: resolve("../../build/fable-standalone/out-bundle"),