goscript 0.2.5 → 0.2.7

package/cmd/goscript/cmd-compile.go

@@ -53,6 +53,13 @@ func newCompileCommand() *cli.Command {
 				Value:       "",
 				EnvVars:     []string{"GOSCRIPT_DIR"},
 			},
+			&cli.StringFlag{
+				Name:        "compiler-cache-root",
+				Usage:       "explicit compiler package artifact cache root",
+				Destination: &config.CacheRoot,
+				Value:       "",
+				EnvVars:     []string{"GOSCRIPT_COMPILER_CACHE_ROOT"},
+			},
 			&cli.GenericFlag{
 				Name:    "build-flags",
 				Aliases: []string{"b", "buildflags", "build-flag", "buildflag"},

package/cmd/goscript/cmd_compile_test.go

@@ -211,6 +211,71 @@ func TestCompileCommandForwardsPackageBlocklist(t *testing.T) {
 	}
 }
 
+func TestCompileCommandForwardsCompilerCacheRoot(t *testing.T) {
+	dir := t.TempDir()
+	outputDir := filepath.Join(dir, "output")
+	cacheRoot := filepath.Join(dir, "cache")
+	writeFile(t, filepath.Join(dir, "go.mod"), "module example.test/clicache\n\ngo 1.25.3\n")
+	writeFile(t, filepath.Join(dir, "main.go"), strings.Join([]string{
+		"package clicache",
+		"const Value = 1",
+		"",
+	}, "\n"))
+
+	app := newApp()
+	err := app.Run([]string{
+		"goscript",
+		"compile",
+		"--package",
+		".",
+		"--output",
+		outputDir,
+		"--dir",
+		dir,
+		"--compiler-cache-root",
+		cacheRoot,
+	})
+	if err != nil {
+		t.Fatalf("compile command failed: %v", err)
+	}
+
+	if got := countCompilerCacheManifests(t, cacheRoot); got == 0 {
+		t.Fatal("compiler cache root did not receive cache manifests")
+	}
+}
+
+func TestCompileCommandForwardsCompilerCacheRootEnv(t *testing.T) {
+	dir := t.TempDir()
+	outputDir := filepath.Join(dir, "output")
+	cacheRoot := filepath.Join(dir, "cache")
+	writeFile(t, filepath.Join(dir, "go.mod"), "module example.test/clicacheenv\n\ngo 1.25.3\n")
+	writeFile(t, filepath.Join(dir, "main.go"), strings.Join([]string{
+		"package clicacheenv",
+		"const Value = 1",
+		"",
+	}, "\n"))
+	t.Setenv("GOSCRIPT_COMPILER_CACHE_ROOT", cacheRoot)
+
+	app := newApp()
+	err := app.Run([]string{
+		"goscript",
+		"compile",
+		"--package",
+		".",
+		"--output",
+		outputDir,
+		"--dir",
+		dir,
+	})
+	if err != nil {
+		t.Fatalf("compile command failed: %v", err)
+	}
+
+	if got := countCompilerCacheManifests(t, cacheRoot); got == 0 {
+		t.Fatal("compiler cache env root did not receive cache manifests")
+	}
+}
+
 func writeFile(t *testing.T, path string, content string) {
 	t.Helper()
 	if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {
@@ -220,3 +285,21 @@ func writeFile(t *testing.T, path string, content string) {
 		t.Fatalf("write %s: %v", path, err)
 	}
 }
+
+func countCompilerCacheManifests(t *testing.T, cacheRoot string) int {
+	t.Helper()
+	count := 0
+	err := filepath.WalkDir(cacheRoot, func(_ string, entry os.DirEntry, err error) error {
+		if err != nil {
+			return err
+		}
+		if !entry.IsDir() && entry.Name() == "manifest.json" {
+			count++
+		}
+		return nil
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	return count
+}

package/compiler/compile-request.go

@@ -34,6 +34,8 @@ type CompileRequest struct {
 	Dir string
 	// OutputPath is the root where TypeScript output would be written.
 	OutputPath string
+	// CacheRoot is the explicit compiler cache root. Empty disables caching.
+	CacheRoot string
 	// BuildFlags are forwarded to the Go package loader.
 	BuildFlags []string
 	// OverrideDirs are additional GoScript override roots.
@@ -82,6 +84,7 @@ func (o *CompileRequestOwner) NewRequest(conf Config, patterns []string) *Compil
 		Patterns:                  normalizePatterns(patterns),
 		Dir:                       strings.TrimSpace(dir),
 		OutputPath:                strings.TrimSpace(conf.OutputPath),
+		CacheRoot:                 strings.TrimSpace(conf.CacheRoot),
 		BuildFlags:                append([]string(nil), conf.BuildFlags...),
 		OverrideDirs:              append([]string(nil), conf.OverrideDirs...),
 		PackageBlocklist:          normalizePackageBlocklist(conf.PackageBlocklist),