outfit: a skill is keys, not a value holding an object

Every object-valued key on a real board came from one place: ContentEnvelope,
written as one key per skill and one for the credo. 25 of 36 keys.

They are keys now:

	skills.bossman.frontmatter
	skills.bossman.filePath
	system.credo.content
	system.credo.filePath

A value the board cannot reach into must be rewritten whole to change one
field, and it makes the keys a caller wrote differ from the paths the board
holds -- which is why enumerating a board yielded 61 leaves for 36 keys. With
the fields as keys the two are the same number.

testdata/board-default.json keeps the old shape on purpose: it is what an
older figaro wrote, and opening it is what the wire tests are for.

Author: gluck

internal/outfit/outfit.go

@@ -396,12 +396,7 @@ func (o *Outfitter) flatten(prefix string, in map[string]any, out map[string]jso
 				if err != nil {
 					return fmt.Errorf("outfit: %s fileName=%q: %w", key, fn, err)
 				}
-				env := contentEnvelope(string(body), path)
-				b, err := json.Marshal(env)
-				if err != nil {
-					return err
-				}
-				out[key] = b
+				emitEnvelope(out, key, contentEnvelope(string(body), path))
 				continue
 			}
 			if dn, ok := val["dirName"].(string); ok && len(val) == 1 {
@@ -433,11 +428,7 @@ func (o *Outfitter) flatten(prefix string, in map[string]any, out map[string]jso
 					}
 				}
 				for name, env := range m {
-					b, err := json.Marshal(env)
-					if err != nil {
-						return err
-					}
-					out[key+"."+name] = b
+					emitEnvelope(out, key+"."+name, env)
 				}
 				continue
 			}
@@ -608,3 +599,25 @@ func skillName(file string) (string, bool) {
 	}
 	return name, true
 }
+
+// emitEnvelope writes an envelope as one key per field rather than one key
+// holding an object.
+//
+// A value the board cannot reach into is a value that must be rewritten whole
+// to change one field, and it makes the keys a caller wrote differ from the
+// paths the board holds. The fields are keys.
+func emitEnvelope(out map[string]json.RawMessage, prefix string, env ContentEnvelope) {
+	put := func(field, v string) {
+		if v == "" {
+			return
+		}
+		b, err := json.Marshal(v)
+		if err != nil {
+			return
+		}
+		out[prefix+"."+field] = b
+	}
+	put("frontmatter", env.Frontmatter)
+	put("content", env.Content)
+	put("filePath", env.FilePath)
+}

internal/outfit/structural_test.go

@@ -0,0 +1,43 @@
+package outfit_test
+
+import (
+	"encoding/json"
+	"os"
+	"path/filepath"
+	"sort"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/jack-work/figaro/internal/outfit"
+)
+
+// A skill reaches the board as keys, not as one value holding an object.
+func TestSkillsArriveStructural(t *testing.T) {
+	dir := t.TempDir()
+	skills := filepath.Join(dir, "skills")
+	require.NoError(t, os.MkdirAll(skills, 0o755))
+	require.NoError(t, os.WriteFile(filepath.Join(skills, "alpha.md"),
+		[]byte("---\nname: alpha\ndescription: A\n---\nbody"), 0o644))
+	require.NoError(t, os.WriteFile(filepath.Join(dir, "credo.md"), []byte("the credo"), 0o644))
+	require.NoError(t, os.MkdirAll(filepath.Join(dir, "outfits"), 0o755))
+	require.NoError(t, os.WriteFile(filepath.Join(dir, "outfits", "top.toml"),
+		[]byte("skills = { dirName = \"skills\" }\n[system]\ncredo = { fileName = \"credo.md\" }\n"), 0o644))
+
+	p, err := outfit.New(dir).Load("top")
+	require.NoError(t, err)
+
+	var keys []string
+	for _, e := range p.Entries() {
+		keys = append(keys, e.Key)
+	}
+	sort.Strings(keys)
+	t.Logf("keys: %v", keys)
+
+	for _, want := range []string{"skills.alpha.frontmatter", "skills.alpha.filePath", "system.credo.content"} {
+		e, ok := p.Entry(want)
+		require.True(t, ok, "%s must be its own key", want)
+		var s string
+		require.NoError(t, json.Unmarshal(e.New, &s), "%s must be a string, not an object", want)
+	}
+}