chore: implement incremental build for FableLibrary task

MangelMaxime · MangelMaxime · commit 00ea25d58aa0 · 2026-03-22T23:42:32.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -232,3 +232,5 @@ Cargo.lock
 
 # This file is copied as part of the Restore task
 tests/React/Components.Copied.fs
+
+.build-cache/
diff --git a/src/Fable.Build/Fable.Build.fsproj b/src/Fable.Build/Fable.Build.fsproj
@@ -6,8 +6,9 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Utils.fs" />
-    <Compile Include="Utils/LastVersionFinder.fs" />
     <Compile Include="Workspace.fs" />
+    <Compile Include="Utils/LastVersionFinder.fs" />
+    <Compile Include="Utils/IncrementalBuild.fs" />
     <Compile Include="SimpleExec.Extensions.fs" />
     <Compile Include="FableLibrary/Core.fs" />
     <Compile Include="FableLibrary/Python.fs" />
@@ -46,6 +47,7 @@
     <PackageReference Include="EasyBuild.Tools" Version="6.0.0" />
     <PackageReference Include="Fake.IO.FileSystem" Version="6.1.4" />
     <PackageReference Include="FsToolkit.ErrorHandling" Version="5.2.0" />
+    <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.5" />
     <PackageReference Include="SimpleExec" Version="13.0.0" />
     <PackageReference Include="Thoth.Json.Net" Version="12.0.0" />
     <PackageReference Include="Semver" Version="3.0.0" />
diff --git a/src/Fable.Build/FableLibrary/Beam.fs b/src/Fable.Build/FableLibrary/Beam.fs
@@ -9,7 +9,12 @@ type BuildFableLibraryBeam() =
             Path.Combine("src", "fable-library-beam"),
             Path.Combine("src", "fable-library-beam"),
             Path.Combine("temp", "fable-library-beam"),
-            Path.Combine("temp", "fable-library-beam")
+            Path.Combine("temp", "fable-library-beam"),
+            [
+                Path.Combine("src", "fable-library-beam", "**", "*.erl")
+                Path.Combine("src", "fable-library-beam", "**", "*.fs")
+                Path.Combine("src", "fable-library-ts", "**", "*.fs")
+            ]
         )
 
     override this.CopyStage() =
diff --git a/src/Fable.Build/FableLibrary/Core.fs b/src/Fable.Build/FableLibrary/Core.fs
@@ -1,19 +1,30 @@
 namespace Build.FableLibrary
 
+open System
 open BlackFox.CommandLine
 open Fake.IO
 open System.IO
 open Build.Utils
 open Build.Utils
 open System.Diagnostics
 open SimpleExec
+open Microsoft.Extensions.FileSystemGlobbing
+open Microsoft.Extensions.FileSystemGlobbing.Abstractions
 
 /// <summary>
 /// Building fable-library is similar enough for all the targets
 /// that we can use this class to standardise the process.
 /// </summary>
 type BuildFableLibrary
-    (language: string, libraryDir: string, sourceDir: string, buildDir: string, outDir: string, ?fableLibArg: string)
+    (
+        language: string,
+        libraryDir: string,
+        sourceDir: string,
+        buildDir: string,
+        outDir: string,
+        inputPatterns: string list,
+        ?fableLibArg: string
+    )
     =
 
     // It seems like the different target have a different way of supporting
@@ -62,37 +73,50 @@ type BuildFableLibrary
 
             tryDelete 3
 
-    member this.Run(?skipIfExist: bool) =
+    member this.Run(?forceBuild: bool) =
         let toConsole (s: string) = System.Console.WriteLine(s)
 
-        let skipIfExist = defaultArg skipIfExist false
-
-        if skipIfExist && Directory.Exists outDir then
-            "Skipping Fable build stage" |> toConsole
-
-        else
-
-            "Cleaning build directory" |> toConsole
-
-            this.deleteDirectoryRobust buildDir
-
-            "Building Fable.Library" |> toConsole
-
-            let args =
-                CmdLine.appendRaw sourceDir
-                >> CmdLine.appendPrefix "--outDir" outDir
-                >> CmdLine.appendPrefix "--fableLib" fableLibArg
-                >> CmdLine.appendPrefix "--lang" language
-                >> CmdLine.appendPrefix "--exclude" "Fable.Core"
-                >> CmdLine.appendPrefix "--define" "FABLE_LIBRARY"
-                >> CmdLine.appendRaw "--noCache"
-                // Target implementation can require additional arguments
-                >> this.FableArgsBuilder
-
-            Command.Fable(args)
-
-            "Copy stage" |> toConsole
-            this.CopyStage()
-
-            "Post Fable build stage" |> toConsole
-            this.PostFableBuildStage()
+        let matcher = new Matcher()
+        matcher.AddIncludePatterns(inputPatterns)
+        // Ignore well-known build output folders from MSBuild
+        matcher.AddExcludePatterns([ "**/obj/**"; "**/bin/**" ])
+
+        let directoryInfo = DirectoryInfo(Path.Resolve())
+        let dirWrapper = DirectoryInfoWrapper(directoryInfo)
+
+        let inputFiles =
+            matcher.Execute(dirWrapper).Files
+            |> Seq.map (fun file -> Path.Combine(directoryInfo.FullName, file.Path))
+            |> Seq.toList
+
+        IncrementalBuild.run
+            $"fable-libary-%s{this.Language}"
+            (defaultArg forceBuild false)
+            inputFiles
+            [ Path.Resolve(this.OutDir) ]
+            (fun () ->
+                "Cleaning build directory" |> toConsole
+
+                this.deleteDirectoryRobust buildDir
+
+                "Building Fable.Library" |> toConsole
+
+                let args =
+                    CmdLine.appendRaw sourceDir
+                    >> CmdLine.appendPrefix "--outDir" outDir
+                    >> CmdLine.appendPrefix "--fableLib" fableLibArg
+                    >> CmdLine.appendPrefix "--lang" language
+                    >> CmdLine.appendPrefix "--exclude" "Fable.Core"
+                    >> CmdLine.appendPrefix "--define" "FABLE_LIBRARY"
+                    >> CmdLine.appendRaw "--noCache"
+                    // Target implementation can require additional arguments
+                    >> this.FableArgsBuilder
+
+                Command.Fable(args)
+
+                "Copy stage" |> toConsole
+                this.CopyStage()
+
+                "Post Fable build stage" |> toConsole
+                this.PostFableBuildStage()
+            )
diff --git a/src/Fable.Build/FableLibrary/Dart.fs b/src/Fable.Build/FableLibrary/Dart.fs
@@ -11,6 +11,10 @@ type BuildFableLibraryDart() =
             Path.Combine("src", "fable-library-dart"),
             Path.Combine("temp", "fable-library-dart"),
             Path.Combine("temp", "fable-library-dart"),
+            [
+                Path.Combine("src", "fable-library-dart", "**", "dart")
+                Path.Combine("src", "fable-library-dart", "**", "*.fs")
+            ],
             Path.Combine(".", "temp", "fable-library-dart")
         )
 
diff --git a/src/Fable.Build/FableLibrary/Python.fs b/src/Fable.Build/FableLibrary/Python.fs
@@ -13,7 +13,13 @@ type BuildFableLibraryPython(?skipCore: bool) =
             libraryDir = Path.Combine("src", "fable-library-py"),
             sourceDir = Path.Combine("src", "fable-library-py", "fable_library"),
             buildDir = Path.Combine("temp", "fable-library-py"),
-            outDir = Path.Combine("temp", "fable-library-py", "fable_library")
+            outDir = Path.Combine("temp", "fable-library-py", "fable_library"),
+            inputPatterns =
+                [
+                    Path.Combine("src", "fable-library-py", "**", "*.py")
+                    Path.Combine("src", "fable-library-py", "**", "*.fs")
+                    Path.Combine("src", "fable-library-ts", "**", "*.fs")
+                ]
         )
 
     let skipCore = defaultArg skipCore false
diff --git a/src/Fable.Build/FableLibrary/Rust.fs b/src/Fable.Build/FableLibrary/Rust.fs
@@ -12,7 +12,12 @@ type BuildFableLibraryRust() =
             Path.Combine("src", "fable-library-rust"),
             Path.Combine("src", "fable-library-rust", "src"),
             Path.Combine("temp", "fable-library-rust"),
-            Path.Combine("temp", "fable-library-rust", "src")
+            Path.Combine("temp", "fable-library-rust", "src"),
+            inputPatterns =
+                [
+                    Path.Combine("src", "fable-library-rust", "**", "*.rs")
+                    Path.Combine("src", "fable-library-rust", "**", "*.fs")
+                ]
         )
 
     override this.PostFableBuildStage() =
diff --git a/src/Fable.Build/FableLibrary/TypeScript.fs b/src/Fable.Build/FableLibrary/TypeScript.fs
@@ -13,6 +13,10 @@ type BuildFableLibraryTypeScript() =
             Path.Combine("src", "fable-library-ts"),
             Path.Combine("temp", "fable-library-ts"),
             Path.Combine("temp", "fable-library-ts"),
+            [
+                Path.Combine("src", "fable-library-ts", "**", "*.ts")
+                Path.Combine("src", "fable-library-ts", "**", "*.fs")
+            ],
             Path.Combine(".", "temp", "fable-library-ts")
         )
 
diff --git a/src/Fable.Build/Main.fs b/src/Fable.Build/Main.fs
@@ -32,7 +32,7 @@ Available commands:
             beam                    Run for BEAM (Erlang)
 
         Options:
-            --skip-fable-library    Skip building fable-library if folder already exists
+            --force-fable-library   Force building fable-library
             --watch                 Watch for changes and re-run the tests
 
     test                            Run the main tests suite
@@ -49,7 +49,7 @@ Available commands:
 
         Options for all except integration and standalone:
             --watch                 Watch for changes and re-run the tests
-            --skip-fable-library    Skip building fable-library if folder already exists
+            --force-fable-library   Force building fable-library
             --no-dotnet             When in watch mode, do not run the .NET tests
 
         Options for JavaScript:
@@ -73,28 +73,28 @@ Available commands:
                                     on top of of Node.js
 
         Options:
-            --skip-fable-library    Skip building fable-library if folder already exists
+            --force-fable-library   Force building fable-library
             --no-minify             Don't minify the JavaScript output
             --watch                 Watch for changes and recompile
 
     worker-js                       Compile the worker for the standalone version of Fable
 
         Options:
-            --skip-fable-library    Skip building fable-library if folder already exists
+            --force-fable-library   Force building fable-library
             --no-minify             Don't minify the JavaScript output
 
     compiler-js                     Compile the Fable compiler to JavaScript
 
         Options:
-            --skip-fable-library    Skip building fable-library if folder already exists
+            --force-fable-library   Force building fable-library
             --no-minify             Don't minify the JavaScript output
 
     package                         Generate local package for Fable.Cli and Fable.Core
                                     allowing to use this local package for testing
                                     inside of other projects
 
         Options:
-            --skip-fable-library    Skip building fable-library if folder already exists
+            --force-fable-library   Force building fable-library
 
     publish                         Publish the different packages to NuGet and NPM
                                     based on the CHANGELOG.md files
diff --git a/src/Fable.Build/Package.fs b/src/Fable.Build/Package.fs
@@ -12,14 +12,14 @@ open EasyBuild.Tools.PackageJson
 let private packageDestination = Path.Resolve("temp", "packages")
 
 let handle (args: string list) =
-    let skipFableLibrary = args |> List.contains "--skip-fable-library"
+    let forceFableLibrary = args |> List.contains "--force-fable-library"
     // Build all the fable-libraries
-    BuildFableLibraryBeam().Run(skipFableLibrary)
-    BuildFableLibraryDart().Run(skipFableLibrary)
-    BuildFableLibraryJavaScript().Run(skipFableLibrary)
-    BuildFableLibraryPython().Run(skipFableLibrary)
-    BuildFableLibraryRust().Run(skipFableLibrary)
-    BuildFableLibraryTypeScript().Run(skipFableLibrary)
+    BuildFableLibraryBeam().Run(forceFableLibrary)
+    BuildFableLibraryDart().Run(forceFableLibrary)
+    BuildFableLibraryJavaScript().Run(forceFableLibrary)
+    BuildFableLibraryPython().Run(forceFableLibrary)
+    BuildFableLibraryRust().Run(forceFableLibrary)
+    BuildFableLibraryTypeScript().Run(forceFableLibrary)
 
     Directory.clean packageDestination
 
diff --git a/src/Fable.Build/Publish.fs b/src/Fable.Build/Publish.fs
@@ -87,12 +87,14 @@ let private publishNpm (projectDir: string) =
 
 let handle (args: string list) =
     // Build all the fable-libraries
-    BuildFableLibraryBeam().Run()
-    BuildFableLibraryDart().Run()
-    BuildFableLibraryJavaScript().Run()
-    BuildFableLibraryPython().Run()
-    BuildFableLibraryRust().Run()
-    BuildFableLibraryTypeScript().Run()
+    // Force rebuld of fable-libraries to make sure they are generated with the latest
+    // version of the compiler
+    BuildFableLibraryBeam().Run(true)
+    BuildFableLibraryDart().Run(true)
+    BuildFableLibraryJavaScript().Run(true)
+    BuildFableLibraryPython().Run(true)
+    BuildFableLibraryRust().Run(true)
+    BuildFableLibraryTypeScript().Run(true)
 
     // Handle the NPM packages
 
@@ -132,8 +134,8 @@ let handle (args: string list) =
     // Trigger fable-compiler-js target to make sure everything is ready for publish
     // Note: fable-standalone is built as part of fable-compiler-js
     // so no need to build it separately
-    // Note 2: We already built fable-library, so we skip it here
-    CompilerJs.handle [ "--skip-fable-library" ]
+    // Note 2: We already built fable-library, it will be skipped thanks to incremental build
+    CompilerJs.handle []
 
     publishNpm ProjectDir.fable_standalone
     publishNpm ProjectDir.fable_compiler_js
diff --git a/src/Fable.Build/Quicktest/Python.fs b/src/Fable.Build/Quicktest/Python.fs
@@ -3,8 +3,6 @@ module Build.Quicktest.Python
 open Build.FableLibrary
 open Build.Quicktest.Core
 open SimpleExec
-open System.IO
-open Build
 open Build.Utils
 
 let private fableLibraryBuildDir = Path.Resolve("temp", "fable-library-py")
@@ -14,8 +12,8 @@ let handle (args: string list) =
 
     // Install local fable-library as editable package for testing
     // This ensures quicktest uses the locally built version, not PyPI
-    if not (args |> List.contains "--skip-fable-library") then
-        BuildFableLibraryPython(skipCore = skipFableLibraryCore).Run(false)
+    if (args |> List.contains "--force-fable-library") then
+        BuildFableLibraryPython(skipCore = skipFableLibraryCore).Run(true)
         // Install fable-library in editable mode
         Command.Run("uv", $"pip install -e {fableLibraryBuildDir}")
 
@@ -28,4 +26,4 @@ let handle (args: string list) =
             RunMode = RunScript
         }
         // Always skip library in genericQuicktest since we handled it above
-        ("--skip-fable-library" :: args)
+        args
diff --git a/src/Fable.Build/Standalone.fs b/src/Fable.Build/Standalone.fs
@@ -108,13 +108,10 @@ let build (minify: bool) =
 
 let handle (args: string list) =
     let minify = args |> List.contains "--no-minify" |> not
-    let isWatch = args |> List.contains "--watch"
-    let skipFableLibrary = args |> List.contains "--skip-fable-library"
 
     Command.Run("npm", "install", workingDirectory = projectDir)
 
-    BuildFableLibraryJavaScript().Run(skipFableLibrary)
+    BuildFableLibraryJavaScript().Run()
 
     build minify
-    // Force skip fable library for worker, because it's already built
-    WorkerJs.handle ("--skip-fable-library" :: args)
+    WorkerJs.handle args
diff --git a/src/Fable.Build/Test/Beam.fs b/src/Fable.Build/Test/Beam.fs
@@ -18,9 +18,9 @@ let private testProjectName =
 let handle (args: string list) =
     let isWatch = args |> List.contains "--watch"
     let noDotnet = args |> List.contains "--no-dotnet"
-    let skipFableLibrary = args |> List.contains "--skip-fable-library"
+    let forceFableLibrary = args |> List.contains "--force-fable-library"
 
-    BuildFableLibraryBeam().Run(skipFableLibrary)
+    BuildFableLibraryBeam().Run(forceFableLibrary)
 
     Directory.clean buildDir
 
diff --git a/src/Fable.Build/Test/Dart.fs b/src/Fable.Build/Test/Dart.fs
@@ -12,11 +12,11 @@ let private testsFolder = Path.Resolve("tests", "Dart")
 let private testsFsprojFolder = Path.Resolve("tests", "Dart", "src")
 
 let handle (args: string list) =
-    let skipFableLibrary = args |> List.contains "--skip-fable-library"
+    let forceFableLibrary = args |> List.contains "--force-fable-library"
     let isWatch = args |> List.contains "--watch"
     let noDotnet = args |> List.contains "--no-dotnet"
 
-    BuildFableLibraryDart().Run(skipFableLibrary)
+    BuildFableLibraryDart().Run(forceFableLibrary)
 
     Directory.clean buildDir
 
diff --git a/src/Fable.Build/Test/JavaScript.fs b/src/Fable.Build/Test/JavaScript.fs
@@ -159,7 +159,7 @@ let handle (args: string list) =
     let isReactOnly = args |> List.contains "--react-only"
     let isStandaloneOnly = args |> List.contains "--standalone-only"
     let isAdaptiveOnly = args |> List.contains "--adaptive-only"
-    let skipFableLibrary = args |> List.contains "--skip-fable-library"
+    let forceFableLibrary = args |> List.contains "--force-fable-library"
     let isWatch = args |> List.contains "--watch"
     let noDotnet = args |> List.contains "--no-dotnet"
 
@@ -171,7 +171,7 @@ let handle (args: string list) =
 
     | _ -> ()
 
-    BuildFableLibraryJavaScript().Run(skipFableLibrary)
+    BuildFableLibraryJavaScript().Run(forceFableLibrary)
 
     if isReactOnly then
         testReact isWatch
diff --git a/src/Fable.Build/Test/Python.fs b/src/Fable.Build/Test/Python.fs
diff --git a/src/Fable.Build/Test/Rust.fs b/src/Fable.Build/Test/Rust.fs
diff --git a/src/Fable.Build/Test/TypeScript.fs b/src/Fable.Build/Test/TypeScript.fs
diff --git a/src/Fable.Build/Utils/IncrementalBuild.fs b/src/Fable.Build/Utils/IncrementalBuild.fs
diff --git a/src/Fable.Build/WorkerJs.fs b/src/Fable.Build/WorkerJs.fs
diff --git a/src/Fable.Transforms/Python/TYPE-ANNOTATIONS.md b/src/Fable.Transforms/Python/TYPE-ANNOTATIONS.md
