Test compiled by fable-js passing!

Author: alfonsogarciacaro

.vscode/launch.json

@@ -101,12 +101,14 @@
             "cwd": "${workspaceFolder}/src/fable-standalone/test/bench-compiler"
         },
         {
+            // src/fable-compiler-js/ tests/Main/Fable.Tests.fsproj build/tests-js
+
             "type": "node",
             "request": "launch",
             "name": "transform tests to JS",
-            "program": "${workspaceRoot}/src/fable-standalone/test/bench-compiler/transform.js",
-            "args": ["${workspaceRoot}/tests/Main/Fable.Tests.fsproj", "out-tests", "${workspaceRoot}/build/fable-library", "--commonjs"],
-            "cwd": "${workspaceRoot}/src/fable-standalone/test/bench-compiler"
+            "program": "${workspaceRoot}/build/fable-compiler-js/src/fable-compiler-js/src/app.fs.js",
+            "args": ["${workspaceRoot}/tests/Main/Fable.Tests.fsproj", "build/tests-js"],
+            "stopOnEntry": true
         },
         {
             "type": "node",

Fable.sln

@@ -19,8 +19,6 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fable.Tests.Spaces", "tests
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fable.Tests.External", "tests_external\Fable.Tests.External.fsproj", "{F5DEF871-BEEB-40A1-BBF1-7A19BD8B6185}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "ASTViewer", "src\tools\ASTViewer\ASTViewer.fsproj", "{D8C8FBCB-54AF-49C3-93B1-5460668E32EC}"
-EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fable.Library", "src\fable-library\Fable.Library.fsproj", "{C6B876C9-8410-4FFF-AD89-46539E54253C}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Files", "Files", "{54BD4E45-0C5B-455A-9C7C-37736B216015}"
@@ -140,18 +138,6 @@ Global
 		{F5DEF871-BEEB-40A1-BBF1-7A19BD8B6185}.Release|x64.Build.0 = Release|Any CPU
 		{F5DEF871-BEEB-40A1-BBF1-7A19BD8B6185}.Release|x86.ActiveCfg = Release|Any CPU
 		{F5DEF871-BEEB-40A1-BBF1-7A19BD8B6185}.Release|x86.Build.0 = Release|Any CPU
-		{D8C8FBCB-54AF-49C3-93B1-5460668E32EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D8C8FBCB-54AF-49C3-93B1-5460668E32EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D8C8FBCB-54AF-49C3-93B1-5460668E32EC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D8C8FBCB-54AF-49C3-93B1-5460668E32EC}.Debug|x64.Build.0 = Debug|Any CPU
-		{D8C8FBCB-54AF-49C3-93B1-5460668E32EC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D8C8FBCB-54AF-49C3-93B1-5460668E32EC}.Debug|x86.Build.0 = Debug|Any CPU
-		{D8C8FBCB-54AF-49C3-93B1-5460668E32EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D8C8FBCB-54AF-49C3-93B1-5460668E32EC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D8C8FBCB-54AF-49C3-93B1-5460668E32EC}.Release|x64.ActiveCfg = Release|Any CPU
-		{D8C8FBCB-54AF-49C3-93B1-5460668E32EC}.Release|x64.Build.0 = Release|Any CPU
-		{D8C8FBCB-54AF-49C3-93B1-5460668E32EC}.Release|x86.ActiveCfg = Release|Any CPU
-		{D8C8FBCB-54AF-49C3-93B1-5460668E32EC}.Release|x86.Build.0 = Release|Any CPU
 		{C6B876C9-8410-4FFF-AD89-46539E54253C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C6B876C9-8410-4FFF-AD89-46539E54253C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C6B876C9-8410-4FFF-AD89-46539E54253C}.Debug|x64.ActiveCfg = Debug|Any CPU

build.fsx

@@ -111,18 +111,27 @@ let buildLibraryTs() =
     runInDir buildDirTs ("npx tsc --outDir ../../" + buildDirJs)
 
 let quicktest () =
-    runFableWithArgs "src/quicktest" ["--exclude Fable.Core"]
+    runFableWithArgs "src/quicktest" [
+        "--force-pkgs"
+        "--exclude Fable.Core"
+    ]
     run "npx tsc src/quicktest/QuickTest.fs.js --allowJs -m commonJs --outDir build/quicktest"
     run "node build/quicktest/src/quicktest/QuickTest.fs.js"
 
-let buildCompilerJs() =
-    let projectDir = "src/fable-compiler-js"
-    cleanDirs [projectDir </> "dist"]
-    runFableWithArgs (projectDir </> "src") [
-        "--exclude Fable.Core"
+let compileFcs() =
+    runFableWithArgs "src/fable-standalone/src" [
+        "--force-pkgs"
+        "--typed-arrays"
+        "--define FX_NO_CORHOST_SIGNER"
+        "--define FX_NO_LINKEDRESOURCES"
+        "--define FX_NO_PDB_READER"
+        "--define FX_NO_PDB_WRITER"
+        "--define FX_NO_WEAKTABLE"
+        "--define FX_REDUCED_EXCEPTIONS"
+        "--define NO_COMPILER_BACKEND"
+        "--define NO_EXTENSIONTYPING"
+        "--define NO_INLINE_IL_PARSER"
     ]
-    run (sprintf "npx rollup %s/src/app.fs.js --file %s/dist/app.js --format umd --name Fable" projectDir projectDir)
-    run (sprintf "npx terser %s/dist/app.js -o %s/dist/app.min.js --mangle --compress" projectDir projectDir)
 
 let buildStandalone() =
     let buildDir = "build/fable-standalone"
@@ -137,19 +146,10 @@ let buildStandalone() =
     makeDirRecursive distDir
 
     // build
-    runFableWithArgs projectDir [
-        "--typed-arrays"
-        "--define FX_NO_CORHOST_SIGNER"
-        "--define FX_NO_LINKEDRESOURCES"
-        "--define FX_NO_PDB_READER"
-        "--define FX_NO_PDB_WRITER"
-        "--define FX_NO_WEAKTABLE"
-        "--define FX_REDUCED_EXCEPTIONS"
-        "--define NO_COMPILER_BACKEND"
-        "--define NO_EXTENSIONTYPING"
-        "--define NO_INLINE_IL_PARSER"
+    compileFcs()
+    runFableWithArgs (projectDir + "/Worker") [
+        "--force-pkgs"
     ]
-    runFable (projectDir + "/Worker")
 
     // bundle
     run (sprintf "npx rollup %s/Main.fs.js --file %s/bundle.js --format umd --name __FABLE_STANDALONE__" projectDir buildDir)
@@ -187,41 +187,74 @@ let buildStandalone() =
     //     (if comMajor > staMajor || comMinor > staMinor then compilerVersion
     //      else sprintf "%i.%i.%i%s" staMajor staMinor (staPatch + 1) comPrerelease)
 
-let testJs() =
-    let projectDir = "src/fable-compiler-js"
-    let buildDir = "build/tests-js"
-    if not (pathExists "build/fable-standalone") then
-        buildStandalone()
-    if not (pathExists "build/fable-compiler-js") then
-        buildCompilerJs()
-
-    cleanDirs [buildDir]
+let buildCompilerJs() =
+    compileFcs()
 
-    // Link fable-compiler-js to local packages
-    runInDir projectDir "npm link ../fable-metadata"
-    runInDir projectDir "npm link ../fable-standalone"
+    let projectDir = "src/fable-compiler-js"
+    runFableWithArgs (projectDir </> "src") [
+        "--force-pkgs"
+        "--exclude Fable.Core"
+    ]
 
-    // Test fable-compiler-js locally
-    run ("node " + projectDir + " tests/Main/Fable.Tests.fsproj " + buildDir + " --commonjs")
-    run ("npx mocha " + buildDir + " --reporter dot -t 10000")
-    // and another test
-    runInDir "src/fable-compiler-js/test" "node .. test_script.fsx --commonjs"
-    runInDir "src/fable-compiler-js/test" "node bin/test_script.js"
+    cleanDirs [projectDir </> "dist"]
+    // run (sprintf "npx rollup %s/src/app.fs.js --file %s/dist/app.js --format umd --name Fable" projectDir projectDir)
+    // run (sprintf "npx terser %s/dist/app.js -o %s/dist/app.min.js --mangle --compress" projectDir projectDir)
+
+    // Compile to commonjs modules
+    runTypescript "src/fable-compiler-js"
+    // Copy fable-library
+    copyDirRecursive ("build/fable-library") (projectDir </> "dist/fable-library")
+    // Copy fable-metadata
+    copyDirRecursive ("src/fable-metadata/lib") (projectDir </> "dist/fable-metadata")
+
+let compileAndRunTests(compileTests) =
+    // TODO: "rm tests/**/*.fs.js"
+    compileTests()
+    cleanDirs ["build/tests"]
+    runTypescript "tests"
+    run "npx mocha build/tests/tests/Main --reporter dot -t 10000"
 
-    // Unlink local packages after test
-    runInDir projectDir "npm unlink ../fable-metadata && cd ../fable-metadata && npm unlink"
-    runInDir projectDir "npm unlink ../fable-standalone && cd ../fable-standalone && npm unlink"
+let testJs() =
+    buildCompilerJs()
+    compileAndRunTests(fun () ->
+        run "node src/fable-compiler-js tests/Main/Fable.Tests.fsproj")
+
+    // let projectDir = "src/fable-compiler-js"
+    // let buildDir = "build/tests-js"
+    // if not (pathExists "build/fable-standalone") then
+    //     buildStandalone()
+    // if not (pathExists "build/fable-compiler-js") then
+    //     buildCompilerJs()
+
+    // cleanDirs [buildDir]
+
+    // // Link fable-compiler-js to local packages
+    // runInDir projectDir "npm link ../fable-metadata"
+    // runInDir projectDir "npm link ../fable-standalone"
+
+    // // Test fable-compiler-js locally
+    // run ("node " + projectDir + " tests/Main/Fable.Tests.fsproj " + buildDir + " --commonjs")
+    // run ("npx mocha " + buildDir + " --reporter dot -t 10000")
+    // // and another test
+    // runInDir "src/fable-compiler-js/test" "node .. test_script.fsx --commonjs"
+    // runInDir "src/fable-compiler-js/test" "node bin/test_script.js"
+
+    // // Unlink local packages after test
+    // runInDir projectDir "npm unlink ../fable-metadata && cd ../fable-metadata && npm unlink"
+    // runInDir projectDir "npm unlink ../fable-standalone && cd ../fable-standalone && npm unlink"
 
 let test() =
-    if pathExists "build/fable-library" |> not then
-        buildLibrary()
+    compileAndRunTests(fun () ->
+        if pathExists "build/fable-library" |> not then
+                buildLibrary()
 
-    runFableWithArgs "tests/Main" ["--exclude Fable.Core"; "--force-pkgs"]
-    runTypescript "tests"
-    run "npx mocha build/tests/tests/Main --reporter dot -t 10000"
-    runInDir "tests/Main" "dotnet run"
+        runFableWithArgs "tests/Main" [
+            "--force-pkgs"
+            "--exclude Fable.Core"
+        ]
+    )
 
-    // TODO: Temporarily deactivated to get green builds
+    runInDir "tests/Main" "dotnet run"
     if envVarOrNone "APPVEYOR" |> Option.isSome then
         testJs()
 
@@ -342,6 +375,7 @@ match argsLower with
 | ("fable-library-ts"|"library-ts")::_ -> buildLibraryTs()
 | ("fable-compiler-js"|"compiler-js")::_ -> buildCompilerJs()
 | ("fable-standalone"|"standalone")::_ -> buildStandalone()
+| "fcs"::_ -> compileFcs()
 | "download-standalone"::_ -> downloadStandalone()
 | "publish"::restArgs -> publishPackages restArgs
 | "github-release"::_ ->

package-lock.json

@@ -84,8 +84,17 @@ module PrinterExtensions =
                 if i < nodes.Length - 1 then
                     printSeparator printer
 
-        member printer.PrintCommaSeparatedArray(nodes: #Node array) =
-            printer.PrintArray(nodes, (fun p x -> x.Print(p)), (fun p -> p.Print(", ")))
+        member printer.PrintCommaSeparatedArray(nodes: ExportSpecifier array) =
+            printer.PrintArray(nodes, (fun p x -> p.Print(x)), (fun p -> p.Print(", ")))
+
+        member printer.PrintCommaSeparatedArray(nodes: #ImportSpecifier array) =
+            printer.PrintArray(nodes, (fun p x -> p.Print(x)), (fun p -> p.Print(", ")))
+
+        member printer.PrintCommaSeparatedArray(nodes: Pattern array) =
+            printer.PrintArray(nodes, (fun p x -> p.Print(x)), (fun p -> p.Print(", ")))
+
+        member printer.PrintCommaSeparatedArray(nodes: Expression array) =
+            printer.PrintArray(nodes, (fun p x -> p.SequenceExpressionWithParens(x)), (fun p -> p.Print(", ")))
 
         // TODO: (super) type parameters, implements
         member printer.PrintClass(id: Identifier option, superClass: Expression option, body: ClassBody, loc) =
@@ -127,15 +136,13 @@ module PrinterExtensions =
             | Some e -> e.Print(printer)
             | None ->
                 if isArrow then
-                    // TODO: Remove parens if we only have one argument (and no annotation)
+                    // Remove parens if we only have one argument? (and no annotation)
                     printer.Print("(")
                     printer.PrintCommaSeparatedArray(parameters)
                     printer.Print(") => ")
                     match body.Body with
                     | [|:? ReturnStatement as r |] ->
-                        match r.Argument with
-                        | :? ObjectExpression as e -> printer.WithParens(e)
-                        | e -> printer.Print(e)
+                        printer.ComplexExpressionWithParens(r.Argument, objExpr=true)
                     | _ -> printer.PrintBlock(body.Body, skipNewLineAtEnd=true)
                 else
                 printer.Print("function ")
@@ -156,7 +163,7 @@ module PrinterExtensions =
             | _ -> printer.Print(expr)
 
         /// Surround with parens anything that can potentially conflict with operator precedence
-        member printer.ComplexExpressionWithParens(expr: Expression) =
+        member printer.ComplexExpressionWithParens(expr: Expression, ?objExpr) =
             match expr with
             | :? Undefined
             | :? NullLiteral
@@ -167,9 +174,12 @@ module PrinterExtensions =
             | :? MemberExpression
             | :? CallExpression
             // | :? NewExpression // Safe?
-            | :? ObjectExpression
             | :? ThisExpression
             | :? Super -> expr.Print(printer)
+            | :? ObjectExpression ->
+                match objExpr with
+                | Some true -> printer.WithParens(expr)
+                | _ -> expr.Print(printer)
             | _ -> printer.WithParens(expr)
 
         member printer.PrintOperation(left, operator, right, loc) =
@@ -535,31 +545,33 @@ type TryStatement(block, ?handler, ?finalizer, ?loc) =
             printer.PrintOptional("finally ", finalizer)
 
 // Declarations
-type VariableDeclarator(id, ?init, ?loc) =
+type VariableDeclarator(id, ?init) =
     member _.Id: Pattern = id
     member _.Init: Expression option = init
-    interface Node with
-        member _.Print(printer) =
-            printer.AddLocation(loc)
-            id.Print(printer)
-            match init with
-            | None -> ()
-            | Some e ->
-                printer.Print(" = ")
-                printer.SequenceExpressionWithParens(e)
 
 type VariableDeclarationKind = Var | Let | Const
 
 type VariableDeclaration(kind_, declarations, ?loc) =
     let kind = match kind_ with Var -> "var" | Let -> "let" | Const -> "const"
     new (var, ?init, ?kind, ?loc) =
-        VariableDeclaration(defaultArg kind Let, [|VariableDeclarator(var, ?init=init, ?loc=loc)|], ?loc=loc)
+        VariableDeclaration(defaultArg kind Let, [|VariableDeclarator(var, ?init=init)|], ?loc=loc)
     member _.Declarations: VariableDeclarator array = declarations
     member _.Kind: string = kind
     interface Declaration with
         member _.Print(printer) =
             printer.Print(kind + " ", ?loc=loc)
-            printer.PrintCommaSeparatedArray(declarations)
+            let canConflict = declarations.Length > 1
+            for i = 0 to declarations.Length - 1 do
+                let decl = declarations.[i]
+                printer.Print(decl.Id)
+                match decl.Init with
+                | None -> ()
+                | Some e ->
+                    printer.Print(" = ")
+                    if canConflict then printer.ComplexExpressionWithParens(e)
+                    else printer.SequenceExpressionWithParens(e)
+                if i < declarations.Length - 1 then
+                    printer.Print(", ")
 
 // Loops
 type WhileStatement(test, body, ?loc) =

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

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require("./dist/app.js");
+require("./dist/src/fable-compiler-js/src/app.fs.js");

src/fable-compiler-js/index.js

@@ -3,7 +3,6 @@ module Fable.Compiler.Platform
 open Fable.Core.JsInterop
 
 type CmdLineOptions = {
-    commonjs: bool
     optimize: bool
     sourceMaps: bool
     typescript: bool
@@ -40,6 +39,7 @@ module JS =
         abstract transformAndSaveBabelAst: babelAst: obj * outPath: string * projDir: string * outDir: string * libDir: string * options: CmdLineOptions -> unit
         abstract runCmdAndExitIfFails: cmd: string -> unit
         abstract getDirFiles: dir: string -> string[]
+        abstract escapeJsStringLiteral: string -> string
 
     let fs: IFileSystem = importAll "fs"
     let os: IOperSystem = importAll "os"
@@ -59,12 +59,11 @@ let measureTime (f: 'a -> 'b) x =
     res, int64 (elapsed.[0] * 1e3 + elapsed.[1] / 1e6)
 
 let javaScriptStringEncode (str: string) =
-    Fable.Core.JS.JSON.stringify(str)?slice(1, -1)
+    JS.util.escapeJsStringLiteral(str)
 
 let getVersion = JS.util.getVersion
 let ensureDirExists = JS.util.ensureDirExists
 let copyFolder = JS.util.copyFolder
-let transformAndSaveBabelAst = JS.util.transformAndSaveBabelAst
 let runCmdAndExitIfFails = JS.util.runCmdAndExitIfFails
 
 let normalizeFullPath (path: string) =