Update BuildAndPackage

internal/pipeline/build.go

@@ -94,8 +94,16 @@ func buildModule(p *project.Project, progress ProgressFunc) (BuildResult, error)
 	var topPackage topdata.PackageResult
 	var err error
 	if p.HasTopData() {
-		progressf(progress, "Building native top package...")
-		topPackage, err = topdata.BuildPackage(p, func(message string) {
+		progressf(progress, "Building native topdata...")
+		nativeTopData, buildErr := topdata.BuildNative(p, func(message string) {
+			progressf(progress, "Top package: "+message)
+		})
+		if buildErr != nil {
+			return BuildResult{}, buildErr
+		}
+
+		progressf(progress, "Packaging native top package...")
+		topPackage, err = topdata.BuildPackageFromBuild(p, nativeTopData, func(message string) {
 			progressf(progress, "Top package: "+message)
 		})
 		if err != nil {

internal/pipeline/pipeline_test.go

@@ -546,6 +546,74 @@ func TestBuildModuleBuildsTopPackageAndInjectsHAKList(t *testing.T) {
 	}
 }
 
+func TestBuildModuleCompilesTopDataOnlyOnce(t *testing.T) {
+	root := t.TempDir()
+	mustMkdir(t, filepath.Join(root, "src", "module"))
+	mustMkdir(t, filepath.Join(root, "assets"))
+	mustMkdir(t, filepath.Join(root, "build"))
+	mustMkdir(t, filepath.Join(root, "topdata", "data", "repadjust"))
+
+	mustWriteFile(t, filepath.Join(root, "nwn-tool.json"), `{
+  "module": {
+    "name": "Test Module",
+    "resref": "testmod",
+    "hak_order": ["sow_top"]
+  },
+  "paths": {
+    "source": "src",
+    "assets": "assets",
+    "build": "build"
+  },
+  "topdata": {
+    "source": "topdata",
+    "build": "build/topdata"
+  }
+}
+`)
+	mustWriteFile(t, filepath.Join(root, "src", "module", "module.ifo.json"), `{
+  "file_type": "IFO ",
+  "file_version": "V3.2",
+  "root": {
+    "struct_type": 0,
+    "fields": [
+      {"label": "Mod_Name", "type": "CExoString", "value": "Test Module"},
+      {"label": "Mod_CustomTlk", "type": "CExoString", "value": "sow_tlk"}
+    ]
+  }
+}
+`)
+	mustWriteFile(t, filepath.Join(root, "topdata", "base_dialog.json"), "{}\n")
+	mustWriteFile(t, filepath.Join(root, "topdata", "data", "repadjust", "base.json"), `{
+  "output": "repadjust.2da",
+  "columns": ["Label"],
+  "rows": [{"id": 0, "Label": "TEST_LABEL"}]
+}
+`)
+
+	p, err := project.Load(root)
+	if err != nil {
+		t.Fatalf("load project: %v", err)
+	}
+	if err := p.ValidateLayout(); err != nil {
+		t.Fatalf("validate layout: %v", err)
+	}
+	if err := p.Scan(); err != nil {
+		t.Fatalf("scan: %v", err)
+	}
+
+	var progress []string
+	if _, err := BuildModuleWithProgress(p, func(message string) {
+		progress = append(progress, message)
+	}); err != nil {
+		t.Fatalf("build module: %v", err)
+	}
+
+	joined := strings.Join(progress, "\n")
+	if got := strings.Count(joined, "Building native topdata datasets..."); got != 1 {
+		t.Fatalf("expected exactly one native topdata compile pass, got %d\nprogress:\n%s", got, joined)
+	}
+}
+
 func TestCompareFailsWhenTopPackageIsStale(t *testing.T) {
 	root := t.TempDir()
 	mustMkdir(t, filepath.Join(root, "src", "module"))