Using srcModTime instead of time.Now

grantnelson-wf · grantnelson-wf · commit 11bf21deb86e · 2024-12-12T10:56:34.000-07:00
diff --git a/build/build.go b/build/build.go
@@ -1035,7 +1035,7 @@ func (s *Session) BuildPackage(pkg *PackageData) (*compiler.Archive, error) {
 		fmt.Println(pkg.ImportPath)
 	}
 
-	s.buildCache.StoreArchive(archive, time.Now())
+	s.buildCache.StoreArchive(archive, pkg.SrcModTime)
 	s.UpToDateArchives[pkg.ImportPath] = archive
 
 	return archive, nil
diff --git a/build/cache/cache.go b/build/cache/cache.go
@@ -92,6 +92,9 @@ func (bc BuildCache) String() string {
 
 // StoreArchive compiled archive in the cache. Any error inside this method
 // will cause the cache not to be persisted.
+//
+// The passed in buildTime is used to determine if the archive is out-of-date when reloaded.
+// Typically it should be set to the srcModTime or time.Now().
 func (bc *BuildCache) StoreArchive(a *compiler.Archive, buildTime time.Time) {
 	if bc == nil {
 		return // Caching is disabled.
diff --git a/compiler/compiler.go b/compiler/compiler.go
@@ -317,7 +317,7 @@ func ReadArchive(importPath string, r io.Reader, srcModTime time.Time, imports m
 // WriteArchive writes compiled package archive on disk for later reuse.
 //
 // The passed in buildTime is used to determine if the archive is out-of-date.
-// It should be set to time.Now() typically but it exposed for testing purposes.
+// Typically it should be set to the srcModTime or time.Now() but it is exposed for testing purposes.
 func WriteArchive(a *Archive, buildTime time.Time, w io.Writer) error {
 	exportData := new(bytes.Buffer)
 	if a.Package != nil {
diff --git a/compiler/compiler_test.go b/compiler/compiler_test.go
@@ -428,7 +428,7 @@ func TestArchiveSelectionAfterSerialization(t *testing.T) {
 	origJS := renderPackage(t, origArchives[rootPath], false)
 	readJS := renderPackage(t, readArchives[rootPath], false)
 
-	if diff := cmp.Diff(string(origJS), string(readJS)); diff != "" {
+	if diff := cmp.Diff(origJS, readJS); diff != "" {
 		t.Errorf("the reloaded files produce different JS:\n%s", diff)
 	}
 }
@@ -444,12 +444,12 @@ func compareOrder(t *testing.T, sourceFiles []srctesting.Source, minify bool) {
 
 	outputReversed := compile(t, sourceFiles, minify)
 
-	if diff := cmp.Diff(string(outputNormal), string(outputReversed)); diff != "" {
+	if diff := cmp.Diff(outputNormal, outputReversed); diff != "" {
 		t.Errorf("files in different order produce different JS:\n%s", diff)
 	}
 }
 
-func compile(t *testing.T, sourceFiles []srctesting.Source, minify bool) []byte {
+func compile(t *testing.T, sourceFiles []srctesting.Source, minify bool) string {
 	t.Helper()
 	rootPkg := srctesting.ParseSources(t, sourceFiles, nil)
 	archives := compileProject(t, rootPkg, minify)
@@ -460,11 +460,7 @@ func compile(t *testing.T, sourceFiles []srctesting.Source, minify bool) []byte
 		t.Fatalf(`root package not found in archives: %s`, path)
 	}
 
-	b := renderPackage(t, a, minify)
-	if len(b) == 0 {
-		t.Fatal(`compile had no output`)
-	}
-	return b
+	return renderPackage(t, a, minify)
 }
 
 // compileProject compiles the given root package and all packages imported by the root.
@@ -563,7 +559,7 @@ func reloadCompiledProject(t *testing.T, archives map[string]*Archive, rootPkgPa
 	return reloadCache
 }
 
-func renderPackage(t *testing.T, archive *Archive, minify bool) []byte {
+func renderPackage(t *testing.T, archive *Archive, minify bool) string {
 	t.Helper()
 
 	sel := &dce.Selector[*Decl]{}
@@ -578,7 +574,11 @@ func renderPackage(t *testing.T, archive *Archive, minify bool) []byte {
 		t.Fatal(err)
 	}
 
-	return buf.Bytes()
+	b := buf.String()
+	if len(b) == 0 {
+		t.Fatal(`render package had no output`)
+	}
+	return b
 }
 
 type selectionTester struct {

Original file line number	Diff line number	Diff line change
`@@ -1035,7 +1035,7 @@ func (s Session) BuildPackage(pkg PackageData) (*compiler.Archive, error) {`
`1035`	`1035`	`fmt.Println(pkg.ImportPath)`
`1036`	`1036`	`}`
`1037`	`1037`
`1038`		`- s.buildCache.StoreArchive(archive, time.Now())`
	`1038`	`+ s.buildCache.StoreArchive(archive, pkg.SrcModTime)`
`1039`	`1039`	`s.UpToDateArchives[pkg.ImportPath] = archive`
`1040`	`1040`
`1041`	`1041`	`return archive, nil`
Original file line number	Diff line number	Diff line change
`@@ -428,7 +428,7 @@ func TestArchiveSelectionAfterSerialization(t *testing.T) {`
`428`	`428`	`origJS := renderPackage(t, origArchives[rootPath], false)`
`429`	`429`	`readJS := renderPackage(t, readArchives[rootPath], false)`
`430`	`430`
`431`		`- if diff := cmp.Diff(string(origJS), string(readJS)); diff != "" {`
	`431`	`+ if diff := cmp.Diff(origJS, readJS); diff != "" {`
`432`	`432`	`t.Errorf("the reloaded files produce different JS:\n%s", diff)`
`433`	`433`	`}`
`434`	`434`	`}`
`@@ -444,12 +444,12 @@ func compareOrder(t *testing.T, sourceFiles []srctesting.Source, minify bool) {`
`444`	`444`
`445`	`445`	`outputReversed := compile(t, sourceFiles, minify)`
`446`	`446`
`447`		`- if diff := cmp.Diff(string(outputNormal), string(outputReversed)); diff != "" {`
	`447`	`+ if diff := cmp.Diff(outputNormal, outputReversed); diff != "" {`
`448`	`448`	`t.Errorf("files in different order produce different JS:\n%s", diff)`
`449`	`449`	`}`
`450`	`450`	`}`
`451`	`451`
`452`		`-func compile(t *testing.T, sourceFiles []srctesting.Source, minify bool) []byte {`
	`452`	`+func compile(t *testing.T, sourceFiles []srctesting.Source, minify bool) string {`
`453`	`453`	`t.Helper()`
`454`	`454`	`rootPkg := srctesting.ParseSources(t, sourceFiles, nil)`
`455`	`455`	`archives := compileProject(t, rootPkg, minify)`
`@@ -460,11 +460,7 @@ func compile(t *testing.T, sourceFiles []srctesting.Source, minify bool) []byte`
`460`	`460`	t.Fatalf(`root package not found in archives: %s`, path)
`461`	`461`	`}`
`462`	`462`
`463`		`- b := renderPackage(t, a, minify)`
`464`		`- if len(b) == 0 {`
`465`		- t.Fatal(`compile had no output`)
`466`		`- }`
`467`		`- return b`
	`463`	`+ return renderPackage(t, a, minify)`
`468`	`464`	`}`
`469`	`465`
`470`	`466`	`// compileProject compiles the given root package and all packages imported by the root.`
`@@ -563,7 +559,7 @@ func reloadCompiledProject(t testing.T, archives map[string]Archive, rootPkgPa`
`563`	`559`	`return reloadCache`
`564`	`560`	`}`
`565`	`561`
`566`		`-func renderPackage(t testing.T, archive Archive, minify bool) []byte {`
	`562`	`+func renderPackage(t testing.T, archive Archive, minify bool) string {`
`567`	`563`	`t.Helper()`
`568`	`564`
`569`	`565`	`sel := &dce.Selector[*Decl]{}`
`@@ -578,7 +574,11 @@ func renderPackage(t testing.T, archive Archive, minify bool) []byte {`
`578`	`574`	`t.Fatal(err)`
`579`	`575`	`}`
`580`	`576`
`581`		`- return buf.Bytes()`
	`577`	`+ b := buf.String()`
	`578`	`+ if len(b) == 0 {`
	`579`	+ t.Fatal(`render package had no output`)
	`580`	`+ }`
	`581`	`+ return b`
`582`	`582`	`}`
`583`	`583`
`584`	`584`	`type selectionTester struct {`