Merge pull request #2231 from alixander/reserve-unquoted-string

reserved keywords must be unquoted
terrastruct · Nov 24, 2024 · db687ab · db687ab
2 parents a27f46b + 1ecadc5
commit db687ab
Show file tree

Hide file tree

Showing 210 changed files with 13,425 additions and 2,053 deletions.
diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md
@@ -6,6 +6,7 @@
 #### Improvements 🧹
 
 - Composition: links pointing to own board are purged [#2203](https://github.com/terrastruct/d2/pull/2203)
+- Syntax: reserved keywords must be unquoted [#2231](https://github.com/terrastruct/d2/pull/2231)
 
 #### Bugfixes ⛑️
 

diff --git a/d2ast/d2ast.go b/d2ast/d2ast.go
@@ -338,6 +338,7 @@ type String interface {
 	SetString(string)
 	Copy() String
 	_string()
+	IsUnquoted() bool
 }
 
 var _ String = &UnquotedString{}
@@ -611,6 +612,11 @@ func (s *DoubleQuotedString) _string() {}
 func (s *SingleQuotedString) _string() {}
 func (s *BlockString) _string()        {}
 
+func (s *UnquotedString) IsUnquoted() bool     { return true }
+func (s *DoubleQuotedString) IsUnquoted() bool { return false }
+func (s *SingleQuotedString) IsUnquoted() bool { return false }
+func (s *BlockString) IsUnquoted() bool        { return false }
+
 type Comment struct {
 	Range Range  `json:"range"`
 	Value string `json:"value"`
@@ -1059,7 +1065,22 @@ func MakeKeyPath(a []string) *KeyPath {
 	return kp
 }
 
-func (kp *KeyPath) IDA() (ida []string) {
+func MakeKeyPathString(a []String) *KeyPath {
+	kp := &KeyPath{}
+	for _, el := range a {
+		kp.Path = append(kp.Path, MakeValueBox(RawString(el.ScalarString(), true)).StringBox())
+	}
+	return kp
+}
+
+func (kp *KeyPath) IDA() (ida []String) {
+	for _, el := range kp.Path {
+		ida = append(ida, el.Unbox())
+	}
+	return ida
+}
+
+func (kp *KeyPath) StringIDA() (ida []string) {
 	for _, el := range kp.Path {
 		ida = append(ida, el.Unbox().ScalarString())
 	}
@@ -1572,9 +1593,9 @@ func (s *Substitution) IDA() (ida []string) {
 	return ida
 }
 
-func (i *Import) IDA() (ida []string) {
+func (i *Import) IDA() (ida []String) {
 	for _, el := range i.Path[1:] {
-		ida = append(ida, el.Unbox().ScalarString())
+		ida = append(ida, el.Unbox())
 	}
 	return ida
 }

diff --git a/d2cli/main.go b/d2cli/main.go
@@ -349,7 +349,7 @@ func Run(ctx context.Context, ms *xmain.State) (err error) {
 		if err != nil {
 			return xmain.UsageErrorf("invalid target: %s", *targetFlag)
 		}
-		boardPath = key.IDA()
+		boardPath = key.StringIDA()
 	}
 
 	ctx, cancel := timelib.WithTimeout(ctx, time.Minute*2)