From de201f2d32fa4fe4c07e6bf358286f7d074224a0 Mon Sep 17 00:00:00 2001 From: Eric Myhre Date: Thu, 26 Mar 2020 12:09:43 +0100 Subject: [PATCH] Rename 's/AssembleDirectly/AssembleEntry/g'. --- codec/dagcbor/roundtrip_test.go | 14 ++-- codec/dagcbor/unmarshal.go | 2 +- codec/dagjson/roundtrip_test.go | 14 ++-- codec/dagjson/unmarshal.go | 2 +- codec/unmarshal.go | 2 +- fluent/fluentBuilder.go | 6 +- fluent/fluentBuilder_test.go | 12 +-- node/basic/list.go | 4 +- node/basic/map.go | 8 +- node/basic/map_test.go | 8 +- node/gendemo/map_K2_T2.go | 6 +- node/gendemo/map_K_T.go | 6 +- node/gendemo/map_K_T_test.go | 8 +- node/tests/mapBenchmarks.go | 12 +-- nodeBuilder.go | 2 +- schema/tests/testsForStructs.go | 6 +- traversal/focus_test.go | 18 ++--- traversal/selector/builder/builder.go | 40 +++++----- traversal/selector/builder/builder_test.go | 76 +++++++++---------- traversal/selector/exploreAll_test.go | 6 +- traversal/selector/exploreFields_test.go | 12 +-- traversal/selector/exploreIndex_test.go | 22 +++--- traversal/selector/exploreRange_test.go | 54 +++++++------- traversal/selector/exploreRecursive_test.go | 82 ++++++++++----------- traversal/selector/exploreUnion_test.go | 12 +-- traversal/walk_test.go | 22 +++--- 26 files changed, 228 insertions(+), 228 deletions(-) diff --git a/codec/dagcbor/roundtrip_test.go b/codec/dagcbor/roundtrip_test.go index e35ac9ce..3d56d525 100644 --- a/codec/dagcbor/roundtrip_test.go +++ b/codec/dagcbor/roundtrip_test.go @@ -11,17 +11,17 @@ import ( ) var n = fluent.MustBuildMap(basicnode.Style__Map{}, 4, func(na fluent.MapAssembler) { - na.AssembleDirectly("plain").AssignString("olde string") - na.AssembleDirectly("map").CreateMap(2, func(na fluent.MapAssembler) { - na.AssembleDirectly("one").AssignInt(1) - na.AssembleDirectly("two").AssignInt(2) + na.AssembleEntry("plain").AssignString("olde string") + na.AssembleEntry("map").CreateMap(2, func(na fluent.MapAssembler) { + na.AssembleEntry("one").AssignInt(1) + na.AssembleEntry("two").AssignInt(2) }) - na.AssembleDirectly("list").CreateList(2, func(na fluent.ListAssembler) { + na.AssembleEntry("list").CreateList(2, func(na fluent.ListAssembler) { na.AssembleValue().AssignString("three") na.AssembleValue().AssignString("four") }) - na.AssembleDirectly("nested").CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly("deeper").CreateList(1, func(na fluent.ListAssembler) { + na.AssembleEntry("nested").CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry("deeper").CreateList(1, func(na fluent.ListAssembler) { na.AssembleValue().AssignString("things") }) }) diff --git a/codec/dagcbor/unmarshal.go b/codec/dagcbor/unmarshal.go index 34bb0a73..d22d40f9 100644 --- a/codec/dagcbor/unmarshal.go +++ b/codec/dagcbor/unmarshal.go @@ -70,7 +70,7 @@ func unmarshal(na ipld.NodeAssembler, tokSrc shared.TokenSource, tk *tok.Token) if observedLen > expectLen { return fmt.Errorf("unexpected continuation of map elements beyond declared length") } - mva, err := ma.AssembleDirectly(tk.Str) + mva, err := ma.AssembleEntry(tk.Str) if err != nil { // return in error if the key was rejected return err } diff --git a/codec/dagjson/roundtrip_test.go b/codec/dagjson/roundtrip_test.go index d7d9b842..b9463e4c 100644 --- a/codec/dagjson/roundtrip_test.go +++ b/codec/dagjson/roundtrip_test.go @@ -11,17 +11,17 @@ import ( ) var n = fluent.MustBuildMap(basicnode.Style__Map{}, 4, func(na fluent.MapAssembler) { - na.AssembleDirectly("plain").AssignString("olde string") - na.AssembleDirectly("map").CreateMap(2, func(na fluent.MapAssembler) { - na.AssembleDirectly("one").AssignInt(1) - na.AssembleDirectly("two").AssignInt(2) + na.AssembleEntry("plain").AssignString("olde string") + na.AssembleEntry("map").CreateMap(2, func(na fluent.MapAssembler) { + na.AssembleEntry("one").AssignInt(1) + na.AssembleEntry("two").AssignInt(2) }) - na.AssembleDirectly("list").CreateList(2, func(na fluent.ListAssembler) { + na.AssembleEntry("list").CreateList(2, func(na fluent.ListAssembler) { na.AssembleValue().AssignString("three") na.AssembleValue().AssignString("four") }) - na.AssembleDirectly("nested").CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly("deeper").CreateList(1, func(na fluent.ListAssembler) { + na.AssembleEntry("nested").CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry("deeper").CreateList(1, func(na fluent.ListAssembler) { na.AssembleValue().AssignString("things") }) }) diff --git a/codec/dagjson/unmarshal.go b/codec/dagjson/unmarshal.go index 5e8484ec..a4d3da15 100644 --- a/codec/dagjson/unmarshal.go +++ b/codec/dagjson/unmarshal.go @@ -161,7 +161,7 @@ func (st *unmarshalState) unmarshal(na ipld.NodeAssembler, tokSrc shared.TokenSo default: return fmt.Errorf("unexpected %s token while expecting map key", st.tk[0].Type) } - mva, err := ma.AssembleDirectly(st.tk[0].Str) + mva, err := ma.AssembleEntry(st.tk[0].Str) if err != nil { // return in error if the key was rejected return err } diff --git a/codec/unmarshal.go b/codec/unmarshal.go index 7a9a4d4d..17cb76d7 100644 --- a/codec/unmarshal.go +++ b/codec/unmarshal.go @@ -85,7 +85,7 @@ func unmarshal(na ipld.NodeAssembler, tokSrc shared.TokenSource, tk *tok.Token) if observedLen > expectLen { return fmt.Errorf("unexpected continuation of map elements beyond declared length") } - mva, err := ma.AssembleDirectly(tk.Str) + mva, err := ma.AssembleEntry(tk.Str) if err != nil { // return in error if the key was rejected return err } diff --git a/fluent/fluentBuilder.go b/fluent/fluentBuilder.go index b220bff1..99b0e841 100644 --- a/fluent/fluentBuilder.go +++ b/fluent/fluentBuilder.go @@ -58,7 +58,7 @@ type MapAssembler interface { AssembleKey() NodeAssembler AssembleValue() NodeAssembler - AssembleDirectly(k string) NodeAssembler + AssembleEntry(k string) NodeAssembler KeyStyle() ipld.NodeStyle ValueStyle(k string) ipld.NodeStyle @@ -153,8 +153,8 @@ func (fma *mapNodeAssembler) AssembleKey() NodeAssembler { func (fma *mapNodeAssembler) AssembleValue() NodeAssembler { return &nodeAssembler{fma.ma.AssembleValue()} } -func (fma *mapNodeAssembler) AssembleDirectly(k string) NodeAssembler { - va, err := fma.ma.AssembleDirectly(k) +func (fma *mapNodeAssembler) AssembleEntry(k string) NodeAssembler { + va, err := fma.ma.AssembleEntry(k) if err != nil { panic(Error{err}) } diff --git a/fluent/fluentBuilder_test.go b/fluent/fluentBuilder_test.go index d5e617c2..ee5c8032 100644 --- a/fluent/fluentBuilder_test.go +++ b/fluent/fluentBuilder_test.go @@ -24,12 +24,12 @@ func TestBuild(t *testing.T) { t.Run("map build should work", func(t *testing.T) { n := fluent.MustBuild(basicnode.Style__Map{}, func(fna fluent.NodeAssembler) { fna.CreateMap(3, func(fma fluent.MapAssembler) { - fma.AssembleDirectly("k1").AssignString("fine") - fma.AssembleDirectly("k2").AssignString("super") - fma.AssembleDirectly("k3").CreateMap(3, func(fma fluent.MapAssembler) { - fma.AssembleDirectly("k31").AssignString("thanks") - fma.AssembleDirectly("k32").AssignString("for") - fma.AssembleDirectly("k33").AssignString("asking") + fma.AssembleEntry("k1").AssignString("fine") + fma.AssembleEntry("k2").AssignString("super") + fma.AssembleEntry("k3").CreateMap(3, func(fma fluent.MapAssembler) { + fma.AssembleEntry("k31").AssignString("thanks") + fma.AssembleEntry("k32").AssignString("for") + fma.AssembleEntry("k33").AssignString("asking") }) }) }) diff --git a/node/basic/list.go b/node/basic/list.go index ddeb573b..c00875f2 100644 --- a/node/basic/list.go +++ b/node/basic/list.go @@ -308,8 +308,8 @@ type plainList__ValueAssemblerMap struct { // just embedding plainMap__Assembler also behaves correctly, // but causes a lot of unnecessary autogenerated functions in the final binary. -func (ma *plainList__ValueAssemblerMap) AssembleDirectly(k string) (ipld.NodeAssembler, error) { - return ma.ca.AssembleDirectly(k) +func (ma *plainList__ValueAssemblerMap) AssembleEntry(k string) (ipld.NodeAssembler, error) { + return ma.ca.AssembleEntry(k) } func (ma *plainList__ValueAssemblerMap) AssembleKey() ipld.NodeAssembler { return ma.ca.AssembleKey() diff --git a/node/basic/map.go b/node/basic/map.go index dcb53141..f6d2ef45 100644 --- a/node/basic/map.go +++ b/node/basic/map.go @@ -237,9 +237,9 @@ func (plainMap__Assembler) Style() ipld.NodeStyle { // -- MapAssembler --> -// AssembleDirectly is part of conforming to MapAssembler, which we do on +// AssembleEntry is part of conforming to MapAssembler, which we do on // plainMap__Assembler so that BeginMap can just return a retyped pointer rather than new object. -func (ma *plainMap__Assembler) AssembleDirectly(k string) (ipld.NodeAssembler, error) { +func (ma *plainMap__Assembler) AssembleEntry(k string) (ipld.NodeAssembler, error) { // Sanity check, then update, assembler state. if ma.state != maState_initial { panic("misuse") @@ -419,8 +419,8 @@ type plainMap__ValueAssemblerMap struct { // just embedding plainMap__Assembler also behaves correctly, // but causes a lot of unnecessary autogenerated functions in the final binary. -func (ma *plainMap__ValueAssemblerMap) AssembleDirectly(k string) (ipld.NodeAssembler, error) { - return ma.ca.AssembleDirectly(k) +func (ma *plainMap__ValueAssemblerMap) AssembleEntry(k string) (ipld.NodeAssembler, error) { + return ma.ca.AssembleEntry(k) } func (ma *plainMap__ValueAssemblerMap) AssembleKey() ipld.NodeAssembler { return ma.ca.AssembleKey() diff --git a/node/basic/map_test.go b/node/basic/map_test.go index 3778a09a..da803650 100644 --- a/node/basic/map_test.go +++ b/node/basic/map_test.go @@ -14,8 +14,8 @@ func TestMap(t *testing.T) { func BenchmarkMapStrInt_3n_AssembleStandard(b *testing.B) { tests.SpecBenchmarkMapStrInt_3n_AssembleStandard(b, Style__Map{}) } -func BenchmarkMapStrInt_3n_AssembleDirectly(b *testing.B) { - tests.SpecBenchmarkMapStrInt_3n_AssembleDirectly(b, Style__Map{}) +func BenchmarkMapStrInt_3n_AssembleEntry(b *testing.B) { + tests.SpecBenchmarkMapStrInt_3n_AssembleEntry(b, Style__Map{}) } func BenchmarkMapStrInt_3n_Iteration(b *testing.B) { tests.SpecBenchmarkMapStrInt_3n_Iteration(b, Style__Map{}) @@ -24,8 +24,8 @@ func BenchmarkMapStrInt_3n_Iteration(b *testing.B) { func BenchmarkMapStrInt_25n_AssembleStandard(b *testing.B) { tests.SpecBenchmarkMapStrInt_25n_AssembleStandard(b, Style__Map{}) } -func BenchmarkMapStrInt_25n_AssembleDirectly(b *testing.B) { - tests.SpecBenchmarkMapStrInt_25n_AssembleDirectly(b, Style__Map{}) +func BenchmarkMapStrInt_25n_AssembleEntry(b *testing.B) { + tests.SpecBenchmarkMapStrInt_25n_AssembleEntry(b, Style__Map{}) } func BenchmarkMapStrInt_25n_Iteration(b *testing.B) { tests.SpecBenchmarkMapStrInt_25n_Iteration(b, Style__Map{}) diff --git a/node/gendemo/map_K2_T2.go b/node/gendemo/map_K2_T2.go index f4c3a2bb..7f0d83a0 100644 --- a/node/gendemo/map_K2_T2.go +++ b/node/gendemo/map_K2_T2.go @@ -150,7 +150,7 @@ func (ta *_K2__Assembler) AssignNode(v ipld.Node) error { } func (_K2__Assembler) Style() ipld.NodeStyle { panic("later") } -func (ma *_K2__Assembler) AssembleDirectly(k string) (ipld.NodeAssembler, error) { +func (ma *_K2__Assembler) AssembleEntry(k string) (ipld.NodeAssembler, error) { // Sanity check, then update, assembler state. if ma.state != maState_initial { panic("misuse") @@ -183,7 +183,7 @@ func (ma *_K2__Assembler) AssembleKey() ipld.NodeAssembler { panic("misuse") } ma.state = maState_midKey - // TODO return a fairly dummy assembler which just contains a string switch (probably sharing code with AssembleDirectly). + // TODO return a fairly dummy assembler which just contains a string switch (probably sharing code with AssembleEntry). panic("todo") } func (ma *_K2__Assembler) AssembleValue() ipld.NodeAssembler { @@ -333,7 +333,7 @@ func (ta *_T2__Assembler) AssignNode(v ipld.Node) error { } func (_T2__Assembler) Style() ipld.NodeStyle { panic("later") } -func (ta *_T2__Assembler) AssembleDirectly(string) (ipld.NodeAssembler, error) { +func (ta *_T2__Assembler) AssembleEntry(string) (ipld.NodeAssembler, error) { // this'll be fun panic("soon") } diff --git a/node/gendemo/map_K_T.go b/node/gendemo/map_K_T.go index 7679d962..0b1f1c17 100644 --- a/node/gendemo/map_K_T.go +++ b/node/gendemo/map_K_T.go @@ -161,8 +161,8 @@ type _T__ReprAssembler struct { func (_T__Assembler) BeginMap(_ int) (ipld.MapAssembler, error) { panic("no") } func (_T__Assembler) BeginList(_ int) (ipld.ListAssembler, error) { panic("no") } -func (_T__Assembler) AssignNull() error { panic("no") } -func (_T__Assembler) AssignBool(bool) error { panic("no") } +func (_T__Assembler) AssignNull() error { panic("no") } +func (_T__Assembler) AssignBool(bool) error { panic("no") } func (ta *_T__Assembler) AssignInt(v int) error { ta.w.x = v return nil @@ -371,7 +371,7 @@ func (ta *_Map_K_T__Assembler) AssignNode(v ipld.Node) error { } func (_Map_K_T__Assembler) Style() ipld.NodeStyle { panic("later") } -func (ma *_Map_K_T__Assembler) AssembleDirectly(k string) (ipld.NodeAssembler, error) { +func (ma *_Map_K_T__Assembler) AssembleEntry(k string) (ipld.NodeAssembler, error) { // Sanity check, then update, assembler state. if ma.state != maState_initial { panic("misuse") diff --git a/node/gendemo/map_K_T_test.go b/node/gendemo/map_K_T_test.go index ae8d775b..c67d466d 100644 --- a/node/gendemo/map_K_T_test.go +++ b/node/gendemo/map_K_T_test.go @@ -13,8 +13,8 @@ func TestGennedMapStrInt(t *testing.T) { func BenchmarkMapStrInt_3n_AssembleStandard(b *testing.B) { tests.SpecBenchmarkMapStrInt_3n_AssembleStandard(b, Type__Map_K_T{}) } -func BenchmarkMapStrInt_3n_AssembleDirectly(b *testing.B) { - tests.SpecBenchmarkMapStrInt_3n_AssembleDirectly(b, Type__Map_K_T{}) +func BenchmarkMapStrInt_3n_AssembleEntry(b *testing.B) { + tests.SpecBenchmarkMapStrInt_3n_AssembleEntry(b, Type__Map_K_T{}) } func BenchmarkMapStrInt_3n_Iteration(b *testing.B) { tests.SpecBenchmarkMapStrInt_3n_Iteration(b, Type__Map_K_T{}) @@ -23,8 +23,8 @@ func BenchmarkMapStrInt_3n_Iteration(b *testing.B) { func BenchmarkMapStrInt_25n_AssembleStandard(b *testing.B) { tests.SpecBenchmarkMapStrInt_25n_AssembleStandard(b, Type__Map_K_T{}) } -func BenchmarkMapStrInt_25n_AssembleDirectly(b *testing.B) { - tests.SpecBenchmarkMapStrInt_25n_AssembleDirectly(b, Type__Map_K_T{}) +func BenchmarkMapStrInt_25n_AssembleEntry(b *testing.B) { + tests.SpecBenchmarkMapStrInt_25n_AssembleEntry(b, Type__Map_K_T{}) } func BenchmarkMapStrInt_25n_Iteration(b *testing.B) { tests.SpecBenchmarkMapStrInt_25n_Iteration(b, Type__Map_K_T{}) diff --git a/node/tests/mapBenchmarks.go b/node/tests/mapBenchmarks.go index 4846b85b..4b3a0f70 100644 --- a/node/tests/mapBenchmarks.go +++ b/node/tests/mapBenchmarks.go @@ -13,24 +13,24 @@ func SpecBenchmarkMapStrInt_3n_AssembleStandard(b *testing.B, ns ipld.NodeStyle) } } -func SpecBenchmarkMapStrInt_3n_AssembleDirectly(b *testing.B, ns ipld.NodeStyle) { +func SpecBenchmarkMapStrInt_3n_AssembleEntry(b *testing.B, ns ipld.NodeStyle) { for i := 0; i < b.N; i++ { nb := ns.NewBuilder() ma, err := nb.BeginMap(3) if err != nil { panic(err) } - if va, err := ma.AssembleDirectly("whee"); err != nil { + if va, err := ma.AssembleEntry("whee"); err != nil { panic(err) } else { must.NotError(va.AssignInt(1)) } - if va, err := ma.AssembleDirectly("woot"); err != nil { + if va, err := ma.AssembleEntry("woot"); err != nil { panic(err) } else { must.NotError(va.AssignInt(2)) } - if va, err := ma.AssembleDirectly("waga"); err != nil { + if va, err := ma.AssembleEntry("waga"); err != nil { panic(err) } else { must.NotError(va.AssignInt(3)) @@ -60,7 +60,7 @@ func SpecBenchmarkMapStrInt_25n_AssembleStandard(b *testing.B, ns ipld.NodeStyle } } -func SpecBenchmarkMapStrInt_25n_AssembleDirectly(b *testing.B, ns ipld.NodeStyle) { +func SpecBenchmarkMapStrInt_25n_AssembleEntry(b *testing.B, ns ipld.NodeStyle) { for i := 0; i < b.N; i++ { nb := ns.NewBuilder() ma, err := nb.BeginMap(25) @@ -68,7 +68,7 @@ func SpecBenchmarkMapStrInt_25n_AssembleDirectly(b *testing.B, ns ipld.NodeStyle panic(err) } for i := 1; i <= 25; i++ { - if va, err := ma.AssembleDirectly(tableStrInt[i-1].s); err != nil { + if va, err := ma.AssembleEntry(tableStrInt[i-1].s); err != nil { panic(err) } else { must.NotError(va.AssignInt(tableStrInt[i-1].i)) diff --git a/nodeBuilder.go b/nodeBuilder.go index bef1e0bf..20d92957 100644 --- a/nodeBuilder.go +++ b/nodeBuilder.go @@ -59,7 +59,7 @@ type MapAssembler interface { AssembleKey() NodeAssembler // must be followed by call to AssembleValue. AssembleValue() NodeAssembler // must be called immediately after AssembleKey. - AssembleDirectly(k string) (NodeAssembler, error) // shortcut combining AssembleKey and AssembleValue into one step; valid when the key is a string kind. + AssembleEntry(k string) (NodeAssembler, error) // shortcut combining AssembleKey and AssembleValue into one step; valid when the key is a string kind. Finish() error diff --git a/schema/tests/testsForStructs.go b/schema/tests/testsForStructs.go index 615f19fc..7b9bdad7 100644 --- a/schema/tests/testsForStructs.go +++ b/schema/tests/testsForStructs.go @@ -27,16 +27,16 @@ func TestFoo(t *testing.T, newNb func(typ schema.Type) ipld.NodeBuilder) { ma, err := nb.BeginMap(3) Wish(t, err, ShouldEqual, nil) // Set 'f1' to a valid string. - va, err := ma.AssembleDirectly("f1") + va, err := ma.AssembleEntry("f1") Wish(t, err, ShouldEqual, nil) Wish(t, va.AssignString("asdf"), ShouldEqual, nil) // Skip setting 'f2' -- it's optional. // Set 'f3' to null. Nulls aren't typed. - va, err = ma.AssembleDirectly("f3") + va, err = ma.AssembleEntry("f3") Wish(t, err, ShouldEqual, nil) Wish(t, va.AssignNull(), ShouldEqual, nil) // Set 'f4' to a valid string. - va, err = ma.AssembleDirectly("f4") + va, err = ma.AssembleEntry("f4") Wish(t, err, ShouldEqual, nil) Wish(t, va.AssignString("qwer"), ShouldEqual, nil) Wish(t, ma.Finish(), ShouldEqual, nil) diff --git a/traversal/focus_test.go b/traversal/focus_test.go index 38dcd46b..be94f19e 100644 --- a/traversal/focus_test.go +++ b/traversal/focus_test.go @@ -29,11 +29,11 @@ var ( leafAlpha, leafAlphaLnk = encode(basicnode.NewString("alpha")) leafBeta, leafBetaLnk = encode(basicnode.NewString("beta")) middleMapNode, middleMapNodeLnk = encode(fluent.MustBuildMap(basicnode.Style__Map{}, 3, func(na fluent.MapAssembler) { - na.AssembleDirectly("foo").AssignBool(true) - na.AssembleDirectly("bar").AssignBool(false) - na.AssembleDirectly("nested").CreateMap(2, func(na fluent.MapAssembler) { - na.AssembleDirectly("alink").AssignLink(leafAlphaLnk) - na.AssembleDirectly("nonlink").AssignString("zoo") + na.AssembleEntry("foo").AssignBool(true) + na.AssembleEntry("bar").AssignBool(false) + na.AssembleEntry("nested").CreateMap(2, func(na fluent.MapAssembler) { + na.AssembleEntry("alink").AssignLink(leafAlphaLnk) + na.AssembleEntry("nonlink").AssignString("zoo") }) })) middleListNode, middleListNodeLnk = encode(fluent.MustBuildList(basicnode.Style__List{}, 4, func(na fluent.ListAssembler) { @@ -43,10 +43,10 @@ var ( na.AssembleValue().AssignLink(leafAlphaLnk) })) rootNode, rootNodeLnk = encode(fluent.MustBuildMap(basicnode.Style__Map{}, 4, func(na fluent.MapAssembler) { - na.AssembleDirectly("plain").AssignString("olde string") - na.AssembleDirectly("linkedString").AssignLink(leafAlphaLnk) - na.AssembleDirectly("linkedMap").AssignLink(middleMapNodeLnk) - na.AssembleDirectly("linkedList").AssignLink(middleListNodeLnk) + na.AssembleEntry("plain").AssignString("olde string") + na.AssembleEntry("linkedString").AssignLink(leafAlphaLnk) + na.AssembleEntry("linkedMap").AssignLink(middleMapNodeLnk) + na.AssembleEntry("linkedList").AssignLink(middleListNodeLnk) })) ) diff --git a/traversal/selector/builder/builder.go b/traversal/selector/builder/builder.go index ecadbe29..39c4cf2f 100644 --- a/traversal/selector/builder/builder.go +++ b/traversal/selector/builder/builder.go @@ -69,7 +69,7 @@ func NewSelectorSpecBuilder(ns ipld.NodeStyle) SelectorSpecBuilder { func (ssb *selectorSpecBuilder) ExploreRecursiveEdge() SelectorSpec { return selectorSpec{ fluent.MustBuildMap(ssb.ns, 1, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_ExploreRecursiveEdge).CreateMap(0, func(na fluent.MapAssembler) {}) + na.AssembleEntry(selector.SelectorKey_ExploreRecursiveEdge).CreateMap(0, func(na fluent.MapAssembler) {}) }), } } @@ -77,18 +77,18 @@ func (ssb *selectorSpecBuilder) ExploreRecursiveEdge() SelectorSpec { func (ssb *selectorSpecBuilder) ExploreRecursive(limit selector.RecursionLimit, sequence SelectorSpec) SelectorSpec { return selectorSpec{ fluent.MustBuildMap(ssb.ns, 1, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_ExploreRecursive).CreateMap(2, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_Limit).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(selector.SelectorKey_ExploreRecursive).CreateMap(2, func(na fluent.MapAssembler) { + na.AssembleEntry(selector.SelectorKey_Limit).CreateMap(1, func(na fluent.MapAssembler) { switch limit.Mode() { case selector.RecursionLimit_Depth: - na.AssembleDirectly(selector.SelectorKey_LimitDepth).AssignInt(limit.Depth()) + na.AssembleEntry(selector.SelectorKey_LimitDepth).AssignInt(limit.Depth()) case selector.RecursionLimit_None: - na.AssembleDirectly(selector.SelectorKey_LimitNone).CreateMap(0, func(na fluent.MapAssembler) {}) + na.AssembleEntry(selector.SelectorKey_LimitNone).CreateMap(0, func(na fluent.MapAssembler) {}) default: panic("Unsupported recursion limit type") } }) - na.AssembleDirectly(selector.SelectorKey_Sequence).AssignNode(sequence.Node()) + na.AssembleEntry(selector.SelectorKey_Sequence).AssignNode(sequence.Node()) }) }), } @@ -97,8 +97,8 @@ func (ssb *selectorSpecBuilder) ExploreRecursive(limit selector.RecursionLimit, func (ssb *selectorSpecBuilder) ExploreAll(next SelectorSpec) SelectorSpec { return selectorSpec{ fluent.MustBuildMap(ssb.ns, 1, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_ExploreAll).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_Next).AssignNode(next.Node()) + na.AssembleEntry(selector.SelectorKey_ExploreAll).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(selector.SelectorKey_Next).AssignNode(next.Node()) }) }), } @@ -106,9 +106,9 @@ func (ssb *selectorSpecBuilder) ExploreAll(next SelectorSpec) SelectorSpec { func (ssb *selectorSpecBuilder) ExploreIndex(index int, next SelectorSpec) SelectorSpec { return selectorSpec{ fluent.MustBuildMap(ssb.ns, 1, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_ExploreIndex).CreateMap(2, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_Index).AssignInt(index) - na.AssembleDirectly(selector.SelectorKey_Next).AssignNode(next.Node()) + na.AssembleEntry(selector.SelectorKey_ExploreIndex).CreateMap(2, func(na fluent.MapAssembler) { + na.AssembleEntry(selector.SelectorKey_Index).AssignInt(index) + na.AssembleEntry(selector.SelectorKey_Next).AssignNode(next.Node()) }) }), } @@ -117,10 +117,10 @@ func (ssb *selectorSpecBuilder) ExploreIndex(index int, next SelectorSpec) Selec func (ssb *selectorSpecBuilder) ExploreRange(start int, end int, next SelectorSpec) SelectorSpec { return selectorSpec{ fluent.MustBuildMap(ssb.ns, 1, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_ExploreRange).CreateMap(3, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_Start).AssignInt(start) - na.AssembleDirectly(selector.SelectorKey_End).AssignInt(end) - na.AssembleDirectly(selector.SelectorKey_Next).AssignNode(next.Node()) + na.AssembleEntry(selector.SelectorKey_ExploreRange).CreateMap(3, func(na fluent.MapAssembler) { + na.AssembleEntry(selector.SelectorKey_Start).AssignInt(start) + na.AssembleEntry(selector.SelectorKey_End).AssignInt(end) + na.AssembleEntry(selector.SelectorKey_Next).AssignNode(next.Node()) }) }), } @@ -129,7 +129,7 @@ func (ssb *selectorSpecBuilder) ExploreRange(start int, end int, next SelectorSp func (ssb *selectorSpecBuilder) ExploreUnion(members ...SelectorSpec) SelectorSpec { return selectorSpec{ fluent.MustBuildMap(ssb.ns, 1, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_ExploreUnion).CreateList(len(members), func(na fluent.ListAssembler) { + na.AssembleEntry(selector.SelectorKey_ExploreUnion).CreateList(len(members), func(na fluent.ListAssembler) { for _, member := range members { na.AssembleValue().AssignNode(member.Node()) } @@ -141,8 +141,8 @@ func (ssb *selectorSpecBuilder) ExploreUnion(members ...SelectorSpec) SelectorSp func (ssb *selectorSpecBuilder) ExploreFields(specBuilder ExploreFieldsSpecBuildingClosure) SelectorSpec { return selectorSpec{ fluent.MustBuildMap(ssb.ns, 1, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_ExploreFields).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_Fields).CreateMap(-1, func(na fluent.MapAssembler) { + na.AssembleEntry(selector.SelectorKey_ExploreFields).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(selector.SelectorKey_Fields).CreateMap(-1, func(na fluent.MapAssembler) { specBuilder(exploreFieldsSpecBuilder{na}) }) }) @@ -153,7 +153,7 @@ func (ssb *selectorSpecBuilder) ExploreFields(specBuilder ExploreFieldsSpecBuild func (ssb *selectorSpecBuilder) Matcher() SelectorSpec { return selectorSpec{ fluent.MustBuildMap(ssb.ns, 1, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) + na.AssembleEntry(selector.SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) }), } } @@ -163,5 +163,5 @@ type exploreFieldsSpecBuilder struct { } func (efsb exploreFieldsSpecBuilder) Insert(field string, s SelectorSpec) { - efsb.na.AssembleDirectly(field).AssignNode(s.Node()) + efsb.na.AssembleEntry(field).AssignNode(s.Node()) } diff --git a/traversal/selector/builder/builder_test.go b/traversal/selector/builder/builder_test.go index 32db45e5..bc9ddcaa 100644 --- a/traversal/selector/builder/builder_test.go +++ b/traversal/selector/builder/builder_test.go @@ -15,23 +15,23 @@ func TestBuildingSelectors(t *testing.T) { t.Run("Matcher builds matcher nodes", func(t *testing.T) { sn := ssb.Matcher().Node() esn := fluent.MustBuildMap(ns, 1, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) + na.AssembleEntry(selector.SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) }) Wish(t, sn, ShouldEqual, esn) }) t.Run("ExploreRecursiveEdge builds ExploreRecursiveEdge nodes", func(t *testing.T) { sn := ssb.ExploreRecursiveEdge().Node() esn := fluent.MustBuildMap(ns, 1, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_ExploreRecursiveEdge).CreateMap(0, func(na fluent.MapAssembler) {}) + na.AssembleEntry(selector.SelectorKey_ExploreRecursiveEdge).CreateMap(0, func(na fluent.MapAssembler) {}) }) Wish(t, sn, ShouldEqual, esn) }) t.Run("ExploreAll builds ExploreAll nodes", func(t *testing.T) { sn := ssb.ExploreAll(ssb.Matcher()).Node() esn := fluent.MustBuildMap(ns, 1, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_ExploreAll).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) + na.AssembleEntry(selector.SelectorKey_ExploreAll).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(selector.SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(selector.SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) }) }) }) @@ -40,10 +40,10 @@ func TestBuildingSelectors(t *testing.T) { t.Run("ExploreIndex builds ExploreIndex nodes", func(t *testing.T) { sn := ssb.ExploreIndex(2, ssb.Matcher()).Node() esn := fluent.MustBuildMap(ns, 1, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_ExploreIndex).CreateMap(2, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_Index).AssignInt(2) - na.AssembleDirectly(selector.SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) + na.AssembleEntry(selector.SelectorKey_ExploreIndex).CreateMap(2, func(na fluent.MapAssembler) { + na.AssembleEntry(selector.SelectorKey_Index).AssignInt(2) + na.AssembleEntry(selector.SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(selector.SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) }) }) }) @@ -52,11 +52,11 @@ func TestBuildingSelectors(t *testing.T) { t.Run("ExploreRange builds ExploreRange nodes", func(t *testing.T) { sn := ssb.ExploreRange(2, 3, ssb.Matcher()).Node() esn := fluent.MustBuildMap(ns, 1, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_ExploreRange).CreateMap(3, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_Start).AssignInt(2) - na.AssembleDirectly(selector.SelectorKey_End).AssignInt(3) - na.AssembleDirectly(selector.SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) + na.AssembleEntry(selector.SelectorKey_ExploreRange).CreateMap(3, func(na fluent.MapAssembler) { + na.AssembleEntry(selector.SelectorKey_Start).AssignInt(2) + na.AssembleEntry(selector.SelectorKey_End).AssignInt(3) + na.AssembleEntry(selector.SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(selector.SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) }) }) }) @@ -65,14 +65,14 @@ func TestBuildingSelectors(t *testing.T) { t.Run("ExploreRecursive builds ExploreRecursive nodes", func(t *testing.T) { sn := ssb.ExploreRecursive(selector.RecursionLimitDepth(2), ssb.ExploreAll(ssb.ExploreRecursiveEdge())).Node() esn := fluent.MustBuildMap(ns, 1, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_ExploreRecursive).CreateMap(2, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_Limit).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_LimitDepth).AssignInt(2) + na.AssembleEntry(selector.SelectorKey_ExploreRecursive).CreateMap(2, func(na fluent.MapAssembler) { + na.AssembleEntry(selector.SelectorKey_Limit).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(selector.SelectorKey_LimitDepth).AssignInt(2) }) - na.AssembleDirectly(selector.SelectorKey_Sequence).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_ExploreAll).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_ExploreRecursiveEdge).CreateMap(0, func(na fluent.MapAssembler) {}) + na.AssembleEntry(selector.SelectorKey_Sequence).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(selector.SelectorKey_ExploreAll).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(selector.SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(selector.SelectorKey_ExploreRecursiveEdge).CreateMap(0, func(na fluent.MapAssembler) {}) }) }) }) @@ -81,14 +81,14 @@ func TestBuildingSelectors(t *testing.T) { Wish(t, sn, ShouldEqual, esn) sn = ssb.ExploreRecursive(selector.RecursionLimitNone(), ssb.ExploreAll(ssb.ExploreRecursiveEdge())).Node() esn = fluent.MustBuildMap(ns, 1, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_ExploreRecursive).CreateMap(2, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_Limit).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_LimitNone).CreateMap(0, func(na fluent.MapAssembler) {}) + na.AssembleEntry(selector.SelectorKey_ExploreRecursive).CreateMap(2, func(na fluent.MapAssembler) { + na.AssembleEntry(selector.SelectorKey_Limit).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(selector.SelectorKey_LimitNone).CreateMap(0, func(na fluent.MapAssembler) {}) }) - na.AssembleDirectly(selector.SelectorKey_Sequence).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_ExploreAll).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_ExploreRecursiveEdge).CreateMap(0, func(na fluent.MapAssembler) {}) + na.AssembleEntry(selector.SelectorKey_Sequence).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(selector.SelectorKey_ExploreAll).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(selector.SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(selector.SelectorKey_ExploreRecursiveEdge).CreateMap(0, func(na fluent.MapAssembler) {}) }) }) }) @@ -99,15 +99,15 @@ func TestBuildingSelectors(t *testing.T) { t.Run("ExploreUnion builds ExploreUnion nodes", func(t *testing.T) { sn := ssb.ExploreUnion(ssb.Matcher(), ssb.ExploreIndex(2, ssb.Matcher())).Node() esn := fluent.MustBuildMap(ns, 1, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_ExploreUnion).CreateList(2, func(na fluent.ListAssembler) { + na.AssembleEntry(selector.SelectorKey_ExploreUnion).CreateList(2, func(na fluent.ListAssembler) { na.AssembleValue().CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) + na.AssembleEntry(selector.SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) }) na.AssembleValue().CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_ExploreIndex).CreateMap(2, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_Index).AssignInt(2) - na.AssembleDirectly(selector.SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) + na.AssembleEntry(selector.SelectorKey_ExploreIndex).CreateMap(2, func(na fluent.MapAssembler) { + na.AssembleEntry(selector.SelectorKey_Index).AssignInt(2) + na.AssembleEntry(selector.SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(selector.SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) }) }) }) @@ -118,10 +118,10 @@ func TestBuildingSelectors(t *testing.T) { t.Run("ExploreFields builds ExploreFields nodes", func(t *testing.T) { sn := ssb.ExploreFields(func(efsb ExploreFieldsSpecBuilder) { efsb.Insert("applesauce", ssb.Matcher()) }).Node() esn := fluent.MustBuildMap(ns, 1, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_ExploreFields).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_Fields).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly("applesauce").CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(selector.SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) + na.AssembleEntry(selector.SelectorKey_ExploreFields).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(selector.SelectorKey_Fields).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry("applesauce").CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(selector.SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) }) }) }) diff --git a/traversal/selector/exploreAll_test.go b/traversal/selector/exploreAll_test.go index 95462d2a..fa7b84a1 100644 --- a/traversal/selector/exploreAll_test.go +++ b/traversal/selector/exploreAll_test.go @@ -24,15 +24,15 @@ func TestParseExploreAll(t *testing.T) { t.Run("parsing map node without next field with invalid selector node should return child's error", func(t *testing.T) { sn := fluent.MustBuildMap(basicnode.Style__Map{}, 1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Next).AssignInt(0) + na.AssembleEntry(SelectorKey_Next).AssignInt(0) }) _, err := ParseContext{}.ParseExploreAll(sn) Wish(t, err, ShouldEqual, fmt.Errorf("selector spec parse rejected: selector is a keyed union and thus must be a map")) }) t.Run("parsing map node with next field with valid selector node should parse", func(t *testing.T) { sn := fluent.MustBuildMap(basicnode.Style__Map{}, 1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) + na.AssembleEntry(SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) }) }) s, err := ParseContext{}.ParseExploreAll(sn) diff --git a/traversal/selector/exploreFields_test.go b/traversal/selector/exploreFields_test.go index 907ea5c6..52a6bffb 100644 --- a/traversal/selector/exploreFields_test.go +++ b/traversal/selector/exploreFields_test.go @@ -24,15 +24,15 @@ func TestParseExploreFields(t *testing.T) { }) t.Run("parsing map node with fields value that is not a map should error", func(t *testing.T) { sn := fluent.MustBuildMap(basicnode.Style__Map{}, 1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Fields).AssignString("cheese") + na.AssembleEntry(SelectorKey_Fields).AssignString("cheese") }) _, err := ParseContext{}.ParseExploreFields(sn) Wish(t, err, ShouldEqual, fmt.Errorf("selector spec parse rejected: fields in ExploreFields selector must be a map")) }) t.Run("parsing map node with selector node in fields that is invalid should return child's error", func(t *testing.T) { sn := fluent.MustBuildMap(basicnode.Style__Map{}, 1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Fields).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly("applesauce").AssignInt(0) + na.AssembleEntry(SelectorKey_Fields).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry("applesauce").AssignInt(0) }) }) _, err := ParseContext{}.ParseExploreFields(sn) @@ -40,9 +40,9 @@ func TestParseExploreFields(t *testing.T) { }) t.Run("parsing map node with fields value that is map of only valid selector node should parse", func(t *testing.T) { sn := fluent.MustBuildMap(basicnode.Style__Map{}, 1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Fields).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly("applesauce").CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) + na.AssembleEntry(SelectorKey_Fields).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry("applesauce").CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) }) }) }) diff --git a/traversal/selector/exploreIndex_test.go b/traversal/selector/exploreIndex_test.go index 49af399d..6dd0eb16 100644 --- a/traversal/selector/exploreIndex_test.go +++ b/traversal/selector/exploreIndex_test.go @@ -19,15 +19,15 @@ func TestParseExploreIndex(t *testing.T) { }) t.Run("parsing map node without next field should error", func(t *testing.T) { sn := fluent.MustBuildMap(basicnode.Style__Map{}, 1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Index).AssignInt(2) + na.AssembleEntry(SelectorKey_Index).AssignInt(2) }) _, err := ParseContext{}.ParseExploreIndex(sn) Wish(t, err, ShouldEqual, fmt.Errorf("selector spec parse rejected: next field must be present in ExploreIndex selector")) }) t.Run("parsing map node without index field should error", func(t *testing.T) { sn := fluent.MustBuildMap(basicnode.Style__Map{}, 1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) + na.AssembleEntry(SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) }) }) _, err := ParseContext{}.ParseExploreIndex(sn) @@ -35,9 +35,9 @@ func TestParseExploreIndex(t *testing.T) { }) t.Run("parsing map node with index field that is not an int should error", func(t *testing.T) { sn := fluent.MustBuildMap(basicnode.Style__Map{}, 2, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Index).AssignString("cheese") - na.AssembleDirectly(SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) + na.AssembleEntry(SelectorKey_Index).AssignString("cheese") + na.AssembleEntry(SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) }) }) _, err := ParseContext{}.ParseExploreIndex(sn) @@ -45,17 +45,17 @@ func TestParseExploreIndex(t *testing.T) { }) t.Run("parsing map node with next field with invalid selector node should return child's error", func(t *testing.T) { sn := fluent.MustBuildMap(basicnode.Style__Map{}, 2, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Index).AssignInt(2) - na.AssembleDirectly(SelectorKey_Next).AssignInt(0) + na.AssembleEntry(SelectorKey_Index).AssignInt(2) + na.AssembleEntry(SelectorKey_Next).AssignInt(0) }) _, err := ParseContext{}.ParseExploreIndex(sn) Wish(t, err, ShouldEqual, fmt.Errorf("selector spec parse rejected: selector is a keyed union and thus must be a map")) }) t.Run("parsing map node with next field with valid selector node should parse", func(t *testing.T) { sn := fluent.MustBuildMap(basicnode.Style__Map{}, 2, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Index).AssignInt(2) - na.AssembleDirectly(SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) + na.AssembleEntry(SelectorKey_Index).AssignInt(2) + na.AssembleEntry(SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) }) }) s, err := ParseContext{}.ParseExploreIndex(sn) diff --git a/traversal/selector/exploreRange_test.go b/traversal/selector/exploreRange_test.go index 8b5c34c4..2e62b4e2 100644 --- a/traversal/selector/exploreRange_test.go +++ b/traversal/selector/exploreRange_test.go @@ -19,17 +19,17 @@ func TestParseExploreRange(t *testing.T) { }) t.Run("parsing map node without next field should error", func(t *testing.T) { sn := fluent.MustBuildMap(basicnode.Style__Map{}, 2, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Start).AssignInt(2) - na.AssembleDirectly(SelectorKey_End).AssignInt(3) + na.AssembleEntry(SelectorKey_Start).AssignInt(2) + na.AssembleEntry(SelectorKey_End).AssignInt(3) }) _, err := ParseContext{}.ParseExploreRange(sn) Wish(t, err, ShouldEqual, fmt.Errorf("selector spec parse rejected: next field must be present in ExploreRange selector")) }) t.Run("parsing map node without start field should error", func(t *testing.T) { sn := fluent.MustBuildMap(basicnode.Style__Map{}, 2, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_End).AssignInt(3) - na.AssembleDirectly(SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) + na.AssembleEntry(SelectorKey_End).AssignInt(3) + na.AssembleEntry(SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) }) }) _, err := ParseContext{}.ParseExploreRange(sn) @@ -37,10 +37,10 @@ func TestParseExploreRange(t *testing.T) { }) t.Run("parsing map node with start field that is not an int should error", func(t *testing.T) { sn := fluent.MustBuildMap(basicnode.Style__Map{}, 3, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Start).AssignString("cheese") - na.AssembleDirectly(SelectorKey_End).AssignInt(3) - na.AssembleDirectly(SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) + na.AssembleEntry(SelectorKey_Start).AssignString("cheese") + na.AssembleEntry(SelectorKey_End).AssignInt(3) + na.AssembleEntry(SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) }) }) _, err := ParseContext{}.ParseExploreRange(sn) @@ -48,9 +48,9 @@ func TestParseExploreRange(t *testing.T) { }) t.Run("parsing map node without end field should error", func(t *testing.T) { sn := fluent.MustBuildMap(basicnode.Style__Map{}, 2, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Start).AssignInt(2) - na.AssembleDirectly(SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) + na.AssembleEntry(SelectorKey_Start).AssignInt(2) + na.AssembleEntry(SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) }) }) _, err := ParseContext{}.ParseExploreRange(sn) @@ -58,10 +58,10 @@ func TestParseExploreRange(t *testing.T) { }) t.Run("parsing map node with end field that is not an int should error", func(t *testing.T) { sn := fluent.MustBuildMap(basicnode.Style__Map{}, 3, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Start).AssignInt(2) - na.AssembleDirectly(SelectorKey_End).AssignString("cheese") - na.AssembleDirectly(SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) + na.AssembleEntry(SelectorKey_Start).AssignInt(2) + na.AssembleEntry(SelectorKey_End).AssignString("cheese") + na.AssembleEntry(SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) }) }) _, err := ParseContext{}.ParseExploreRange(sn) @@ -69,10 +69,10 @@ func TestParseExploreRange(t *testing.T) { }) t.Run("parsing map node where end is not greater than start should error", func(t *testing.T) { sn := fluent.MustBuildMap(basicnode.Style__Map{}, 3, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Start).AssignInt(3) - na.AssembleDirectly(SelectorKey_End).AssignInt(2) - na.AssembleDirectly(SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) + na.AssembleEntry(SelectorKey_Start).AssignInt(3) + na.AssembleEntry(SelectorKey_End).AssignInt(2) + na.AssembleEntry(SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) }) }) _, err := ParseContext{}.ParseExploreRange(sn) @@ -80,9 +80,9 @@ func TestParseExploreRange(t *testing.T) { }) t.Run("parsing map node with next field with invalid selector node should return child's error", func(t *testing.T) { sn := fluent.MustBuildMap(basicnode.Style__Map{}, 3, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Start).AssignInt(2) - na.AssembleDirectly(SelectorKey_End).AssignInt(3) - na.AssembleDirectly(SelectorKey_Next).AssignInt(0) + na.AssembleEntry(SelectorKey_Start).AssignInt(2) + na.AssembleEntry(SelectorKey_End).AssignInt(3) + na.AssembleEntry(SelectorKey_Next).AssignInt(0) }) _, err := ParseContext{}.ParseExploreRange(sn) Wish(t, err, ShouldEqual, fmt.Errorf("selector spec parse rejected: selector is a keyed union and thus must be a map")) @@ -90,10 +90,10 @@ func TestParseExploreRange(t *testing.T) { t.Run("parsing map node with next field with valid selector node should parse", func(t *testing.T) { sn := fluent.MustBuildMap(basicnode.Style__Map{}, 3, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Start).AssignInt(2) - na.AssembleDirectly(SelectorKey_End).AssignInt(3) - na.AssembleDirectly(SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) + na.AssembleEntry(SelectorKey_Start).AssignInt(2) + na.AssembleEntry(SelectorKey_End).AssignInt(3) + na.AssembleEntry(SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) }) }) s, err := ParseContext{}.ParseExploreRange(sn) diff --git a/traversal/selector/exploreRecursive_test.go b/traversal/selector/exploreRecursive_test.go index 7b3220cd..30c2d205 100644 --- a/traversal/selector/exploreRecursive_test.go +++ b/traversal/selector/exploreRecursive_test.go @@ -21,8 +21,8 @@ func TestParseExploreRecursive(t *testing.T) { }) t.Run("parsing map node without sequence field should error", func(t *testing.T) { sn := fluent.MustBuildMap(basicnode.Style__Map{}, 1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Limit).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_LimitDepth).AssignInt(2) + na.AssembleEntry(SelectorKey_Limit).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(SelectorKey_LimitDepth).AssignInt(2) }) }) _, err := ParseContext{}.ParseExploreRecursive(sn) @@ -30,8 +30,8 @@ func TestParseExploreRecursive(t *testing.T) { }) t.Run("parsing map node without limit field should error", func(t *testing.T) { sn := fluent.MustBuildMap(basicnode.Style__Map{}, 1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Sequence).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) + na.AssembleEntry(SelectorKey_Sequence).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) }) }) _, err := ParseContext{}.ParseExploreRecursive(sn) @@ -39,9 +39,9 @@ func TestParseExploreRecursive(t *testing.T) { }) t.Run("parsing map node with limit field that is not a map should fail", func(t *testing.T) { sn := fluent.MustBuildMap(basicnode.Style__Map{}, 2, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Limit).AssignString("cheese") - na.AssembleDirectly(SelectorKey_Sequence).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) + na.AssembleEntry(SelectorKey_Limit).AssignString("cheese") + na.AssembleEntry(SelectorKey_Sequence).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) }) }) _, err := ParseContext{}.ParseExploreRecursive(sn) @@ -49,12 +49,12 @@ func TestParseExploreRecursive(t *testing.T) { }) t.Run("parsing map node with limit field that is not a single entry map should fail", func(t *testing.T) { sn := fluent.MustBuildMap(basicnode.Style__Map{}, 2, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Limit).CreateMap(2, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_LimitDepth).AssignInt(2) - na.AssembleDirectly(SelectorKey_LimitNone).CreateMap(0, func(na fluent.MapAssembler) {}) + na.AssembleEntry(SelectorKey_Limit).CreateMap(2, func(na fluent.MapAssembler) { + na.AssembleEntry(SelectorKey_LimitDepth).AssignInt(2) + na.AssembleEntry(SelectorKey_LimitNone).CreateMap(0, func(na fluent.MapAssembler) {}) }) - na.AssembleDirectly(SelectorKey_Sequence).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) + na.AssembleEntry(SelectorKey_Sequence).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) }) }) _, err := ParseContext{}.ParseExploreRecursive(sn) @@ -62,11 +62,11 @@ func TestParseExploreRecursive(t *testing.T) { }) t.Run("parsing map node with limit field that does not have a known key should fail", func(t *testing.T) { sn := fluent.MustBuildMap(basicnode.Style__Map{}, 2, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Limit).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly("applesauce").AssignInt(2) + na.AssembleEntry(SelectorKey_Limit).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry("applesauce").AssignInt(2) }) - na.AssembleDirectly(SelectorKey_Sequence).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) + na.AssembleEntry(SelectorKey_Sequence).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) }) }) _, err := ParseContext{}.ParseExploreRecursive(sn) @@ -74,11 +74,11 @@ func TestParseExploreRecursive(t *testing.T) { }) t.Run("parsing map node with limit field of type depth that is not an int should error", func(t *testing.T) { sn := fluent.MustBuildMap(basicnode.Style__Map{}, 2, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Limit).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_LimitDepth).AssignString("cheese") + na.AssembleEntry(SelectorKey_Limit).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(SelectorKey_LimitDepth).AssignString("cheese") }) - na.AssembleDirectly(SelectorKey_Sequence).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) + na.AssembleEntry(SelectorKey_Sequence).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) }) }) _, err := ParseContext{}.ParseExploreRecursive(sn) @@ -86,23 +86,23 @@ func TestParseExploreRecursive(t *testing.T) { }) t.Run("parsing map node with sequence field with invalid selector node should return child's error", func(t *testing.T) { sn := fluent.MustBuildMap(basicnode.Style__Map{}, 2, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Limit).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_LimitDepth).AssignInt(2) + na.AssembleEntry(SelectorKey_Limit).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(SelectorKey_LimitDepth).AssignInt(2) }) - na.AssembleDirectly(SelectorKey_Sequence).AssignInt(0) + na.AssembleEntry(SelectorKey_Sequence).AssignInt(0) }) _, err := ParseContext{}.ParseExploreRecursive(sn) Wish(t, err, ShouldEqual, fmt.Errorf("selector spec parse rejected: selector is a keyed union and thus must be a map")) }) t.Run("parsing map node with sequence field with valid selector w/o ExploreRecursiveEdge should not parse", func(t *testing.T) { sn := fluent.MustBuildMap(basicnode.Style__Map{}, 2, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Limit).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_LimitDepth).AssignInt(2) + na.AssembleEntry(SelectorKey_Limit).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(SelectorKey_LimitDepth).AssignInt(2) }) - na.AssembleDirectly(SelectorKey_Sequence).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_ExploreAll).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) + na.AssembleEntry(SelectorKey_Sequence).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(SelectorKey_ExploreAll).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) }) }) }) @@ -117,13 +117,13 @@ func TestParseExploreRecursive(t *testing.T) { }) t.Run("parsing map node with sequence field with valid selector node should parse", func(t *testing.T) { sn := fluent.MustBuildMap(basicnode.Style__Map{}, 2, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Limit).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_LimitDepth).AssignInt(2) + na.AssembleEntry(SelectorKey_Limit).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(SelectorKey_LimitDepth).AssignInt(2) }) - na.AssembleDirectly(SelectorKey_Sequence).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_ExploreAll).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_ExploreRecursiveEdge).CreateMap(0, func(na fluent.MapAssembler) {}) + na.AssembleEntry(SelectorKey_Sequence).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(SelectorKey_ExploreAll).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(SelectorKey_ExploreRecursiveEdge).CreateMap(0, func(na fluent.MapAssembler) {}) }) }) }) @@ -135,13 +135,13 @@ func TestParseExploreRecursive(t *testing.T) { t.Run("parsing map node with sequence field with valid selector node and limit type none should parse", func(t *testing.T) { sn := fluent.MustBuildMap(basicnode.Style__Map{}, 2, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Limit).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_LimitNone).CreateMap(0, func(na fluent.MapAssembler) {}) + na.AssembleEntry(SelectorKey_Limit).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(SelectorKey_LimitNone).CreateMap(0, func(na fluent.MapAssembler) {}) }) - na.AssembleDirectly(SelectorKey_Sequence).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_ExploreAll).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_ExploreRecursiveEdge).CreateMap(0, func(na fluent.MapAssembler) {}) + na.AssembleEntry(SelectorKey_Sequence).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(SelectorKey_ExploreAll).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(SelectorKey_ExploreRecursiveEdge).CreateMap(0, func(na fluent.MapAssembler) {}) }) }) }) diff --git a/traversal/selector/exploreUnion_test.go b/traversal/selector/exploreUnion_test.go index 390f5b6c..1db0853f 100644 --- a/traversal/selector/exploreUnion_test.go +++ b/traversal/selector/exploreUnion_test.go @@ -20,7 +20,7 @@ func TestParseExploreUnion(t *testing.T) { t.Run("parsing list node where one node is invalid should return child's error", func(t *testing.T) { sn := fluent.MustBuildList(basicnode.Style__List{}, 2, func(na fluent.ListAssembler) { na.AssembleValue().CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) + na.AssembleEntry(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) }) na.AssembleValue().AssignInt(2) }) @@ -31,13 +31,13 @@ func TestParseExploreUnion(t *testing.T) { t.Run("parsing map node with next field with valid selector node should parse", func(t *testing.T) { sn := fluent.MustBuildList(basicnode.Style__List{}, 2, func(na fluent.ListAssembler) { na.AssembleValue().CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) + na.AssembleEntry(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) }) na.AssembleValue().CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_ExploreIndex).CreateMap(2, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Index).AssignInt(2) - na.AssembleDirectly(SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { - na.AssembleDirectly(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) + na.AssembleEntry(SelectorKey_ExploreIndex).CreateMap(2, func(na fluent.MapAssembler) { + na.AssembleEntry(SelectorKey_Index).AssignInt(2) + na.AssembleEntry(SelectorKey_Next).CreateMap(1, func(na fluent.MapAssembler) { + na.AssembleEntry(SelectorKey_Matcher).CreateMap(0, func(na fluent.MapAssembler) {}) }) }) }) diff --git a/traversal/walk_test.go b/traversal/walk_test.go index 442307e6..a76a6b62 100644 --- a/traversal/walk_test.go +++ b/traversal/walk_test.go @@ -21,11 +21,11 @@ var ( leafAlpha, leafAlphaLnk = encode(basicnode.NewString("alpha")) leafBeta, leafBetaLnk = encode(basicnode.NewString("beta")) middleMapNode, middleMapNodeLnk = encode(fluent.MustBuildMap(basicnode.Style__Map{}, 3, func(na fluent.MapAssembler) { - na.AssembleDirectly("foo").AssignBool(true) - na.AssembleDirectly("bar").AssignBool(false) - na.AssembleDirectly("nested").CreateMap(2, func(na fluent.MapAssembler) { - na.AssembleDirectly("alink").AssignLink(leafAlphaLnk) - na.AssembleDirectly("nonlink").AssignString("zoo") + na.AssembleEntry("foo").AssignBool(true) + na.AssembleEntry("bar").AssignBool(false) + na.AssembleEntry("nested").CreateMap(2, func(na fluent.MapAssembler) { + na.AssembleEntry("alink").AssignLink(leafAlphaLnk) + na.AssembleEntry("nonlink").AssignString("zoo") }) })) middleListNode, middleListNodeLnk = encode(fluent.MustBuildList(basicnode.Style__List{}, 4, func(na fluent.ListAssembler) { @@ -35,10 +35,10 @@ var ( na.AssembleValue().AssignLink(leafAlphaLnk) })) rootNode, rootNodeLnk = encode(fluent.MustBuildMap(basicnode.Style__Map{}, 4, func(na fluent.MapAssembler) { - na.AssembleDirectly("plain").AssignString("olde string") - na.AssembleDirectly("linkedString").AssignLink(leafAlphaLnk) - na.AssembleDirectly("linkedMap").AssignLink(middleMapNodeLnk) - na.AssembleDirectly("linkedList").AssignLink(middleListNodeLnk) + na.AssembleEntry("plain").AssignString("olde string") + na.AssembleEntry("linkedString").AssignLink(leafAlphaLnk) + na.AssembleEntry("linkedMap").AssignLink(middleMapNodeLnk) + na.AssembleEntry("linkedList").AssignLink(middleListNodeLnk) })) ) */ @@ -141,8 +141,8 @@ func TestWalkMatching(t *testing.T) { Wish(t, prog.Path.String(), ShouldEqual, "bar") case 3: Wish(t, n, ShouldEqual, fluent.MustBuildMap(basicnode.Style__Map{}, 2, func(na fluent.MapAssembler) { - na.AssembleDirectly("alink").AssignLink(leafAlphaLnk) - na.AssembleDirectly("nonlink").AssignString("zoo") + na.AssembleEntry("alink").AssignLink(leafAlphaLnk) + na.AssembleEntry("nonlink").AssignString("zoo") })) Wish(t, prog.Path.String(), ShouldEqual, "nested") case 4: