Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Fix #2869: Avoid unnecessary updates #2941

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 65 additions & 4 deletions src/Fable.Cli/Main.fs
Original file line number Diff line number Diff line change
Expand Up @@ -144,11 +144,55 @@ module private Util =
if fileExt.EndsWith(".ts") then Path.replaceExtension ".js" fileExt else fileExt
let sourceDir = Path.GetDirectoryName(sourcePath)
let targetDir = Path.GetDirectoryName(targetPath)
let stream = new IO.StreamWriter(targetPath)
let memoryStream = new IO.MemoryStream()
let stream = new IO.StreamWriter(memoryStream)
let mapGenerator = lazy (SourceMapSharp.SourceMapGenerator(?sourceRoot = cliArgs.SourceMapsRoot))
let WriteStreamToFileAsync(stream : IO.Stream, filePath : string) = async {
stream.Seek(0, IO.SeekOrigin.Begin) |> ignore
use fileStream = new IO.StreamWriter(filePath)
do! stream.CopyToAsync(fileStream.BaseStream) |> Async.AwaitTask
do! fileStream.FlushAsync() |> Async.AwaitTask
}
let IsMemoryStreamEqualToFileAsync() = async {
memoryStream.Seek(0, IO.SeekOrigin.Begin) |> ignore
use fileStream = IO.File.OpenRead(targetPath)

let buffer = Array.zeroCreate 1024

let readBytesAsync (stream: IO.Stream) = async {
let rec nextBytesAsync() = async {
let! count = stream.AsyncRead(buffer, 0, buffer.Length)
if count = 0 then return None
else
let res =
if count = buffer.Length then buffer
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As we are using a single buffer, if count = 0 we just return a reference to the buffer. But in the lines below:

                    let! nextBytes1 = readBytesAsync memoryStream
                    let! nextBytes2 = readBytesAsync fileStream 

nextBytes1 is going to be same as nextBytes2 (if count is 0 in both cases), because readBytesAsync returns the same array reference in both cases and the second readBytesAsync will overwrite the buffer.

else buffer |> Seq.take count |> Array.ofSeq
return Some(res)
}
return! nextBytesAsync()
}

let rec compareBytesAsync bytes1 bytes2 = async {
match bytes1, bytes2 with
| Some(b1), Some(b2) when b1 <> b2 -> return false
| Some(_), Some(_) ->
let! nextBytes1 = readBytesAsync memoryStream
let! nextBytes2 = readBytesAsync fileStream
return! compareBytesAsync nextBytes1 nextBytes2
| None, None -> return true
| _ -> return false
}

let! memoryBytes = readBytesAsync memoryStream
let! fileBytes = readBytesAsync fileStream
return! compareBytesAsync memoryBytes fileBytes
}
interface BabelPrinter.Writer with
member _.Write(str) =
stream.WriteAsync(str) |> Async.AwaitTask
async {
do! stream.WriteAsync(str) |> Async.AwaitTask
do! stream.FlushAsync() |> Async.AwaitTask
}
member _.EscapeJsStringLiteral(str) =
Web.HttpUtility.JavaScriptStringEncode(str)
member _.MakeImportPath(path) =
Expand All @@ -172,6 +216,20 @@ module private Util =
mapGenerator.Force().AddMapping(generated, original, source=sourcePath, ?name=name)
member _.SourceMap =
mapGenerator.Force().toJSON()
member _.WriteToFileIfChangedAsync() = async {
if (memoryStream.Length = 0) then return ()

if (not(IO.File.Exists(targetPath))) then
do! WriteStreamToFileAsync(memoryStream, targetPath)
else
let fileInfo = new IO.FileInfo(targetPath)
if fileInfo.Length <> memoryStream.Length then
do! WriteStreamToFileAsync(memoryStream, targetPath)
else
let! isEqualToFile = IsMemoryStreamEqualToFileAsync()
if (not isEqualToFile) then
do! WriteStreamToFileAsync(memoryStream, targetPath)
}

let compileFile (com: CompilerImpl) (cliArgs: CliArgs) pathResolver isSilent = async {
try
Expand All @@ -187,13 +245,16 @@ module private Util =
let dir = IO.Path.GetDirectoryName outPath
if not (IO.Directory.Exists dir) then IO.Directory.CreateDirectory dir |> ignore

// write output to file
use writer = new FileWriter(com.CurrentFile, outPath, cliArgs, pathResolver)

// write output to a memory stream
let! sourceMap = async {
use writer = new FileWriter(com.CurrentFile, outPath, cliArgs, pathResolver)
do! BabelPrinter.run writer babel
return if cliArgs.SourceMaps then Some writer.SourceMap else None
}

do! writer.WriteToFileIfChangedAsync()

// write source map to file
match sourceMap with
| Some sourceMap ->
Expand Down
2 changes: 1 addition & 1 deletion src/Fable.Transforms/BabelPrinter.fs
Original file line number Diff line number Diff line change
Expand Up @@ -1069,7 +1069,7 @@ let run writer (program: Program): Async<unit> =
printer.PrintNewLine()

async {
use printer = new PrinterImpl(writer)
let printer = new PrinterImpl(writer)

let imports, restDecls =
program.Body |> Array.splitWhile (function
Expand Down