Minimum row

2026-05-25 14:50:01 +02:00
parent a646c905e4
commit 37db91314b
7 changed files with 171 additions and 38 deletions
@@ -712,6 +712,73 @@ func TestBuildNativeAllocatesConfiguredDatasetsIntoFirstNullBaseRows(t *testing.
 	}
 }

+func TestBuildNativeAllocatesFirstNullRowsAtOrAboveConfiguredMinimumRow(t *testing.T) {
+	root := testProjectRoot(t)
+	mkdirAll(t, filepath.Join(root, "topdata", "data", "portraits", "modules"))
+	writeFile(t, filepath.Join(root, "topdata", "base_dialog.json"), "{}\n")
+	writeFile(t, filepath.Join(root, "topdata", "data", "portraits", "base.json"), `{
+  "output": "portraits.2da",
+  "columns": ["BaseResRef", "Sex"],
+  "rows": [
+    {"id": 0, "key": "portraits:none", "BaseResRef": "po_none_", "Sex": 0},
+    {"id": 1, "BaseResRef": "****", "Sex": "****"},
+    {"id": 15000, "BaseResRef": "****", "Sex": "****"},
+    {"id": 15001, "BaseResRef": "****", "Sex": "****"}
+  ]
+}`+"\n")
+	writeFile(t, filepath.Join(root, "topdata", "data", "portraits", "lock.json"), `{
+  "portraits:none": 0,
+  "portraits:first": 1,
+  "portraits:second": 15002
+}`+"\n")
+	writeFile(t, filepath.Join(root, "topdata", "data", "portraits", "modules", "custom.json"), `{
+  "entries": {
+    "portraits:first": {"BaseResRef": "first_", "Sex": 4},
+    "portraits:second": {"BaseResRef": "second_", "Sex": 4},
+    "portraits:third": {"BaseResRef": "third_", "Sex": 4}
+  }
+}`+"\n")
+
+	proj := testProject(root)
+	proj.Config.TopData.RowGeneration = []project.TopDataRowGenerationConfig{
+		{Dataset: "portraits", Mode: "first_null_row", MinimumRow: 15000},
+	}
+	result, err := BuildNativeWithOptions(proj, NativeBuildOptions{BuildWiki: false}, nil)
+	if err != nil {
+		t.Fatalf("BuildNativeWithOptions failed: %v", err)
+	}
+
+	lockRaw, err := os.ReadFile(filepath.Join(root, "topdata", "data", "portraits", "lock.json"))
+	if err != nil {
+		t.Fatalf("read lockfile: %v", err)
+	}
+	lockText := string(lockRaw)
+	for _, want := range []string{
+		`"portraits:first": 15000`,
+		`"portraits:second": 15001`,
+		`"portraits:third": 15002`,
+	} {
+		if !strings.Contains(lockText, want) {
+			t.Fatalf("expected portrait locks to respect minimum row, missing %s in:\n%s", want, lockText)
+		}
+	}
+	outputRaw, err := os.ReadFile(filepath.Join(result.Output2DADir, "portraits.2da"))
+	if err != nil {
+		t.Fatalf("read portraits.2da: %v", err)
+	}
+	output := string(outputRaw)
+	for _, want := range []string{
+		"1\t****\t****",
+		"15000\tfirst_\t4",
+		"15001\tsecond_\t4",
+		"15002\tthird_\t4",
+	} {
+		if !strings.Contains(output, want) {
+			t.Fatalf("expected generated portraits row %q, got:\n%s", want, output)
+		}
+	}
+}
+
 func TestMergeExpansionDataAllocatesConfiguredDatasetsIntoFirstNullRows(t *testing.T) {
 	root := t.TempDir()
 	lockPath := filepath.Join(root, "portraits-lock.json")
@@ -764,6 +831,49 @@ func TestMergeExpansionDataAllocatesConfiguredDatasetsIntoFirstNullRows(t *testi
 	}
 }

+func TestMergeExpansionDataAllocatesFirstNullRowsAtOrAboveConfiguredMinimumRow(t *testing.T) {
+	root := t.TempDir()
+	lockPath := filepath.Join(root, "portraits-lock.json")
+	writeFile(t, lockPath, `{
+  "portraits:existing": 0
+}`+"\n")
+
+	collected, err := mergeExpansionData([]nativeCollectedDataset{
+		{
+			Dataset: nativeDataset{
+				Kind:          nativeDatasetBase,
+				Name:          "appearance",
+				OutputName:    "appearance.2da",
+				RowGeneration: "after_base",
+			},
+			Columns:  []string{"LABEL", "PORTRAIT"},
+			Rows:     []map[string]any{{"id": 0, "key": "appearance:source", "PORTRAIT": map[string]any{"value": "po_expanded_", "data": map[string]any{"portraits": map[string]any{"key": "portraits:expanded", "BaseResRef": "expanded_", "Sex": 4}}}}},
+			LockData: map[string]int{"appearance:source": 0},
+		},
+		{
+			Dataset: nativeDataset{
+				Kind:                nativeDatasetBase,
+				Name:                "portraits",
+				LockPath:            lockPath,
+				OutputName:          "portraits.2da",
+				RowGeneration:       "first_null_row",
+				RowGenerationMinRow: 15000,
+			},
+			Columns:  []string{"BaseResRef", "Sex"},
+			Rows:     []map[string]any{{"id": 0, "key": "portraits:existing", "BaseResRef": "existing_", "Sex": 4}, {"id": 1, "BaseResRef": "****", "Sex": "****"}},
+			LockData: map[string]int{"portraits:existing": 0},
+		},
+	})
+	if err != nil {
+		t.Fatalf("mergeExpansionData failed: %v", err)
+	}
+
+	portraits := collected[1]
+	if got := portraits.LockData["portraits:expanded"]; got != 15000 {
+		t.Fatalf("expected expansion lock to respect minimum row 15000, got %d in %#v", got, portraits.LockData)
+	}
+}
+
 func TestResolvedTableRegistryRejectsDuplicateKeys(t *testing.T) {
 	_, err := newResolvedTableRegistry([]nativeCollectedDataset{
 		{