Conversion to full YAML

2026-05-13 19:22:07 +02:00
parent 7d286551b3
commit 03e2320788
6 changed files with 475 additions and 166 deletions
@@ -11,21 +11,27 @@ import (

 func TestRunConvertCommandInfersTemplateNamespaceAndOutput(t *testing.T) {
 	root := testProjectRoot(t)
-	writeFile(t, filepath.Join(root, "nwn-tool.json"), `{
-  "module": {"name": "Test", "resref": "test"},
-  "paths": {"source": "src", "assets": "assets", "build": "build"},
-  "topdata": {"source": "topdata", "build": "build/topdata"}
-}`+"\n")
+	writeFile(t, filepath.Join(root, "nwn-tool.yaml"), `
+module:
+  name: Test
+  resref: test
+paths:
+  source: src
+  assets: assets
+  build: build
+topdata:
+  source: topdata
+  build: build/topdata
+`)
 	mkdirAll(t, filepath.Join(root, "topdata", "templates"))
 	mkdirAll(t, filepath.Join(root, "topdata", "data", "appearance", "modules"))
-	writeFile(t, filepath.Join(root, "topdata", "templates", "config.json"), `{
-  "tables": {
-    "template_appearance": {
-      "namespace": "appearance",
-      "key_fields": ["LABEL"]
-    }
-  }
-}`+"\n")
+	writeFile(t, filepath.Join(root, "topdata", "templates", "config.yaml"), `
+tables:
+  template_appearance:
+    namespace: appearance
+    key_fields:
+      - LABEL
+`)
 	writeFile(t, filepath.Join(root, "topdata", "templates", "template_appearance.2da"), "2DA V2.0\n\nLABEL STRING_REF NAME\n960 \"Zombie, Ash, Hot\" **** Zombie_Ash_Hot\n961 \"Zombie, Ash, Done\" **** Zombie_Ash_Done\n")

 	oldCwd, err := os.Getwd()
@@ -64,20 +70,26 @@ func TestRunConvertCommandInfersTemplateNamespaceAndOutput(t *testing.T) {

 func TestRunConvertCommand2DAToJSONInfersTemplateKeys(t *testing.T) {
 	root := testProjectRoot(t)
-	writeFile(t, filepath.Join(root, "nwn-tool.json"), `{
-  "module": {"name": "Test", "resref": "test"},
-  "paths": {"source": "src", "assets": "assets", "build": "build"},
-  "topdata": {"source": "topdata", "build": "build/topdata"}
-}`+"\n")
+	writeFile(t, filepath.Join(root, "nwn-tool.yaml"), `
+module:
+  name: Test
+  resref: test
+paths:
+  source: src
+  assets: assets
+  build: build
+topdata:
+  source: topdata
+  build: build/topdata
+`)
 	mkdirAll(t, filepath.Join(root, "topdata", "templates"))
-	writeFile(t, filepath.Join(root, "topdata", "templates", "config.json"), `{
-  "tables": {
-    "template_appearance": {
-      "namespace": "appearance",
-      "key_fields": ["LABEL"]
-    }
-  }
-}`+"\n")
+	writeFile(t, filepath.Join(root, "topdata", "templates", "config.yaml"), `
+tables:
+  template_appearance:
+    namespace: appearance
+    key_fields:
+      - LABEL
+`)
 	inputPath := filepath.Join(root, "topdata", "templates", "template_appearance.2da")
 	writeFile(t, inputPath, "2DA V2.0\n\nLABEL STRING_REF NAME\n960 \"Zombie, Ash, Hot\" **** Zombie_Ash_Hot\n961 \"Zombie, Ash, Done\" **** Zombie_Ash_Done\n")

@@ -121,21 +133,28 @@ func TestRunConvertCommand2DAToJSONInfersTemplateKeys(t *testing.T) {

 func TestRunConvertCommand2DAToJSONInfersOutputDatasetKeysFromConfig(t *testing.T) {
 	root := testProjectRoot(t)
-	writeFile(t, filepath.Join(root, "nwn-tool.json"), `{
-  "module": {"name": "Test", "resref": "test"},
-  "paths": {"source": "src", "assets": "assets", "build": "build"},
-  "topdata": {"source": "topdata", "build": "build/topdata"}
-}`+"\n")
+	writeFile(t, filepath.Join(root, "nwn-tool.yaml"), `
+module:
+  name: Test
+  resref: test
+paths:
+  source: src
+  assets: assets
+  build: build
+topdata:
+  source: topdata
+  build: build/topdata
+`)
 	mkdirAll(t, filepath.Join(root, "topdata", "templates"))
 	mkdirAll(t, filepath.Join(root, "topdata", "data", "soundset"))
-	writeFile(t, filepath.Join(root, "topdata", "templates", "config.json"), `{
-  "tables": {
-    "template_soundset": {
-      "namespace": "soundset",
-      "key_fields": ["RESREF", "LABEL"]
-    }
-  }
-}`+"\n")
+	writeFile(t, filepath.Join(root, "topdata", "templates", "config.yaml"), `
+tables:
+  template_soundset:
+    namespace: soundset
+    key_fields:
+      - RESREF
+      - LABEL
+`)
 	inputPath := filepath.Join(root, "scratch_soundset.2da")
 	writeFile(t, inputPath, "2DA V2.0\n\nLABEL RESREF STRREF GENDER TYPE\n0 \"Bandit Male\" nw_bandit 100 1 4\n1 \"Bandit Female\" nw_bandit 101 2 4\n")

@@ -179,20 +198,26 @@ func TestRunConvertCommand2DAToJSONInfersOutputDatasetKeysFromConfig(t *testing.

 func TestRunConvertCommand2DAToJSONInfersAmbientTemplateKeysFromResource(t *testing.T) {
 	root := testProjectRoot(t)
-	writeFile(t, filepath.Join(root, "nwn-tool.json"), `{
-  "module": {"name": "Test", "resref": "test"},
-  "paths": {"source": "src", "assets": "assets", "build": "build"},
-  "topdata": {"source": "topdata", "build": "build/topdata"}
-}`+"\n")
+	writeFile(t, filepath.Join(root, "nwn-tool.yaml"), `
+module:
+  name: Test
+  resref: test
+paths:
+  source: src
+  assets: assets
+  build: build
+topdata:
+  source: topdata
+  build: build/topdata
+`)
 	mkdirAll(t, filepath.Join(root, "topdata", "templates"))
-	writeFile(t, filepath.Join(root, "topdata", "templates", "config.json"), `{
-  "tables": {
-    "template_ambientmusic": {
-      "namespace": "ambientmusic",
-      "key_fields": ["Resource"]
-    }
-  }
-}`+"\n")
+	writeFile(t, filepath.Join(root, "topdata", "templates", "config.yaml"), `
+tables:
+  template_ambientmusic:
+    namespace: ambientmusic
+    key_fields:
+      - Resource
+`)
 	inputPath := filepath.Join(root, "topdata", "templates", "template_ambientmusic.2da")
 	writeFile(t, inputPath, "2DA V2.0\n\nDescription DisplayName Resource Stinger1 Stinger2 Stinger3\n0 61901 **** **** **** **** ****\n1 61842 **** mus_ruralday1 **** **** ****\n2 61843 **** mus_ruralday2 **** **** ****\n")

@@ -239,11 +264,18 @@ func TestRunConvertCommand2DAToJSONInfersAmbientTemplateKeysFromResource(t *test

 func TestRunConvertCommand2DAToJSONSuffixesDuplicateGeneratedKeys(t *testing.T) {
 	root := testProjectRoot(t)
-	writeFile(t, filepath.Join(root, "nwn-tool.json"), `{
-  "module": {"name": "Test", "resref": "test"},
-  "paths": {"source": "src", "assets": "assets", "build": "build"},
-  "topdata": {"source": "topdata", "build": "build/topdata"}
-}`+"\n")
+	writeFile(t, filepath.Join(root, "nwn-tool.yaml"), `
+module:
+  name: Test
+  resref: test
+paths:
+  source: src
+  assets: assets
+  build: build
+topdata:
+  source: topdata
+  build: build/topdata
+`)
 	inputPath := filepath.Join(root, "dup.2da")
 	writeFile(t, inputPath, "2DA V2.0\n\nResource\n1 cmp_reserved\n2 cmp_reserved\n")

@@ -353,14 +385,13 @@ func TestRunConvertCommandFailsOnUnkeyedRows(t *testing.T) {
  "topdata": {"source": "topdata", "build": "build/topdata"}
 }`+"\n")
 	mkdirAll(t, filepath.Join(root, "topdata", "templates"))
-	writeFile(t, filepath.Join(root, "topdata", "templates", "config.json"), `{
-  "tables": {
-    "template_appearance": {
-      "namespace": "appearance",
-      "key_fields": ["STRING_REF"]
-    }
-  }
-}`+"\n")
+	writeFile(t, filepath.Join(root, "topdata", "templates", "config.yaml"), `
+tables:
+  template_appearance:
+    namespace: appearance
+    key_fields:
+      - STRING_REF
+`)
 	writeFile(t, filepath.Join(root, "topdata", "templates", "template_appearance.2da"), "2DA V2.0\n\nLABEL STRING_REF NAME\n960 \"Zombie, Ash, Hot\" **** Zombie_Ash_Hot\n")

 	oldCwd, err := os.Getwd()
@@ -384,6 +415,61 @@ func TestRunConvertCommandFailsOnUnkeyedRows(t *testing.T) {
 	}
 }

+func TestRunConvertCommandFallsBackToLegacyTemplateJSONConfig(t *testing.T) {
+	root := testProjectRoot(t)
+	writeFile(t, filepath.Join(root, "nwn-tool.yaml"), `
+module:
+  name: Test
+  resref: test
+paths:
+  source: src
+  assets: assets
+  build: build
+topdata:
+  source: topdata
+  build: build/topdata
+`)
+	mkdirAll(t, filepath.Join(root, "topdata", "templates"))
+	writeFile(t, filepath.Join(root, "topdata", "templates", "config.json"), `{
+  "tables": {
+    "template_appearance": {
+      "namespace": "appearance",
+      "key_fields": ["LABEL"]
+    }
+  }
+}`+"\n")
+	inputPath := filepath.Join(root, "topdata", "templates", "template_appearance.2da")
+	writeFile(t, inputPath, "2DA V2.0\n\nLABEL\n960 Zombie_Ash_Hot\n")
+
+	oldCwd, err := os.Getwd()
+	if err != nil {
+		t.Fatalf("getwd: %v", err)
+	}
+	t.Cleanup(func() {
+		_ = os.Chdir(oldCwd)
+	})
+	if err := os.Chdir(root); err != nil {
+		t.Fatalf("chdir: %v", err)
+	}
+
+	outputPath := filepath.Join(root, "out", "appearance.json")
+	if err := RunConvertCommand([]string{
+		"2da-to-json",
+		"topdata/templates/template_appearance.2da",
+		outputPath,
+	}, &bytes.Buffer{}); err != nil {
+		t.Fatalf("RunConvertCommand failed: %v", err)
+	}
+
+	raw, err := os.ReadFile(outputPath)
+	if err != nil {
+		t.Fatalf("read output: %v", err)
+	}
+	if !strings.Contains(string(raw), `"appearance:zombie_ash_hot"`) {
+		t.Fatalf("expected legacy JSON template config fallback to be honored, got %s", string(raw))
+	}
+}
+
 func TestConvert2DAToModuleFailsOnDuplicateGeneratedKeysByDefault(t *testing.T) {
 	_, err := convert2DAToModule(parsed2DA{
 		Columns: []string{"LABEL"},