compiler: Fix compiler errors of keys in globs

ci/release/changelogs/next.md

@@ -14,3 +14,4 @@
 - Fixes use of `null` in `sql_table` constraints (ty @landmaj) [#1660](https://github.com/terrastruct/d2/pull/1660)
 - Fixes elk growing shapes with width/height set [#1679](https://github.com/terrastruct/d2/pull/1679)
 - Adds a compiler error when accidentally using an arrowhead on a shape [#1686](https://github.com/terrastruct/d2/pull/1686)
+- Correctly reports errors from invalid values set by globs. [#1691](https://github.com/terrastruct/d2/pull/1691)

d2compiler/compile.go

@@ -177,7 +177,14 @@ type compiler struct {
 }
 
 func (c *compiler) errorf(n d2ast.Node, f string, v ...interface{}) {
-	c.err.Errors = append(c.err.Errors, d2parser.Errorf(n, f, v...).(d2ast.Error))
+	err := d2parser.Errorf(n, f, v...).(d2ast.Error)
+	if c.err.ErrorsLookup == nil {
+		c.err.ErrorsLookup = make(map[d2ast.Error]struct{})
+	}
+	if _, ok := c.err.ErrorsLookup[err]; !ok {
+		c.err.Errors = append(c.err.Errors, err)
+		c.err.ErrorsLookup[err] = struct{}{}
+	}
 }
 
 func (c *compiler) compileMap(obj *d2graph.Object, m *d2ir.Map) {

d2compiler/compile_test.go

@@ -4241,6 +4241,21 @@ class: {
 `, "")
 			},
 		},
+		{
+			name: "double-glob-err-val",
+			run: func(t *testing.T) {
+				assertCompile(t, `
+**: {
+  label: hi
+  label.near: center
+}
+
+x: {
+  a -> b
+}
+`, `d2/testdata/d2compiler/TestCompile2/globs/double-glob-err-val.d2:4:3: invalid "near" field`)
+			},
+		},
 	}
 
 	for _, tc := range tca {

d2ir/compile.go

@@ -804,7 +804,8 @@ func (c *compiler) _compileField(f *Field, refctx *RefContext) {
 // if already set by a non glob key.
 func (c *compiler) ignoreLazyGlob(n Node) bool {
 	if c.lazyGlobBeingApplied && n.Primary() != nil {
-		if n.LastPrimaryRef() != nil {
+		lastPrimaryRef := n.LastPrimaryRef()
+		if lastPrimaryRef != nil && !lastPrimaryRef.DueToLazyGlob() {
 			return true
 		}
 	}

d2ir/d2ir.go

@@ -318,11 +318,19 @@ func (f *Field) Copy(newParent Node) Node {
 }
 
 func (f *Field) LastPrimaryRef() Reference {
+	var lastGlobSet Reference
 	for i := len(f.References) - 1; i >= 0; i-- {
-		if f.References[i].Primary() && !f.References[i].DueToLazyGlob() {
-			return f.References[i]
+		if f.References[i].Primary() {
+			if f.References[i].DueToLazyGlob() {
+				lastGlobSet = f.References[i]
+			} else {
+				return f.References[i]
+			}
 		}
 	}
+	if lastGlobSet != nil {
+		return lastGlobSet
+	}
 	return nil
 }
 

d2parser/parse.go

@@ -161,7 +161,9 @@ type parser struct {
 
 // TODO: rename to Error and make existing Error a private type errorWithRange
 type ParseError struct {
-	Errors []d2ast.Error `json:"errs"`
+	// Errors from globs need to be deduplicated
+	ErrorsLookup map[d2ast.Error]struct{} `json:"-"`
+	Errors       []d2ast.Error            `json:"errs"`
 }
 
 func Errorf(n d2ast.Node, f string, v ...interface{}) error {

d2parser/parse_test.go

@@ -412,6 +412,20 @@ c-
 				assert.Equal(t, "x -> y\n", d2format.Format(ast))
 			},
 		},
+		{
+			name: "double-glob",
+			text: `**: {
+  label: hi
+  label.near: center
+}
+
+x: {
+  a -> b
+}`,
+			assert: func(t testing.TB, ast *d2ast.Map, err error) {
+				assert.Success(t, err)
+			},
+		},
 	}
 
 	t.Run("import", testImport)