From 060f5e9e0563d03e3bf053c84fffd757f2a3f42e Mon Sep 17 00:00:00 2001
From: Alexander Wang <alex@terrastruct.com>
Date: Fri, 17 Mar 2023 17:37:01 -0700
Subject: [PATCH] cli: support int64 slice

---
 d2plugin/exec.go   |  7 +++++++
 d2plugin/plugin.go | 15 +++++++++++++++
 go.mod             |  2 +-
 go.sum             |  4 ++--
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/d2plugin/exec.go b/d2plugin/exec.go
index dc9548dd9..3d2f8aef1 100644
--- a/d2plugin/exec.go
+++ b/d2plugin/exec.go
@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"os/exec"
 	"strconv"
+	"strings"
 	"time"
 
 	"oss.terrastruct.com/util-go/xdefer"
@@ -83,6 +84,12 @@ func (p *execPlugin) HydrateOpts(opts []byte) error {
 				allString[k] = vt
 			case int64:
 				allString[k] = strconv.Itoa(int(vt))
+			case []int64:
+				str := make([]string, len(vt))
+				for i, v := range vt {
+					str[i] = strconv.Itoa(int(v))
+				}
+				allString[k] = strings.Join(str, ",")
 			case float64:
 				allString[k] = strconv.Itoa(int(vt))
 			}
diff --git a/d2plugin/plugin.go b/d2plugin/plugin.go
index 5a74ab415..9b3100ee3 100644
--- a/d2plugin/plugin.go
+++ b/d2plugin/plugin.go
@@ -44,6 +44,18 @@ func (f *PluginSpecificFlag) AddToOpts(opts *xmain.Opts) {
 			val = int64(defaultType)
 		}
 		opts.Int64("", f.Name, "", val, f.Usage)
+	case "[]int64":
+		var slice []int64
+		for _, v := range f.Default.([]interface{}) {
+			switch defaultType := v.(type) {
+			case int64:
+				slice = append(slice, defaultType)
+			case float64:
+				// json unmarshals numbers to float64
+				slice = append(slice, int64(defaultType))
+			}
+		}
+		opts.Int64Slice("", f.Name, "", slice, f.Usage)
 	}
 }
 
@@ -178,6 +190,9 @@ func HydratePluginOpts(ctx context.Context, ms *xmain.State, plugin Plugin) erro
 		case "int64":
 			val, _ := ms.Opts.Flags.GetInt64(f.Name)
 			opts[f.Tag] = val
+		case "[]int64":
+			val, _ := ms.Opts.Flags.GetInt64Slice(f.Name)
+			opts[f.Tag] = val
 		}
 	}
 
diff --git a/go.mod b/go.mod
index 29f34f740..2a269a5c2 100644
--- a/go.mod
+++ b/go.mod
@@ -25,7 +25,7 @@ require (
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2
 	gonum.org/v1/plot v0.12.0
 	nhooyr.io/websocket v1.8.7
-	oss.terrastruct.com/util-go v0.0.0-20230308201337-8598db541d34
+	oss.terrastruct.com/util-go v0.0.0-20230318001724-cdc880b9efd6
 )
 
 require (
diff --git a/go.sum b/go.sum
index c6f447705..098a9bb65 100644
--- a/go.sum
+++ b/go.sum
@@ -327,6 +327,6 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 nhooyr.io/websocket v1.8.7 h1:usjR2uOr/zjjkVMy0lW+PPohFok7PCow5sDjLgX4P4g=
 nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
-oss.terrastruct.com/util-go v0.0.0-20230308201337-8598db541d34 h1:ujjAH9q0hrfGnyFm9gQqxFtCjMBTqkakzOVQ1aaCztc=
-oss.terrastruct.com/util-go v0.0.0-20230308201337-8598db541d34/go.mod h1:eMWv0sOtD9T2RUl90DLWfuShZCYp4NrsqNpI8eqO6U4=
+oss.terrastruct.com/util-go v0.0.0-20230318001724-cdc880b9efd6 h1:ao1swW83sc5jgczkdsY8U0ZgAD7XnHPB0o3GZzmquKA=
+oss.terrastruct.com/util-go v0.0.0-20230318001724-cdc880b9efd6/go.mod h1:eMWv0sOtD9T2RUl90DLWfuShZCYp4NrsqNpI8eqO6U4=
 rsc.io/pdf v0.1.1 h1:k1MczvYDUvJBe93bYd7wrZLLUEcLZAuF824/I4e5Xr4=