Improvements to CLI (#2183)

alfonsogarciacaro · web-flow · commit 6f5ad3910c02 · 2020-09-29T02:35:15.000+09:00
* CLI improvements

* Make cli args consistent and other fixes
diff --git a/build.fsx b/build.fsx
@@ -76,7 +76,7 @@ let buildLibrary() =
 
     runFableWithArgs projectDir [
         "--outDir " + buildDir
-        "--fable-library " + buildDir
+        "--fableLib " + buildDir
         "--exclude Fable.Core"
         "--define FX_NO_BIGINT"
     ]
@@ -116,7 +116,7 @@ let buildLibraryTs() =
 
     runFableWithArgs projectDir [
         "--outDir " + buildDirTs
-        "--fable-library " + buildDirTs
+        "--fableLib " + buildDirTs
         "--typescript"
         "--exclude Fable.Core"
         "--define FX_NO_BIGINT"
@@ -136,7 +136,7 @@ let quicktest () =
         writeFile quicktestJsPath "console.log('Getting ready, hold tight')"
 
     concurrently [|
-        "dotnet watch -p src/Fable.Cli run -- watch --cwd ../quicktest --exclude Fable.Core --force-pkgs"
+        "dotnet watch -p src/Fable.Cli run -- watch --cwd ../quicktest --exclude Fable.Core --forcePkgs"
         "npx nodemon " + quicktestJsPath
     |]
 
@@ -156,9 +156,9 @@ let buildStandalone() =
     // build standalone bundle
     runFableWithArgs projectDir [
         "--outDir " + buildDir + "/bundle"
-        "--fable-library " + libraryDir
-        "--force-pkgs"
-        "--typed-arrays"
+        "--fableLib " + libraryDir
+        "--forcePkgs"
+        "--typedArrays"
         "--define FX_NO_CORHOST_SIGNER"
         "--define FX_NO_LINKEDRESOURCES"
         "--define FX_NO_PDB_READER"
@@ -173,8 +173,8 @@ let buildStandalone() =
     // build standalone worker
     runFableWithArgs (projectDir + "/Worker") [
         "--outDir " + buildDir + "/worker"
-        "--fable-library " + libraryDir
-        "--force-pkgs"
+        "--fableLib " + libraryDir
+        "--forcePkgs"
     ]
 
     // make standalone bundle dist
@@ -227,8 +227,8 @@ let buildCompilerJs() =
 
     runFableWithArgs projectDir [
         "--outDir " + buildDir
-        "--fable-library " + libraryDir
-        "--force-pkgs"
+        "--fableLib " + libraryDir
+        "--forcePkgs"
         "--exclude Fable.Core"
     ]
 
@@ -275,8 +275,8 @@ let test() =
 
     runFableWithArgs projectDir [
         "--outDir " + buildDir
-        "--fable-library " + libraryDir
-        "--force-pkgs"
+        "--fableLib " + libraryDir
+        "--forcePkgs"
         "--exclude Fable.Core"
     ]
 
diff --git a/src/Fable.Cli/Entry.fs b/src/Fable.Cli/Entry.fs
@@ -33,19 +33,21 @@ Commands:
   clean             Clean generated JS files
 
 Arguments:
+  --cwd             Working directory
   --outDir          Redirect compilation output files to a directory
   --define          Defines a symbol for use in conditional compilation
+  --run             The command after the argument will be executed after compilation
+  --runWatch        Like run, but will execute after each watch compilation
+  --typedArrays     Compile numeric arrays to JS typed arrays
+  --forcePkgs       Force a new copy of package sources into `.fable` folder
   --extension       Extension for generated JS files (default .fs.js)
   --verbose         Print more info during compilation
   --exclude         Skip Fable compilation for files containing the pattern
-  --typed-arrays    Compile numeric arrays to JS typed arrays
-  --force-pkgs      Force a new copy of package sources into `.fable` folder
   --optimize        Use optimized AST from F# compiler (experimental)
-  --cwd             Working directory
 """
 
 type Runner =
-  static member Run(args: string list, rootDir: string, ?fsprojPath, ?watch, ?testInfo) =
+  static member Run(args: string list, rootDir: string, runArgs: RunArgs option, ?fsprojPath, ?watch, ?testInfo) =
     let watch = defaultArg watch false
 
     fsprojPath
@@ -75,26 +77,30 @@ type Runner =
 
             let defines =
                 argValues "--define" args
-                |> List.append ["FABLE_COMPILER"]
+                |> List.append [
+                    "FABLE_COMPILER"
+                    if watch then "DEBUG"
+                ]
                 |> List.distinct
                 |> List.toArray
 
             let compilerOptions =
                 CompilerOptionsHelper.Make(typescript = hasFlag "--typescript" args,
-                                           typedArrays = hasFlag "--typed-arrays" args,
+                                       typedArrays = hasFlag "--typedArrays" args,
                                            ?fileExtension = argValue "--extension" args,
                                            debugMode = Array.contains "DEBUG" defines,
                                            optimizeFSharpAst = hasFlag "--optimize" args,
                                            verbosity = verbosity)
 
             let cliArgs =
                 { ProjectFile = projFile
-                  FableLibraryPath = argValue "--fable-library" args
+                  FableLibraryPath = argValue "--fableLib" args
                   RootDir = rootDir
                   OutDir = argValue "--outDir" args
-                  ForcePackages = hasFlag "--force-pkgs" args
+                  ForcePackages = hasFlag "--forcePkgs" args
                   Exclude = argValue "--exclude" args
                   Define = defines
+                  RunArgs = runArgs
                   CompilerOptions = compilerOptions }
 
             let watcher =
@@ -123,6 +129,11 @@ let clean args dir =
         |> Option.defaultValue CompilerOptionsHelper.DefaultFileExtension
 
     let rec recClean dir =
+        IO.Directory.GetDirectories(dir)
+        |> Array.iter (fun subdir ->
+            if IO.Path.GetDirectoryName(subdir) = Naming.fableHiddenDir then
+                IO.Directory.Delete(subdir, true))
+
         IO.Directory.GetFiles(dir)
         |> Array.choose (fun file ->
             if file.EndsWith(".fs") then Some(file.[.. (file.Length - 4)])
@@ -131,8 +142,7 @@ let clean args dir =
             let file = filename + ext
             if IO.File.Exists(file) then
                 IO.File.Delete(file)
-                Log.verbose(lazy ("Deleted " + file))
-        )
+                Log.verbose(lazy ("Deleted " + file)))
 
         IO.Directory.GetDirectories(dir)
         |> Array.filter (fun subdir ->
@@ -148,7 +158,15 @@ let (|SplitCommandArgs|) (xs: string list) =
 
 [<EntryPoint>]
 let main argv =
-    let argv = List.ofArray argv
+    let argv, runArgs =
+        argv
+        |> List.ofArray
+        |> List.splitWhile (fun a -> not(a.StartsWith("--run")))
+        |> function
+            | argv, flag::exeFile::runArgs ->
+                argv, Some(RunArgs(exeFile, runArgs, watch=(flag = "--runWatch")))
+            | argv, _ -> argv, None
+
     let rootDir =
         match argValue "--cwd" argv with
         | Some rootDir -> IO.Path.GetFullPath(rootDir)
@@ -165,9 +183,9 @@ let main argv =
         match commands with
         | ["clean"; dir] -> clean args dir
         | ["clean"] -> clean args rootDir
-        | ["test"; path] -> Runner.Run(args, rootDir, fsprojPath=path, testInfo=TestInfo())
-        | ["watch"; path] -> Runner.Run(args, rootDir, fsprojPath=path, watch=true)
-        | ["watch"] -> Runner.Run(args, rootDir, watch=true)
-        | [path] -> Runner.Run(args, rootDir, fsprojPath=path)
-        | [] -> Runner.Run(args, rootDir)
+        | ["test"; path] -> Runner.Run(args, rootDir, runArgs, fsprojPath=path, testInfo=TestInfo())
+        | ["watch"; path] -> Runner.Run(args, rootDir, runArgs, fsprojPath=path, watch=true)
+        | ["watch"] -> Runner.Run(args, rootDir, runArgs, watch=true)
+        | [path] -> Runner.Run(args, rootDir, runArgs, fsprojPath=path)
+        | [] -> Runner.Run(args, rootDir, runArgs)
         | _ -> printfn "Unexpected arguments. Use `fable --help` to see available options."; 1
diff --git a/src/Fable.Cli/Main.fs b/src/Fable.Cli/Main.fs
@@ -97,13 +97,13 @@ module private Util =
                 // else printfn "Fable.Core version matches"
 
     let measureTime (f: unit -> 'a) =
-        let sw = System.Diagnostics.Stopwatch.StartNew()
+        let sw = Diagnostics.Stopwatch.StartNew()
         let res = f()
         sw.Stop()
         res, sw.ElapsedMilliseconds
 
     let measureTimeAsync (f: unit -> Async<'a>) = async {
-        let sw = System.Diagnostics.Stopwatch.StartNew()
+        let sw = Diagnostics.Stopwatch.StartNew()
         let! res = f()
         sw.Stop()
         return res, sw.ElapsedMilliseconds
@@ -191,7 +191,7 @@ module private Util =
             let writer = new FileWriter(com.CurrentFile, outPath, projDir, cliArgs.OutDir)
             do! BabelPrinter.run writer map babel
 
-            Log.always("Compiled " + Path.getRelativePath cliArgs.RootDir com.CurrentFile)
+            Log.always("Compiled " + File.getRelativePathFromCwd com.CurrentFile)
 
             return Ok {| File = com.CurrentFile
                          Logs = com.Logs
@@ -243,7 +243,7 @@ type ProjectCracked(sourceFiles: File array,
             }
 
         Log.verbose(lazy
-            let proj = Path.getRelativePath msg.RootDir msg.ProjectFile
+            let proj = File.getRelativePathFromCwd msg.ProjectFile
             let opts = projectOptions.OtherOptions |> String.concat "\n   "
             sprintf "F# PROJECT: %s\n   %s" proj opts)
 
@@ -264,7 +264,7 @@ type ProjectParsed(project: Project,
                 Log.always("Initializing F# compiler...")
                 InteractiveChecker.Create(config.ProjectOptions)
 
-        Log.always("Compiling " + Path.getRelativePath cliArgs.RootDir config.ProjectFile + "...")
+        Log.always("Compiling " + File.getRelativePathFromCwd config.ProjectFile + "...")
 
         let checkedProject, ms = measureTime <| fun () ->
             let fileDic = config.SourceFiles |> Seq.map (fun f -> f.NormalizedFullPath, f) |> dict
@@ -342,7 +342,6 @@ let rec startCompilation (changes: Set<string>) (state: State) = async {
                             File(file.NormalizedFullPath) // Clear the cached source hash
                         else file)
                     let parsed = ProjectParsed.Init(state.CliArgs, cracked, parsed.Checker)
-                    // TODO: We probably need to recompile errored files too even if they're not touched
                     let filesToCompile =
                         cracked.SourceFiles
                         |> Array.choose (fun file ->
@@ -357,6 +356,15 @@ let rec startCompilation (changes: Set<string>) (state: State) = async {
             let filesToCompile =
                 cracked.SourceFiles
                 |> Array.map (fun f -> f.NormalizedFullPath)
+                // Skip files that have a more recent JS version
+                |> fun files ->
+                    if Option.isSome state.CliArgs.OutDir then files
+                    else
+                        files |> Array.skipWhile (fun file ->
+                            try
+                                let jsFile = Path.replaceExtension state.CliArgs.CompilerOptions.FileExtension file
+                                File.Exists(jsFile) && File.GetLastWriteTime(jsFile) > File.GetLastWriteTime(file)
+                            with _ -> false)
             cracked, parsed, filesToCompile
 
     let filesToCompile =
@@ -411,13 +419,21 @@ let rec startCompilation (changes: Set<string>) (state: State) = async {
             | Some file -> Set.add file errors
             | None -> errors) Set.empty
 
+    let state =
+        match state.CliArgs.RunArgs with
+        | Some runArgs ->
+            Process.fireAndForget state.CliArgs.RootDir runArgs.ExeFile runArgs.Args
+            if runArgs.IsWatch then state
+            else { state with CliArgs = { state.CliArgs with RunArgs = None } }
+        | None -> state
+
     match state.Watcher, state.TestInfo with
     | Some watcher, _ ->
         let oldErrors =
             state.ErroredFiles
             |> Set.filter (fun file -> not(Array.contains file filesToCompile))
 
-        Log.always("Watching " + Path.getRelativePath state.CliArgs.RootDir watcher.Directory)
+        Log.always("Watching " + File.getRelativePathFromCwd watcher.Directory)
         let! changes = watcher.AwaitChanges()
         return!
             { state with ProjectCrackedAndParsed = Some(cracked, parsed)
diff --git a/src/Fable.Cli/ProjectCracker.fs b/src/Fable.Cli/ProjectCracker.fs
@@ -245,12 +245,12 @@ let fullCrack (opts: Options): CrackedFsproj =
     let dllRefs = Dictionary(StringComparer.OrdinalIgnoreCase)
 
     // Try restoring project
-    Process.runCmd Log.always
-        (IO.Path.GetDirectoryName projFile)
-        "dotnet" ["restore"; IO.Path.GetFileName projFile]
+    let projDir = IO.Path.GetDirectoryName projFile
+    let projName = IO.Path.GetFileName projFile
+    Process.runSync projDir "dotnet" ["restore"; projName]
     |> ignore
 
-    Log.always("Parsing " + Path.getRelativePath opts.rootDir projFile + "...")
+    Log.always("Parsing " + File.getRelativePathFromCwd projFile + "...")
     let projOpts, projRefs, _msbuildProps =
         ProjectCoreCracker.GetProjectOptionsFromProjectFile projFile
 
@@ -367,9 +367,25 @@ let isDirectoryEmpty dir =
 
 let createFableDir rootDir =
     let fableDir = IO.Path.Combine(rootDir, Naming.fableHiddenDir)
-    if isDirectoryEmpty fableDir then
+    let compilerInfo = IO.Path.Combine(fableDir, "compiler_info.txt")
+
+    let isEmptyOrOutdated =
+        if isDirectoryEmpty fableDir then true
+        else
+            let isOutdated =
+                try
+                    let version = IO.File.ReadAllText(compilerInfo)
+                    version <> Literals.VERSION
+                with _ -> true
+            if isOutdated then
+                IO.Directory.Delete(fableDir, true)
+            isOutdated
+
+    if isEmptyOrOutdated then
         IO.Directory.CreateDirectory(fableDir) |> ignore
+        IO.File.WriteAllText(compilerInfo, Literals.VERSION)
         IO.File.WriteAllText(IO.Path.Combine(fableDir, ".gitignore"), "**/*")
+
     fableDir
 
 let copyDirIfDoesNotExist (opts: Options) (source: string) (target: string) =
diff --git a/src/Fable.Cli/Util.fs b/src/Fable.Cli/Util.fs
diff --git a/src/Fable.Transforms/AST/AST.Babel.fs b/src/Fable.Transforms/AST/AST.Babel.fs
