luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

d2ir: Fully implement scenarios/steps

Browse source
This commit is contained in:
Anmol Sethi 2023-01-18 07:20:21 -08:00
parent d239b8dad1
commit 4424a0f10e
No known key found for this signature in database
GPG key ID: 25BC68888A99A8BA
2 changed files with 87 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

164
d2ir/compile_test.go
View file

@ -59,7 +59,7 @@ func compile(t testing.TB, text string) (*d2ir.Map, error) {
return m, nil return m, nil
} }
func assertQueryOne(t testing.TB, n d2ir.Node, nfields, nedges int, primary interface{}, idStr string) d2ir.Node { func assertQuery(t testing.TB, n d2ir.Node, nfields, nedges int, primary interface{}, idStr string) d2ir.Node {
t.Helper() t.Helper()
m := n.Map() m := n.Map()
@ -67,7 +67,7 @@ func assertQueryOne(t testing.TB, n d2ir.Node, nfields, nedges int, primary inte
if idStr != "" { if idStr != "" {
var err error var err error
n, err = m.QueryOne(idStr) n, err = m.Query(idStr)
assert.Success(t, err) assert.Success(t, err)
assert.NotEqual(t, n, nil) assert.NotEqual(t, n, nil)
@ -126,9 +126,9 @@ func testCompileFields(t *testing.T) {
run: func(t testing.TB) { run: func(t testing.TB) {
m, err := compile(t, `x`) m, err := compile(t, `x`)
assert.Success(t, err) assert.Success(t, err)
assertQueryOne(t, m, 1, 0, nil, "") assertQuery(t, m, 1, 0, nil, "")
assertQueryOne(t, m, 0, 0, nil, "x") assertQuery(t, m, 0, 0, nil, "x")
}, },
}, },
{ {
@ -136,9 +136,9 @@ func testCompileFields(t *testing.T) {
run: func(t testing.TB) { run: func(t testing.TB) {
m, err := compile(t, `x: yes`) m, err := compile(t, `x: yes`)
assert.Success(t, err) assert.Success(t, err)
assertQueryOne(t, m, 1, 0, nil, "") assertQuery(t, m, 1, 0, nil, "")
assertQueryOne(t, m, 0, 0, "yes", "x") assertQuery(t, m, 0, 0, "yes", "x")
}, },
}, },
{ {
@ -146,10 +146,10 @@ func testCompileFields(t *testing.T) {
run: func(t testing.TB) { run: func(t testing.TB) {
m, err := compile(t, `x.y: yes`) m, err := compile(t, `x.y: yes`)
assert.Success(t, err) assert.Success(t, err)
assertQueryOne(t, m, 2, 0, nil, "") assertQuery(t, m, 2, 0, nil, "")
assertQueryOne(t, m, 1, 0, nil, "x") assertQuery(t, m, 1, 0, nil, "x")
assertQueryOne(t, m, 0, 0, "yes", "x.y") assertQuery(t, m, 0, 0, "yes", "x.y")
}, },
}, },
{ {
@ -157,9 +157,9 @@ func testCompileFields(t *testing.T) {
run: func(t testing.TB) { run: func(t testing.TB) {
m, err := compile(t, `x: [1;2;3;4]`) m, err := compile(t, `x: [1;2;3;4]`)
assert.Success(t, err) assert.Success(t, err)
assertQueryOne(t, m, 1, 0, nil, "") assertQuery(t, m, 1, 0, nil, "")
f := assertQueryOne(t, m, 0, 0, nil, "x").(*d2ir.Field) f := assertQuery(t, m, 0, 0, nil, "x").(*d2ir.Field)
assert.String(t, `[1; 2; 3; 4]`, f.Composite.String()) assert.String(t, `[1; 2; 3; 4]`, f.Composite.String())
}, },
}, },
@ -169,11 +169,11 @@ func testCompileFields(t *testing.T) {
m, err := compile(t, `pq: pq m, err := compile(t, `pq: pq
pq: null`) pq: null`)
assert.Success(t, err) assert.Success(t, err)
assertQueryOne(t, m, 1, 0, nil, "") assertQuery(t, m, 1, 0, nil, "")
// null doesn't delete pq from *Map so that for language tooling // null doesn't delete pq from *Map so that for language tooling
// we maintain the references. // we maintain the references.
// Instead d2compiler will ensure it doesn't get rendered. // Instead d2compiler will ensure it doesn't get rendered.
assertQueryOne(t, m, 0, 0, nil, "pq") assertQuery(t, m, 0, 0, nil, "pq")
}, },
}, },
} }
@ -186,10 +186,10 @@ pq: null`)
run: func(t testing.TB) { run: func(t testing.TB) {
m, err := compile(t, `x: yes { pqrs }`) m, err := compile(t, `x: yes { pqrs }`)
assert.Success(t, err) assert.Success(t, err)
assertQueryOne(t, m, 2, 0, nil, "") assertQuery(t, m, 2, 0, nil, "")
assertQueryOne(t, m, 1, 0, "yes", "x") assertQuery(t, m, 1, 0, "yes", "x")
assertQueryOne(t, m, 0, 0, nil, "x.pqrs") assertQuery(t, m, 0, 0, nil, "x.pqrs")
}, },
}, },
{ {
@ -197,11 +197,11 @@ pq: null`)
run: func(t testing.TB) { run: func(t testing.TB) {
m, err := compile(t, `x.y: yes { pqrs }`) m, err := compile(t, `x.y: yes { pqrs }`)
assert.Success(t, err) assert.Success(t, err)
assertQueryOne(t, m, 3, 0, nil, "") assertQuery(t, m, 3, 0, nil, "")
assertQueryOne(t, m, 2, 0, nil, "x") assertQuery(t, m, 2, 0, nil, "x")
assertQueryOne(t, m, 1, 0, "yes", "x.y") assertQuery(t, m, 1, 0, "yes", "x.y")
assertQueryOne(t, m, 0, 0, nil, "x.y.pqrs") assertQuery(t, m, 0, 0, nil, "x.y.pqrs")
}, },
}, },
} }
@ -217,11 +217,11 @@ func testCompileEdges(t *testing.T) {
run: func(t testing.TB) { run: func(t testing.TB) {
m, err := compile(t, `x -> y`) m, err := compile(t, `x -> y`)
assert.Success(t, err) assert.Success(t, err)
assertQueryOne(t, m, 2, 1, nil, "") assertQuery(t, m, 2, 1, nil, "")
assertQueryOne(t, m, 0, 0, nil, `(x -> y)[0]`) assertQuery(t, m, 0, 0, nil, `(x -> y)[0]`)
assertQueryOne(t, m, 0, 0, nil, "x") assertQuery(t, m, 0, 0, nil, "x")
assertQueryOne(t, m, 0, 0, nil, "y") assertQuery(t, m, 0, 0, nil, "y")
}, },
}, },
{ {
@ -229,15 +229,15 @@ func testCompileEdges(t *testing.T) {
run: func(t testing.TB) { run: func(t testing.TB) {
m, err := compile(t, `x.y -> z.p`) m, err := compile(t, `x.y -> z.p`)
assert.Success(t, err) assert.Success(t, err)
assertQueryOne(t, m, 4, 1, nil, "") assertQuery(t, m, 4, 1, nil, "")
assertQueryOne(t, m, 1, 0, nil, "x") assertQuery(t, m, 1, 0, nil, "x")
assertQueryOne(t, m, 0, 0, nil, "x.y") assertQuery(t, m, 0, 0, nil, "x.y")
assertQueryOne(t, m, 1, 0, nil, "z") assertQuery(t, m, 1, 0, nil, "z")
assertQueryOne(t, m, 0, 0, nil, "z.p") assertQuery(t, m, 0, 0, nil, "z.p")
assertQueryOne(t, m, 0, 0, nil, "(x.y -> z.p)[0]") assertQuery(t, m, 0, 0, nil, "(x.y -> z.p)[0]")
}, },
}, },
{ {
@ -245,12 +245,12 @@ func testCompileEdges(t *testing.T) {
run: func(t testing.TB) { run: func(t testing.TB) {
m, err := compile(t, `p: { _.x -> z }`) m, err := compile(t, `p: { _.x -> z }`)
assert.Success(t, err) assert.Success(t, err)
assertQueryOne(t, m, 3, 1, nil, "") assertQuery(t, m, 3, 1, nil, "")
assertQueryOne(t, m, 0, 0, nil, "x") assertQuery(t, m, 0, 0, nil, "x")
assertQueryOne(t, m, 1, 0, nil, "p") assertQuery(t, m, 1, 0, nil, "p")
assertQueryOne(t, m, 0, 0, nil, "(x -> p.z)[0]") assertQuery(t, m, 0, 0, nil, "(x -> p.z)[0]")
}, },
}, },
{ {
@ -258,15 +258,15 @@ func testCompileEdges(t *testing.T) {
run: func(t testing.TB) { run: func(t testing.TB) {
m, err := compile(t, `a -> b -> c -> d`) m, err := compile(t, `a -> b -> c -> d`)
assert.Success(t, err) assert.Success(t, err)
assertQueryOne(t, m, 4, 3, nil, "") assertQuery(t, m, 4, 3, nil, "")
assertQueryOne(t, m, 0, 0, nil, "a") assertQuery(t, m, 0, 0, nil, "a")
assertQueryOne(t, m, 0, 0, nil, "b") assertQuery(t, m, 0, 0, nil, "b")
assertQueryOne(t, m, 0, 0, nil, "c") assertQuery(t, m, 0, 0, nil, "c")
assertQueryOne(t, m, 0, 0, nil, "d") assertQuery(t, m, 0, 0, nil, "d")
assertQueryOne(t, m, 0, 0, nil, "(a -> b)[0]") assertQuery(t, m, 0, 0, nil, "(a -> b)[0]")
assertQueryOne(t, m, 0, 0, nil, "(b -> c)[0]") assertQuery(t, m, 0, 0, nil, "(b -> c)[0]")
assertQueryOne(t, m, 0, 0, nil, "(c -> d)[0]") assertQuery(t, m, 0, 0, nil, "(c -> d)[0]")
}, },
}, },
} }
@ -298,13 +298,13 @@ layers: {
}`) }`)
assert.Success(t, err) assert.Success(t, err)
assertQueryOne(t, m, 7, 1, nil, "") assertQuery(t, m, 7, 1, nil, "")
assertQueryOne(t, m, 0, 0, nil, `(x -> y)[0]`) assertQuery(t, m, 0, 0, nil, `(x -> y)[0]`)
assertQueryOne(t, m, 0, 0, nil, "x") assertQuery(t, m, 0, 0, nil, "x")
assertQueryOne(t, m, 0, 0, nil, "y") assertQuery(t, m, 0, 0, nil, "y")
assertQueryOne(t, m, 3, 0, nil, "layers.bingo") assertQuery(t, m, 3, 0, nil, "layers.bingo")
}, },
}, },
} }
@ -351,25 +351,25 @@ scenarios: {
}`) }`)
assert.Success(t, err) assert.Success(t, err)
assertQueryOne(t, m, 13, 3, nil, "") assertQuery(t, m, 13, 3, nil, "")
assertQueryOne(t, m, 0, 0, nil, "x") assertQuery(t, m, 0, 0, nil, "x")
assertQueryOne(t, m, 0, 0, nil, "y") assertQuery(t, m, 0, 0, nil, "y")
assertQueryOne(t, m, 0, 0, nil, `(x -> y)[0]`) assertQuery(t, m, 0, 0, nil, `(x -> y)[0]`)
assertQueryOne(t, m, 5, 1, nil, "scenarios.bingo") assertQuery(t, m, 5, 1, nil, "scenarios.bingo")
assertQueryOne(t, m, 0, 0, nil, "scenarios.bingo.x") assertQuery(t, m, 0, 0, nil, "scenarios.bingo.x")
assertQueryOne(t, m, 0, 0, nil, "scenarios.bingo.y") assertQuery(t, m, 0, 0, nil, "scenarios.bingo.y")
assertQueryOne(t, m, 0, 0, nil, `scenarios.bingo.(x -> y)[0]`) assertQuery(t, m, 0, 0, nil, `scenarios.bingo.(x -> y)[0]`)
assertQueryOne(t, m, 2, 0, nil, "scenarios.bingo.p") assertQuery(t, m, 2, 0, nil, "scenarios.bingo.p")
assertQueryOne(t, m, 1, 0, nil, "scenarios.bingo.p.q") assertQuery(t, m, 1, 0, nil, "scenarios.bingo.p.q")
assertQueryOne(t, m, 0, 0, nil, "scenarios.bingo.p.q.z") assertQuery(t, m, 0, 0, nil, "scenarios.bingo.p.q.z")
assertQueryOne(t, m, 3, 1, nil, "scenarios.nuclear") assertQuery(t, m, 3, 1, nil, "scenarios.nuclear")
assertQueryOne(t, m, 0, 0, nil, "scenarios.nuclear.x") assertQuery(t, m, 0, 0, nil, "scenarios.nuclear.x")
assertQueryOne(t, m, 0, 0, nil, "scenarios.nuclear.y") assertQuery(t, m, 0, 0, nil, "scenarios.nuclear.y")
assertQueryOne(t, m, 0, 0, nil, `scenarios.nuclear.(x -> y)[0]`) assertQuery(t, m, 0, 0, nil, `scenarios.nuclear.(x -> y)[0]`)
assertQueryOne(t, m, 0, 0, nil, "scenarios.nuclear.quiche") assertQuery(t, m, 0, 0, nil, "scenarios.nuclear.quiche")
}, },
}, },
} }
@ -389,28 +389,28 @@ steps: {
}`) }`)
assert.Success(t, err) assert.Success(t, err)
assertQueryOne(t, m, 16, 3, nil, "") assertQuery(t, m, 16, 3, nil, "")
assertQueryOne(t, m, 0, 0, nil, "x") assertQuery(t, m, 0, 0, nil, "x")
assertQueryOne(t, m, 0, 0, nil, "y") assertQuery(t, m, 0, 0, nil, "y")
assertQueryOne(t, m, 0, 0, nil, `(x -> y)[0]`) assertQuery(t, m, 0, 0, nil, `(x -> y)[0]`)
assertQueryOne(t, m, 5, 1, nil, "steps.bingo") assertQuery(t, m, 5, 1, nil, "steps.bingo")
assertQueryOne(t, m, 0, 0, nil, "steps.bingo.x") assertQuery(t, m, 0, 0, nil, "steps.bingo.x")
assertQueryOne(t, m, 0, 0, nil, "steps.bingo.y") assertQuery(t, m, 0, 0, nil, "steps.bingo.y")
assertQueryOne(t, m, 0, 0, nil, `steps.bingo.(x -> y)[0]`) assertQuery(t, m, 0, 0, nil, `steps.bingo.(x -> y)[0]`)
assertQueryOne(t, m, 2, 0, nil, "steps.bingo.p") assertQuery(t, m, 2, 0, nil, "steps.bingo.p")
assertQueryOne(t, m, 1, 0, nil, "steps.bingo.p.q") assertQuery(t, m, 1, 0, nil, "steps.bingo.p.q")
assertQueryOne(t, m, 0, 0, nil, "steps.bingo.p.q.z") assertQuery(t, m, 0, 0, nil, "steps.bingo.p.q.z")
assertQueryOne(t, m, 6, 1, nil, "steps.nuclear") assertQuery(t, m, 6, 1, nil, "steps.nuclear")
assertQueryOne(t, m, 0, 0, nil, "steps.nuclear.x") assertQuery(t, m, 0, 0, nil, "steps.nuclear.x")
assertQueryOne(t, m, 0, 0, nil, "steps.nuclear.y") assertQuery(t, m, 0, 0, nil, "steps.nuclear.y")
assertQueryOne(t, m, 0, 0, nil, `steps.nuclear.(x -> y)[0]`) assertQuery(t, m, 0, 0, nil, `steps.nuclear.(x -> y)[0]`)
assertQueryOne(t, m, 2, 0, nil, "steps.nuclear.p") assertQuery(t, m, 2, 0, nil, "steps.nuclear.p")
assertQueryOne(t, m, 1, 0, nil, "steps.nuclear.p.q") assertQuery(t, m, 1, 0, nil, "steps.nuclear.p.q")
assertQueryOne(t, m, 0, 0, nil, "steps.nuclear.p.q.z") assertQuery(t, m, 0, 0, nil, "steps.nuclear.p.q.z")
assertQueryOne(t, m, 0, 0, nil, "steps.nuclear.quiche") assertQuery(t, m, 0, 0, nil, "steps.nuclear.quiche")
}, },
}, },
} }

9
d2ir/query.go
View file

@ -6,8 +6,8 @@ import (
"oss.terrastruct.com/d2/d2parser" "oss.terrastruct.com/d2/d2parser"
) )
// Query is only for tests and debugging. // QueryAll is only for tests and debugging.
func (m *Map) Query(idStr string) (na []Node, _ error) { func (m *Map) QueryAll(idStr string) (na []Node, _ error) {
k, err := d2parser.ParseMapKey(idStr) k, err := d2parser.ParseMapKey(idStr)
if err != nil { if err != nil {
return nil, err return nil, err
@ -45,8 +45,9 @@ func (m *Map) Query(idStr string) (na []Node, _ error) {
return na, nil return na, nil
} }
func (m *Map) QueryOne(idStr string) (Node, error) { // Query is only for tests and debugging.
na, err := m.Query(idStr) func (m *Map) Query(idStr string) (Node, error) {
na, err := m.QueryAll(idStr)
if err != nil { if err != nil {
return nil, err return nil, err
} }