goscript 0.1.3 → 0.1.4

package/cmd/goscript/cmd_compile.go

@@ -17,7 +17,7 @@ func compileCommands() []*cli.Command {
 func newCompileCommand() *cli.Command {
 	var config compiler.Config
 	var packages cli.StringSlice
-	var buildFlags cli.StringSlice
+	var buildFlags rawStringSlice
 	var overrideDirs cli.StringSlice
 
 	return &cli.Command{
@@ -25,7 +25,7 @@ func newCompileCommand() *cli.Command {
 		Category: "compile",
 		Usage:    "compile a Go package to TypeScript",
 		Action: func(c *cli.Context) error {
-			config.BuildFlags = slices.Clone(buildFlags.Value())
+			config.BuildFlags = buildFlags.Value()
 			config.OverrideDirs = slices.Clone(overrideDirs.Value())
 			return compilePackage(c.Context, &config, packages.Value())
 		},
@@ -51,12 +51,12 @@ func newCompileCommand() *cli.Command {
 				Value:       "",
 				EnvVars:     []string{"GOSCRIPT_DIR"},
 			},
-			&cli.StringSliceFlag{
-				Name:        "build-flags",
-				Aliases:     []string{"b", "buildflags", "build-flag", "buildflag"},
-				Usage:       "Go build flags (tags) to use during analysis",
-				Destination: &buildFlags,
-				EnvVars:     []string{"GOSCRIPT_BUILD_FLAGS"},
+			&cli.GenericFlag{
+				Name:    "build-flags",
+				Aliases: []string{"b", "buildflags", "build-flag", "buildflag"},
+				Usage:   "Go build flags (tags) to use during analysis",
+				Value:   &buildFlags,
+				EnvVars: []string{"GOSCRIPT_BUILD_FLAGS"},
 			},
 			&cli.StringSliceFlag{
 				Name:        "gs-path",
@@ -84,6 +84,26 @@ func newCompileCommand() *cli.Command {
 	}
 }
 
+type rawStringSlice []string
+
+func (s *rawStringSlice) Set(value string) error {
+	if value == "" {
+		return nil
+	}
+	*s = append(*s, value)
+	return nil
+}
+
+func (s *rawStringSlice) String() string {
+	// Keep the flag default empty. The CLI package registers aliases against
+	// the same flag value, and echoing accumulated values here re-parses them.
+	return ""
+}
+
+func (s *rawStringSlice) Value() []string {
+	return slices.Clone(*s)
+}
+
 // compilePackage tries to compile the package.
 func compilePackage(ctx context.Context, config *compiler.Config, pkgs []string) error {
 	if len(pkgs) == 0 {

package/cmd/goscript/cmd_compile_test.go

@@ -14,22 +14,20 @@ func TestCompileCommandForwardsBuildFlags(t *testing.T) {
 	writeFile(t, filepath.Join(dir, "default.go"), strings.Join([]string{
 		"//go:build !customtag",
 		"",
-		"package main",
+		"package cli",
 		`const selected = "default"`,
 		"",
 	}, "\n"))
 	writeFile(t, filepath.Join(dir, "tagged.go"), strings.Join([]string{
 		"//go:build customtag",
 		"",
-		"package main",
+		"package cli",
 		`const selected = "custom"`,
 		"",
 	}, "\n"))
 	writeFile(t, filepath.Join(dir, "main.go"), strings.Join([]string{
-		"package main",
-		"func main() {",
-		"  println(selected)",
-		"}",
+		"package cli",
+		"func Selected() string { return selected }",
 		"",
 	}, "\n"))
 
@@ -71,6 +69,107 @@ func TestCompileCommandForwardsBuildFlags(t *testing.T) {
 	}
 }
 
+func TestCompileCommandPreservesCommaSeparatedBuildFlagValues(t *testing.T) {
+	dir := t.TempDir()
+	outputDir := filepath.Join(dir, "output")
+	writeFile(t, filepath.Join(dir, "go.mod"), "module example.test/cli\n\ngo 1.25.3\n")
+	writeFile(t, filepath.Join(dir, "default.go"), strings.Join([]string{
+		"//go:build !(customtag && othertag)",
+		"",
+		"package cli",
+		`const selected = "default"`,
+		"",
+	}, "\n"))
+	writeFile(t, filepath.Join(dir, "tagged.go"), strings.Join([]string{
+		"//go:build customtag && othertag",
+		"",
+		"package cli",
+		`const selected = "custom"`,
+		"",
+	}, "\n"))
+	writeFile(t, filepath.Join(dir, "main.go"), strings.Join([]string{
+		"package cli",
+		"func Selected() string { return selected }",
+		"",
+	}, "\n"))
+
+	app := newApp()
+	err := app.Run([]string{
+		"goscript",
+		"compile",
+		"--package",
+		".",
+		"--output",
+		outputDir,
+		"--dir",
+		dir,
+		"--build-flags=-tags=customtag,othertag",
+	})
+	if err != nil {
+		t.Fatalf("compile command failed: %v", err)
+	}
+
+	taggedPath := filepath.Join(outputDir, "@goscript", "example.test", "cli", "tagged.gs.ts")
+	tagged, err := os.ReadFile(taggedPath)
+	if err != nil {
+		t.Fatalf("read tagged generated file: %v", err)
+	}
+	if !strings.Contains(string(tagged), `"custom"`) {
+		t.Fatalf("expected tagged generated file to use tagged source, got:\n%s", tagged)
+	}
+}
+
+func TestCompileCommandPreservesCommaSeparatedBuildFlagEnvValue(t *testing.T) {
+	dir := t.TempDir()
+	outputDir := filepath.Join(dir, "output")
+	writeFile(t, filepath.Join(dir, "go.mod"), "module example.test/cli\n\ngo 1.25.3\n")
+	writeFile(t, filepath.Join(dir, "default.go"), strings.Join([]string{
+		"//go:build !(customtag && othertag)",
+		"",
+		"package cli",
+		`const selected = "default"`,
+		"",
+	}, "\n"))
+	writeFile(t, filepath.Join(dir, "tagged.go"), strings.Join([]string{
+		"//go:build customtag && othertag",
+		"",
+		"package cli",
+		`const selected = "custom"`,
+		"",
+	}, "\n"))
+	writeFile(t, filepath.Join(dir, "main.go"), strings.Join([]string{
+		"package cli",
+		"func Selected() string { return selected }",
+		"",
+	}, "\n"))
+
+	t.Setenv("GOSCRIPT_BUILD_FLAGS", "-tags=customtag,othertag")
+
+	app := newApp()
+	err := app.Run([]string{
+		"goscript",
+		"compile",
+		"--package",
+		".",
+		"--output",
+		outputDir,
+		"--dir",
+		dir,
+	})
+	if err != nil {
+		t.Fatalf("compile command failed: %v", err)
+	}
+
+	taggedPath := filepath.Join(outputDir, "@goscript", "example.test", "cli", "tagged.gs.ts")
+	tagged, err := os.ReadFile(taggedPath)
+	if err != nil {
+		t.Fatalf("read tagged generated file: %v", err)
+	}
+	if !strings.Contains(string(tagged), `"custom"`) {
+		t.Fatalf("expected tagged generated file to use tagged source, got:\n%s", tagged)
+	}
+}
+
 func writeFile(t *testing.T, path string, content string) {
 	t.Helper()
 	if err := os.WriteFile(path, []byte(content), 0o644); err != nil {

package/compiler/build-flags.go

@@ -1,8 +1,9 @@
 package compiler
 
-import "slices"
-
-import "strings"
+import (
+	"slices"
+	"strings"
+)
 
 const goScriptBuildTag = "goscript"
 
@@ -26,13 +27,11 @@ func appendBuildTag(value string, tag string) string {
 		return r == ',' || r == ' ' || r == '\t' || r == '\n'
 	})
 	if slices.Contains(tags, tag) {
-		return value
-	}
-	if strings.TrimSpace(value) == "" {
-		return tag
+		return strings.Join(tags, " ")
 	}
-	if strings.ContainsAny(value, " \t\n") {
-		return value + " " + tag
+	tags = append(tags, tag)
+	if len(tags) == 0 {
+		return ""
 	}
-	return value + "," + tag
+	return strings.Join(tags, " ")
 }

package/compiler/gotest/runner_test.go

@@ -64,6 +64,53 @@ func TestRunnerRunsOrdinaryPackageTest(t *testing.T) {
 	}
 }
 
+func TestRunnerComparesInterfacePointerValuesByIdentity(t *testing.T) {
+	moduleDir := writeFixture(t, map[string]string{
+		"go.mod": "module example.test/ifaceptr\n\ngo 1.25.3\n",
+		"value_test.go": strings.Join([]string{
+			"package ifaceptr",
+			"",
+			"import \"testing\"",
+			"",
+			"type Snapshot interface {",
+			"\tValue() int",
+			"}",
+			"",
+			"type snapshot struct {",
+			"\tvalue int",
+			"}",
+			"",
+			"func (s *snapshot) Value() int { return s.value }",
+			"",
+			"func TestInterfacePointerValuesUsePointerIdentity(t *testing.T) {",
+			"\tvar first Snapshot = &snapshot{value: 1}",
+			"\tvar second Snapshot = &snapshot{value: 1}",
+			"\tif first == second {",
+			"\t\tt.Fatalf(\"distinct pointers stored in interfaces compared equal\")",
+			"\t}",
+			"\tsecond = first",
+			"\tif first != second {",
+			"\t\tt.Fatalf(\"same pointer stored in interfaces compared unequal\")",
+			"\t}",
+			"}",
+			"",
+		}, "\n"),
+	})
+
+	result, err := NewRunner().Run(context.Background(), &Request{
+		Dir:      moduleDir,
+		Patterns: []string{"."},
+		Timeout:  30 * time.Second,
+		Verbose:  true,
+	})
+	if err != nil {
+		t.Fatalf("run package test: %v", err)
+	}
+	if !result.Passed() {
+		t.Fatalf("expected package test to pass: %#v", result.Packages)
+	}
+}
+
 func TestRunnerReportsShortMode(t *testing.T) {
 	moduleDir := writeFixture(t, map[string]string{
 		"go.mod": "module example.test/short\n\ngo 1.25.3\n",
@@ -258,6 +305,86 @@ func TestRunnerRunsExternalPackageTest(t *testing.T) {
 	}
 }
 
+func TestRunnerBatchCompilesSamePackageTests(t *testing.T) {
+	moduleDir := writeFixture(t, map[string]string{
+		"go.mod": "module example.test/samebatch\n\ngo 1.25.3\n",
+		"helper/value.go": strings.Join([]string{
+			"package helper",
+			"",
+			"func Value() int { return 2 }",
+			"",
+		}, "\n"),
+		"one/value.go": strings.Join([]string{
+			"package one",
+			"",
+			"func Value() int { return 1 }",
+			"",
+		}, "\n"),
+		"one/value_test.go": strings.Join([]string{
+			"package one",
+			"",
+			"import \"testing\"",
+			"",
+			"func TestOne(t *testing.T) {",
+			"\tif Value() != 1 {",
+			"\t\tt.Fatal(\"bad value\")",
+			"\t}",
+			"}",
+			"",
+		}, "\n"),
+		"two/value.go": strings.Join([]string{
+			"package two",
+			"",
+			"import \"example.test/samebatch/one\"",
+			"",
+			"func Value() int { return one.Value() + 1 }",
+			"",
+		}, "\n"),
+		"two/value_test.go": strings.Join([]string{
+			"package two",
+			"",
+			"import \"testing\"",
+			"",
+			"func TestTwo(t *testing.T) {",
+			"\tif Value() != 2 {",
+			"\t\tt.Fatal(\"bad value\")",
+			"\t}",
+			"}",
+			"",
+		}, "\n"),
+		"two/external_test.go": strings.Join([]string{
+			"package two_test",
+			"",
+			"import (",
+			"\t\"testing\"",
+			"",
+			"\t\"example.test/samebatch/helper\"",
+			"\t\"example.test/samebatch/two\"",
+			")",
+			"",
+			"func TestTwoExternal(t *testing.T) {",
+			"\tif two.Value() != helper.Value() {",
+			"\t\tt.Fatal(\"bad value\")",
+			"\t}",
+			"}",
+			"",
+		}, "\n"),
+	})
+
+	result, err := NewRunner().Run(context.Background(), &Request{
+		Dir:      moduleDir,
+		Patterns: []string{"./..."},
+		Timeout:  30 * time.Second,
+		Verbose:  true,
+	})
+	if err != nil {
+		t.Fatalf("run same-package batch tests: %v", err)
+	}
+	if !result.Passed() {
+		t.Fatalf("expected same-package batch tests to pass: %#v", result.Packages)
+	}
+}
+
 func TestRunnerAppliesOverridesToTestImports(t *testing.T) {
 	moduleDir := writeFixture(t, map[string]string{
 		"go.mod": "module example.test/testoverride\n\ngo 1.25.3\n",