From e512d43ec5bae926b5a201506e733eb2c27dae84 Mon Sep 17 00:00:00 2001
From: Alexander Wang <alex@terrastruct.com>
Date: Thu, 20 Apr 2023 12:27:04 -0700
Subject: [PATCH] fix generate unique number id

---
 d2oracle/edit.go                              |  12 +-
 d2oracle/edit_test.go                         |  26 +++
 .../TestRename/conflict_with_numbers.exp.json | 180 ++++++++++++++++++
 3 files changed, 213 insertions(+), 5 deletions(-)
 create mode 100644 testdata/d2oracle/TestRename/conflict_with_numbers.exp.json

diff --git a/d2oracle/edit.go b/d2oracle/edit.go
index fcb56d64d..bd0f2b48a 100644
--- a/d2oracle/edit.go
+++ b/d2oracle/edit.go
@@ -1791,11 +1791,13 @@ func generateUniqueKey(g *d2graph.Graph, prefix string, ignored *d2graph.Object,
 	} else if obj, ok := g.Root.HasChild(d2graph.Key(mk.Key)); ok && obj != ignored {
 		// The key may already have an index, e.g. "x 2"
 		spaced := strings.Split(prefix, " ")
-		if _, err := strconv.Atoi(spaced[len(spaced)-1]); err == nil {
-			withoutIndex := strings.Join(spaced[:len(spaced)-1], " ")
-			mk, err = d2parser.ParseMapKey(withoutIndex)
-			if err != nil {
-				return "", false, err
+		if len(spaced) > 1 {
+			if _, err := strconv.Atoi(spaced[len(spaced)-1]); err == nil {
+				withoutIndex := strings.Join(spaced[:len(spaced)-1], " ")
+				mk, err = d2parser.ParseMapKey(withoutIndex)
+				if err != nil {
+					return "", false, err
+				}
 			}
 		}
 	}
diff --git a/d2oracle/edit_test.go b/d2oracle/edit_test.go
index ad80ed30d..eaa7d451a 100644
--- a/d2oracle/edit_test.go
+++ b/d2oracle/edit_test.go
@@ -1595,6 +1595,19 @@ y
 
 			exp: `"a.b"
 "a.b 2"
+`,
+		},
+		{
+			name: "conflict_with_numbers",
+
+			text: `1
+Square
+`,
+			key:     `Square`,
+			newName: `1`,
+
+			exp: `1
+1 2
 `,
 		},
 		{
@@ -5935,6 +5948,19 @@ y
 
 			exp: `{
   "y": "\"a.b 2\""
+}`,
+		},
+		{
+			name: "rename_conflict_with_numbers",
+
+			text: `1
+Square
+`,
+			key:     `Square`,
+			newName: `1`,
+
+			exp: `{
+  "Square": "1 2"
 }`,
 		},
 		{
diff --git a/testdata/d2oracle/TestRename/conflict_with_numbers.exp.json b/testdata/d2oracle/TestRename/conflict_with_numbers.exp.json
new file mode 100644
index 000000000..73c080df8
--- /dev/null
+++ b/testdata/d2oracle/TestRename/conflict_with_numbers.exp.json
@@ -0,0 +1,180 @@
+{
+  "graph": {
+    "name": "",
+    "isFolderOnly": false,
+    "ast": {
+      "range": "d2/testdata/d2oracle/TestRename/conflict_with_numbers.d2,0:0:0-2:0:6",
+      "nodes": [
+        {
+          "map_key": {
+            "range": "d2/testdata/d2oracle/TestRename/conflict_with_numbers.d2,0:0:0-0:1:1",
+            "key": {
+              "range": "d2/testdata/d2oracle/TestRename/conflict_with_numbers.d2,0:0:0-0:1:1",
+              "path": [
+                {
+                  "unquoted_string": {
+                    "range": "d2/testdata/d2oracle/TestRename/conflict_with_numbers.d2,0:0:0-0:1:1",
+                    "value": [
+                      {
+                        "string": "1",
+                        "raw_string": "1"
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "primary": {},
+            "value": {}
+          }
+        },
+        {
+          "map_key": {
+            "range": "d2/testdata/d2oracle/TestRename/conflict_with_numbers.d2,1:0:2-1:3:5",
+            "key": {
+              "range": "d2/testdata/d2oracle/TestRename/conflict_with_numbers.d2,1:0:2-1:3:5",
+              "path": [
+                {
+                  "unquoted_string": {
+                    "range": "d2/testdata/d2oracle/TestRename/conflict_with_numbers.d2,1:0:2-1:3:5",
+                    "value": [
+                      {
+                        "string": "1 2",
+                        "raw_string": "1 2"
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "primary": {},
+            "value": {}
+          }
+        }
+      ]
+    },
+    "root": {
+      "id": "",
+      "id_val": "",
+      "attributes": {
+        "label": {
+          "value": ""
+        },
+        "labelDimensions": {
+          "width": 0,
+          "height": 0
+        },
+        "style": {},
+        "near_key": null,
+        "shape": {
+          "value": ""
+        },
+        "direction": {
+          "value": ""
+        },
+        "constraint": {
+          "value": ""
+        }
+      },
+      "zIndex": 0
+    },
+    "edges": null,
+    "objects": [
+      {
+        "id": "1",
+        "id_val": "1",
+        "references": [
+          {
+            "key": {
+              "range": "d2/testdata/d2oracle/TestRename/conflict_with_numbers.d2,0:0:0-0:1:1",
+              "path": [
+                {
+                  "unquoted_string": {
+                    "range": "d2/testdata/d2oracle/TestRename/conflict_with_numbers.d2,0:0:0-0:1:1",
+                    "value": [
+                      {
+                        "string": "1",
+                        "raw_string": "1"
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "key_path_index": 0,
+            "map_key_edge_index": -1
+          }
+        ],
+        "attributes": {
+          "label": {
+            "value": "1"
+          },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
+          "style": {},
+          "near_key": null,
+          "shape": {
+            "value": "rectangle"
+          },
+          "direction": {
+            "value": ""
+          },
+          "constraint": {
+            "value": ""
+          }
+        },
+        "zIndex": 0
+      },
+      {
+        "id": "1 2",
+        "id_val": "1 2",
+        "references": [
+          {
+            "key": {
+              "range": "d2/testdata/d2oracle/TestRename/conflict_with_numbers.d2,1:0:2-1:3:5",
+              "path": [
+                {
+                  "unquoted_string": {
+                    "range": "d2/testdata/d2oracle/TestRename/conflict_with_numbers.d2,1:0:2-1:3:5",
+                    "value": [
+                      {
+                        "string": "1 2",
+                        "raw_string": "1 2"
+                      }
+                    ]
+                  }
+                }
+              ]
+            },
+            "key_path_index": 0,
+            "map_key_edge_index": -1
+          }
+        ],
+        "attributes": {
+          "label": {
+            "value": "1 2"
+          },
+          "labelDimensions": {
+            "width": 0,
+            "height": 0
+          },
+          "style": {},
+          "near_key": null,
+          "shape": {
+            "value": "rectangle"
+          },
+          "direction": {
+            "value": ""
+          },
+          "constraint": {
+            "value": ""
+          }
+        },
+        "zIndex": 0
+      }
+    ]
+  },
+  "err": "<nil>"
+}