From e3fa5e9e90345f437871444033bb839e4cf10b21 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Mon, 14 Nov 2022 16:50:21 -0800 Subject: [PATCH 01/36] [ci-base] update readme --- README.md | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 22a738321..8f9353298 100644 --- a/README.md +++ b/README.md @@ -21,22 +21,22 @@ - [Quickstart (CLI)](#quickstart-cli) - * [MacOS](#macos) - * [Linux/Windows](#linuxwindows) + * [Install from source](#install-from-source) + * [Install](#install) - [Quickstart (library)](#quickstart-library) - [Themes](#themes) - [Fonts](#fonts) - [Export file types](#export-file-types) - [Language tooling](#language-tooling) -- [Layout engine](#layout-engine) +- [Plugins](#plugins) - [Comparison](#comparison) - [Contributing](#contributing) - [License](#license) -- [Dependencies](#dependencies) - [Related](#related) * [VSCode extension](#vscode-extension) * [Vim extension](#vim-extension) * [Misc](#misc) +- [FAQ](#faq) @@ -98,11 +98,11 @@ Go programs. ```go import ( - "github.com/terrastruct/d2/d2compiler" - "github.com/terrastruct/d2/d2exporter" - "github.com/terrastruct/d2/d2layouts/d2dagrelayout" - "github.com/terrastruct/d2/d2renderers/textmeasure" - "github.com/terrastruct/d2/d2themes/d2themescatalog" + "github.com/terrastruct/d2/d2compiler" + "github.com/terrastruct/d2/d2exporter" + "github.com/terrastruct/d2/d2layouts/d2dagrelayout" + "github.com/terrastruct/d2/d2renderers/textmeasure" + "github.com/terrastruct/d2/d2themes/d2themescatalog" ) func main() { @@ -221,10 +221,8 @@ Copyright © 2022 Terrastruct, Inc. Open-source licensed under the Mozilla Publi - Does D2 need a browser to run? - No, D2 can run entirely server-side. - I have a question or need help. - - The best way to get help is to open an Issue, so that it's searchable by others in the - future. If you prefer synchronous or just want to chat, you can pop into the help - channel of the [D2 Discord](https://discord.gg/NF6X8K4eDq) as well. -- I have a feature request or proposal. - - D2 uses Github Issues for everything. Just add a "discussion" label to your Issue. + - The best way to get help is to ask on [D2 Discord](https://discord.gg/NF6X8K4eDq) +- I have a feature request, proposal, or bug report. + - Please open up a Github Issue. - I have a private inquiry. - Please reach out at [hi@d2lang.com](hi@d2lang.com). From f9cf92ca40403222e5a73c8dc21790867dd1ef63 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Mon, 14 Nov 2022 16:53:35 -0800 Subject: [PATCH 02/36] [ci-base] update next.md --- ci/release/changelogs/next.md | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index 501bb82d7..bacb9ecf0 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -1,13 +1 @@ -For v0.0.99 we focused on X, Y and Z. Enjoy! - -#### Features 💸 - -- Now you can easily do x, y and z #9999 - -#### Improvements 🔧 - -- Improves something or the other #9999 - -#### Bugfixes 🔴 - -- Fixes something or the other #9999 +As of v0.0.12, D2 is now open-source! From bce7608a74e63c52e161a59cd0537a3f802e29b2 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Mon, 14 Nov 2022 16:53:57 -0800 Subject: [PATCH 03/36] v0.0.12 --- ci/release/changelogs/next.md | 14 +++++++++++++- ci/release/changelogs/v0.0.12.md | 1 + 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 ci/release/changelogs/v0.0.12.md diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index bacb9ecf0..501bb82d7 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -1 +1,13 @@ -As of v0.0.12, D2 is now open-source! +For v0.0.99 we focused on X, Y and Z. Enjoy! + +#### Features 💸 + +- Now you can easily do x, y and z #9999 + +#### Improvements 🔧 + +- Improves something or the other #9999 + +#### Bugfixes 🔴 + +- Fixes something or the other #9999 diff --git a/ci/release/changelogs/v0.0.12.md b/ci/release/changelogs/v0.0.12.md new file mode 100644 index 000000000..bacb9ecf0 --- /dev/null +++ b/ci/release/changelogs/v0.0.12.md @@ -0,0 +1 @@ +As of v0.0.12, D2 is now open-source! From 4c23fa7320b4c76abb660066e4c69003d47ee799 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Mon, 14 Nov 2022 17:00:23 -0800 Subject: [PATCH 04/36] [ci-base] notices --- d2layouts/d2dagrelayout/NOTICE.txt | 6 ++++++ d2layouts/d2elklayout/NOTICE.txt | 6 ++++++ 2 files changed, 12 insertions(+) create mode 100644 d2layouts/d2dagrelayout/NOTICE.txt create mode 100644 d2layouts/d2elklayout/NOTICE.txt diff --git a/d2layouts/d2dagrelayout/NOTICE.txt b/d2layouts/d2dagrelayout/NOTICE.txt new file mode 100644 index 000000000..cac5f33be --- /dev/null +++ b/d2layouts/d2dagrelayout/NOTICE.txt @@ -0,0 +1,6 @@ +dagre.js comes from https://github.com/dagrejs/dagre + +Attribution: + +MIT License +https://github.com/dagrejs/dagre/blob/master/LICENSE diff --git a/d2layouts/d2elklayout/NOTICE.txt b/d2layouts/d2elklayout/NOTICE.txt new file mode 100644 index 000000000..6fdaba655 --- /dev/null +++ b/d2layouts/d2elklayout/NOTICE.txt @@ -0,0 +1,6 @@ +elk.js comes from https://github.com/kieler/elkjs + +Attribution: + +EPL License 2.0 +https://github.com/kieler/elkjs/blob/master/LICENSE.md From 7efa5ac113d18562399b36305d1d2bb942118dae Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Mon, 14 Nov 2022 17:05:05 -0800 Subject: [PATCH 05/36] [ci-base] update readme --- README.md | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 8f9353298..74adca72a 100644 --- a/README.md +++ b/README.md @@ -20,10 +20,11 @@ -- [Quickstart (CLI)](#quickstart-cli) +- [Quickstart](#quickstart) +- [Install](#install) + * [Install script](#install-script) * [Install from source](#install-from-source) - * [Install](#install) -- [Quickstart (library)](#quickstart-library) +- [D2 as a library](#d2-as-a-library) - [Themes](#themes) - [Fonts](#fonts) - [Export file types](#export-file-types) @@ -40,7 +41,7 @@ -## Quickstart (CLI) +## Quickstart The most convenient way to use D2 is to just run it as a CLI executable to produce SVGs from `.d2` files. @@ -55,13 +56,9 @@ d2 --watch in.d2 out.svg A browser window will open with `out.svg` and live-reload on changes to `in.d2`. -### Install from source +## Install -```sh -go install oss.terrastruct.com/d2 -``` - -### Install +### Install script The recommended way to install is to run our install script, which will figure out the best way to install based on your machine. E.g. if D2 is available through a package @@ -91,7 +88,13 @@ curl -fsSL https://d2lang.com/install.sh | sh -s -- --uninstall > warn: Our binary releases aren't fully portable like normal Go binaries due to the C > dependency on v8go for executing dagre. -## Quickstart (library) +### Install from source + +```sh +go install oss.terrastruct.com/d2 +``` + +## D2 as a library In addition to being a runnable CLI tool, D2 can also be used to produce diagrams from Go programs. From 26ca8173f22324fe88f6bd04dcf024f5b5f7041c Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Mon, 14 Nov 2022 17:06:14 -0800 Subject: [PATCH 06/36] [ci-base] update readme --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 74adca72a..4f16dcd81 100644 --- a/README.md +++ b/README.md @@ -90,6 +90,8 @@ curl -fsSL https://d2lang.com/install.sh | sh -s -- --uninstall ### Install from source +Alternatively, you can install from source: + ```sh go install oss.terrastruct.com/d2 ``` From dfbf260f1f9a84e84444ffeddc958d7fe85ff10f Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Mon, 14 Nov 2022 17:10:07 -0800 Subject: [PATCH 07/36] [ci-base] update gitattributes vendored --- .gitattributes | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..27debf0b6 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +d2layouts/d2dagrelayout/dagre.js linguist-vendored +d2layouts/d2elklayout/elk.js linguist-vendored From 4d97be642d7ce697ee5a08255a94342f9e158a8c Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Mon, 14 Nov 2022 17:28:43 -0800 Subject: [PATCH 08/36] [ci-base] update ci --- ci/sub | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/sub b/ci/sub index 670ea5892..2fd92e497 160000 --- a/ci/sub +++ b/ci/sub @@ -1 +1 @@ -Subproject commit 670ea5892b60d815f53a52bf31fdb50ef475ee37 +Subproject commit 2fd92e49721b984e3a3ce9ea64810947c5eaf442 From 82c7d78da8274bd680260adbf9e2f396afbac3d7 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Mon, 14 Nov 2022 18:29:59 -0800 Subject: [PATCH 09/36] [ci-base] update readme --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4f16dcd81..6c6db1373 100644 --- a/README.md +++ b/README.md @@ -213,10 +213,13 @@ Copyright © 2022 Terrastruct, Inc. Open-source licensed under the Mozilla Publi [https://github.com/terrastruct/d2-vim](https://github.com/terrastruct/d2-vim) +### Language docs + +[https://github.com/terrastruct/d2-docs](https://github.com/terrastruct/d2-docs) + ### Misc -- [https://github.com/terrastruct/d2-docs](https://github.com/terrastruct/d2-docs) -- [https://github.com/terrastruct/text-to-diagram-com](https://github.com/terrastruct/text-to-diagram-com) +- [https://github.com/terrastruct/text-to-diagram-site](https://github.com/terrastruct/text-to-diagram-site) ## FAQ From c09d1a772f11708535540f46a137fe5c8099d394 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Mon, 14 Nov 2022 18:36:05 -0800 Subject: [PATCH 10/36] v0.0.12 From bded5b13fa44b0da9d4399601eff69a0b1bcc688 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Mon, 14 Nov 2022 19:05:23 -0800 Subject: [PATCH 11/36] [ci-base] cleanup --- cmd/d2/main.go | 6 ++--- d2ast/d2ast.go | 3 --- d2compiler/doc.go | 3 --- d2layouts/d2elklayout/layout.go | 3 +-- d2themes/d2themes.go | 3 --- go.mod | 2 -- go.sum | 4 ---- lib/version/version.go | 40 --------------------------------- 8 files changed, 4 insertions(+), 60 deletions(-) diff --git a/cmd/d2/main.go b/cmd/d2/main.go index 6ce4d5459..a960a3d23 100644 --- a/cmd/d2/main.go +++ b/cmd/d2/main.go @@ -35,7 +35,7 @@ func run(ctx context.Context, ms *xmain.State) (err error) { watchFlag := ms.FlagSet.BoolP("watch", "w", false, "watch for changes to input and live reload. Use $PORT and $HOST to specify the listening address.\n$D2_PORT and $D2_HOST are also accepted and take priority. Default is localhost:0") themeFlag := ms.FlagSet.Int64P("theme", "t", 0, "set the diagram theme. For a list of available options, see https://oss.terrastruct.com/d2") bundleFlag := ms.FlagSet.BoolP("bundle", "b", true, "bundle all assets and layers into the output svg") - versionFlag := ms.FlagSet.BoolP("version", "v", false, "get the version and check for updates") + versionFlag := ms.FlagSet.BoolP("version", "v", false, "get the version") debugFlag := ms.FlagSet.BoolP("debug", "d", false, "print debug logs") err = ms.FlagSet.Parse(ms.Args) @@ -64,7 +64,7 @@ func run(ctx context.Context, ms *xmain.State) (err error) { if len(ms.FlagSet.Args()) == 0 { if versionFlag != nil && *versionFlag { - version.CheckVersion(ctx, ms.Log) + fmt.Println(version.Version) return nil } help(ms) @@ -74,7 +74,7 @@ func run(ctx context.Context, ms *xmain.State) (err error) { } if len(ms.FlagSet.Args()) >= 1 { if ms.FlagSet.Arg(0) == "version" { - version.CheckVersion(ctx, ms.Log) + fmt.Println(version.Version) return nil } inputPath = ms.FlagSet.Arg(0) diff --git a/d2ast/d2ast.go b/d2ast/d2ast.go index 69fa544fe..fa2cefffa 100644 --- a/d2ast/d2ast.go +++ b/d2ast/d2ast.go @@ -1,8 +1,5 @@ // d2ast implements the d2 language's abstract syntax tree. // -// https://github.com/terrastruct/d2-vscode -// https://terrastruct.com/docs/d2/tour/intro/ -// // Special characters to think about in parser: // # // """ diff --git a/d2compiler/doc.go b/d2compiler/doc.go index 03799880e..401d9eb3f 100644 --- a/d2compiler/doc.go +++ b/d2compiler/doc.go @@ -1,6 +1,3 @@ // Package d2compiler implements a parser, compiler and autoformatter for the Terrastruct d2 // diagramming language. -// -// https://github.com/terrastruct/d2-vscode -// https://terrastruct.com/docs/d2/tour/intro/ package d2compiler diff --git a/d2layouts/d2elklayout/layout.go b/d2layouts/d2elklayout/layout.go index 762b85f17..eaadd520c 100644 --- a/d2layouts/d2elklayout/layout.go +++ b/d2layouts/d2elklayout/layout.go @@ -12,7 +12,6 @@ import ( "math" "rogchap.com/v8go" - v8 "rogchap.com/v8go" "oss.terrastruct.com/xdefer" @@ -104,7 +103,7 @@ func Layout(ctx context.Context, g *d2graph.Graph) (err error) { }) global.Set("setTimeout", setTimeout, v8go.ReadOnly) - v8ctx := v8.NewContext(iso, global) + v8ctx := v8go.NewContext(iso, global) if _, err := v8ctx.RunScript(elkJS, "elk.js"); err != nil { return err } diff --git a/d2themes/d2themes.go b/d2themes/d2themes.go index 5ea17bd6f..c5217c592 100644 --- a/d2themes/d2themes.go +++ b/d2themes/d2themes.go @@ -18,9 +18,6 @@ type Neutral struct { } type ColorPalette struct { - // So far the palette only contains the colors used in d2 shapes, the full theme includes more colors - // https://www.figma.com/file/n79RbPiHFUTO4PPPdpDu7w/%5BKW%5D-GUI-features?node-id=2268%3A120792 - Neutrals Neutral `json:"neutrals"` // Base Colors: used for containers diff --git a/go.mod b/go.mod index f0c96a553..5f2d06a25 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,6 @@ require ( github.com/alecthomas/chroma v0.10.0 github.com/fsnotify/fsnotify v1.6.0 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 - github.com/google/go-github v17.0.0+incompatible github.com/lucasb-eyer/go-colorful v1.2.0 github.com/mazznoer/csscolorparser v0.1.3 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 @@ -40,7 +39,6 @@ require ( github.com/gin-gonic/gin v1.7.7 // indirect github.com/go-playground/validator/v10 v10.10.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/google/go-querystring v1.1.0 // indirect github.com/gorilla/websocket v1.4.2 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.13.6 // indirect diff --git a/go.sum b/go.sum index ac8c2599d..affa68d94 100644 --- a/go.sum +++ b/go.sum @@ -189,10 +189,6 @@ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY= -github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= -github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= -github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= diff --git a/lib/version/version.go b/lib/version/version.go index 65db5ca1c..34ab1a5bf 100644 --- a/lib/version/version.go +++ b/lib/version/version.go @@ -1,44 +1,4 @@ package version -import ( - "context" - "fmt" - - "github.com/google/go-github/github" - "oss.terrastruct.com/cmdlog" -) - // Pre-built binaries will have version set during build time. var Version = "master (built from source)" - -func CheckVersion(ctx context.Context, logger *cmdlog.Logger) { - fmt.Println(Version) - - if Version == "master (built from source)" { - return - } - - // Install script uses -v to check the version, we shouldn't be checking for - // updates here... - // https://github.com/terrastruct/d2/issues/49#issuecomment-1313229683 - return - - logger.Info.Printf("Checking for updates...") - latest, err := getLatestVersion(ctx) - if err != nil { - logger.Debug.Printf("Error reaching Github for latest version: %s", err.Error()) - } else if Version != "master" && Version != latest { - logger.Info.Printf("A new version of D2 is available: %s -> %s", Version, latest) - } -} - -func getLatestVersion(ctx context.Context) (string, error) { - client := github.NewClient(nil) - rep, _, err := client.Repositories.GetLatestRelease(ctx, "terrastruct", "d2") - - if err != nil { - return "", err - } - - return *rep.TagName, nil -} From f64ed4981e911ef54d0b9ff6c204fc4c591b06fd Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Mon, 14 Nov 2022 23:14:21 -0800 Subject: [PATCH 12/36] [ci-base] linguist-vendor more --- .gitattributes | 1 + README.md | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitattributes b/.gitattributes index 27debf0b6..fe07df655 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,3 @@ d2layouts/d2dagrelayout/dagre.js linguist-vendored d2layouts/d2elklayout/elk.js linguist-vendored +d2renderers/d2svg/github-markdown.css linguist-vendored diff --git a/README.md b/README.md index 6c6db1373..ab068047a 100644 --- a/README.md +++ b/README.md @@ -61,8 +61,7 @@ A browser window will open with `out.svg` and live-reload on changes to `in.d2`. ### Install script The recommended way to install is to run our install script, which will figure out the -best way to install based on your machine. E.g. if D2 is available through a package -manager installed, it will use that package manager. +best way to install based on your machine. ```sh # With --dryrun the install script will print the commands it will use From cfffc563a518ef9961effcdd8e03cf4aad87ee53 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Tue, 15 Nov 2022 12:24:46 -0800 Subject: [PATCH 13/36] [ci-base] dry-run typo --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ab068047a..df9cd9564 100644 --- a/README.md +++ b/README.md @@ -64,9 +64,9 @@ The recommended way to install is to run our install script, which will figure o best way to install based on your machine. ```sh -# With --dryrun the install script will print the commands it will use +# With --dry-run the install script will print the commands it will use # to install without actually installing so you know what it's going to do. -curl -fsSL https://d2lang.com/install.sh | sh -s -- --dryrun +curl -fsSL https://d2lang.com/install.sh | sh -s -- --dry-run # If things look good, install for real. curl -fsSL https://d2lang.com/install.sh | sh -s -- ``` @@ -79,7 +79,7 @@ and release a docker image. To uninstall: ```sh -curl -fsSL https://d2lang.com/install.sh | sh -s -- --uninstall --dryrun +curl -fsSL https://d2lang.com/install.sh | sh -s -- --uninstall --dry-run # If things look good, uninstall for real. curl -fsSL https://d2lang.com/install.sh | sh -s -- --uninstall ``` From a943bea1119512ef4582ca5ce7272470dc83d7ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlio=20C=C3=A9sar=20Batista?= Date: Tue, 15 Nov 2022 19:41:44 -0300 Subject: [PATCH 14/36] Add [From/To]TableRowIndex to edges --- d2compiler/compile.go | 9 +++++---- d2graph/d2graph.go | 3 +++ testdata/d2compiler/TestCompile/edge.exp.json | 2 ++ .../TestCompile/edge_arrowhead_fields.exp.json | 2 ++ .../d2compiler/TestCompile/edge_chain.exp.json | 4 ++++ .../d2compiler/TestCompile/edge_chain_map.exp.json | 4 ++++ .../TestCompile/edge_exclusive_style.exp.json | 2 ++ .../TestCompile/edge_flat_arrowhead.exp.json | 2 ++ .../TestCompile/edge_flat_label_arrowhead.exp.json | 2 ++ .../d2compiler/TestCompile/edge_index.exp.json | 2 ++ .../d2compiler/TestCompile/edge_index_map.exp.json | 2 ++ .../TestCompile/edge_index_nested.exp.json | 2 ++ .../edge_index_nested_cross_scope.exp.json | 2 ++ .../edge_key_group_flat_nested.exp.json | 2 ++ .../edge_key_group_flat_nested_underscore.exp.json | 2 ++ ...e_key_group_map_flat_nested_underscore.exp.json | 2 ++ .../edge_key_group_map_nested_underscore.exp.json | 2 ++ .../d2compiler/TestCompile/edge_label_map.exp.json | 2 ++ testdata/d2compiler/TestCompile/edge_map.exp.json | 2 ++ .../TestCompile/edge_map_arrowhead.exp.json | 2 ++ .../TestCompile/edge_map_group_flat.exp.json | 2 ++ .../TestCompile/edge_map_group_semiflat.exp.json | 2 ++ .../TestCompile/edge_map_nested.exp.json | 2 ++ .../TestCompile/edge_map_nested_flat.exp.json | 2 ++ .../TestCompile/edge_mixed_arrowhead.exp.json | 2 ++ .../TestCompile/edge_non_shape_arrowhead.exp.json | 2 ++ .../TestCompile/edge_semiflat_arrowhead.exp.json | 2 ++ .../TestCompile/underscore_edge.exp.json | 2 ++ .../TestCompile/underscore_edge_chain.exp.json | 4 ++++ .../TestCompile/underscore_edge_existing.exp.json | 4 ++++ .../TestCompile/underscore_edge_index.exp.json | 2 ++ .../TestCompile/underscore_edge_nested.exp.json | 2 ++ .../d2oracle/TestCreate/container_edge.exp.json | 2 ++ .../TestCreate/container_edge_label.exp.json | 2 ++ testdata/d2oracle/TestCreate/edge.exp.json | 2 ++ testdata/d2oracle/TestCreate/edge_nested.exp.json | 2 ++ testdata/d2oracle/TestCreate/edge_scope.exp.json | 2 ++ .../d2oracle/TestCreate/edge_scope_flat.exp.json | 2 ++ .../d2oracle/TestCreate/edge_scope_nested.exp.json | 2 ++ testdata/d2oracle/TestCreate/edge_unique.exp.json | 8 ++++++++ testdata/d2oracle/TestDelete/children.exp.json | 2 ++ .../TestDelete/children_edge_conflicts.exp.json | 2 ++ .../children_edges_flat_conflicts.exp.json | 4 ++++ .../children_multiple_conflicts.exp.json | 2 ++ .../d2oracle/TestDelete/children_scope.exp.json | 2 ++ .../TestDelete/edge_both_identical_childs.exp.json | 2 ++ testdata/d2oracle/TestDelete/edge_common.exp.json | 2 ++ .../d2oracle/TestDelete/edge_common_2.exp.json | 2 ++ .../d2oracle/TestDelete/edge_conflict.exp.json | 2 ++ .../d2oracle/TestDelete/edge_decrement.exp.json | 8 ++++++++ testdata/d2oracle/TestDelete/edge_first.exp.json | 4 ++++ .../TestDelete/edge_identical_child.exp.json | 2 ++ .../d2oracle/TestDelete/edge_key_style.exp.json | 2 ++ testdata/d2oracle/TestDelete/edge_last.exp.json | 6 ++++++ .../d2oracle/TestDelete/edge_map_style.exp.json | 2 ++ testdata/d2oracle/TestDelete/edge_middle.exp.json | 6 ++++++ .../d2oracle/TestDelete/flat_reserved.exp.json | 2 ++ .../TestDelete/hoist_edge_children.exp.json | 2 ++ .../TestDelete/nested_edge_key_style.exp.json | 2 ++ testdata/d2oracle/TestDelete/node_in_edge.exp.json | 4 ++++ .../d2oracle/TestDelete/node_in_edge_last.exp.json | 6 ++++++ .../TestDelete/only_delete_edge_reserved.exp.json | 2 ++ .../TestDelete/only_delete_obj_reserved.exp.json | 2 ++ testdata/d2oracle/TestDelete/order_1.exp.json | 2 ++ testdata/d2oracle/TestDelete/order_5.exp.json | 4 ++++ .../d2oracle/TestDelete/shape_sql_table.exp.json | 2 ++ .../d2oracle/TestDelete/underscore_remove.exp.json | 4 ++++ .../TestMove/chain_connected_nested.exp.json | 4 ++++ ...chain_connected_nested_no_extra_create.exp.json | 4 ++++ .../d2oracle/TestMove/connected_nested.exp.json | 2 ++ .../TestMove/edge_across_containers.exp.json | 2 ++ testdata/d2oracle/TestMove/edge_basic.exp.json | 2 ++ .../d2oracle/TestMove/edge_chain_basic.exp.json | 4 ++++ .../d2oracle/TestMove/edge_chain_circular.exp.json | 4 ++++ .../TestMove/edge_chain_into_container.exp.json | 4 ++++ .../TestMove/edge_chain_out_container.exp.json | 4 ++++ testdata/d2oracle/TestMove/edge_conflict.exp.json | 2 ++ .../d2oracle/TestMove/edge_into_container.exp.json | 2 ++ .../d2oracle/TestMove/edge_nested_basic.exp.json | 2 ++ .../TestMove/edge_out_of_container.exp.json | 2 ++ .../d2oracle/TestMove/full_edge_slice.exp.json | 4 ++++ testdata/d2oracle/TestMove/gnarly_1.exp.json | 6 ++++++ .../d2oracle/TestMove/move_out_of_edge.exp.json | 2 ++ .../TestMove/move_out_of_nested_edge.exp.json | 2 ++ testdata/d2oracle/TestMove/nhooyr_two.exp.json | 2 ++ testdata/d2oracle/TestMove/parentheses.exp.json | 2 ++ .../d2oracle/TestMove/partial_edge_slice.exp.json | 2 ++ .../TestMove/underscore_edge_children.exp.json | 2 ++ .../TestMove/underscore_edge_container_1.exp.json | 2 ++ .../TestMove/underscore_edge_container_2.exp.json | 2 ++ .../TestMove/underscore_edge_container_3.exp.json | 2 ++ .../TestMove/underscore_edge_container_4.exp.json | 2 ++ .../TestMove/underscore_edge_container_5.exp.json | 2 ++ .../TestMove/underscore_edge_split.exp.json | 2 ++ .../TestMove/unique_name_with_references.exp.json | 2 ++ testdata/d2oracle/TestRename/arrows.exp.json | 2 ++ testdata/d2oracle/TestRename/arrows_chain.exp.json | 6 ++++++ .../d2oracle/TestRename/arrows_complex.exp.json | 2 ++ .../TestRename/arrows_trim_common.exp.json | 6 ++++++ .../TestRename/arrows_trim_common_2.exp.json | 6 ++++++ .../d2oracle/TestRename/complex_edge_1.exp.json | 2 ++ .../d2oracle/TestRename/complex_edge_2.exp.json | 2 ++ testdata/d2oracle/TestRename/container.exp.json | 14 ++++++++++++++ testdata/d2oracle/TestRename/edges.exp.json | 12 ++++++++++++ testdata/d2oracle/TestSet/edge.exp.json | 2 ++ .../d2oracle/TestSet/edge_append_style.exp.json | 2 ++ testdata/d2oracle/TestSet/edge_chain.exp.json | 4 ++++ .../TestSet/edge_chain_append_style.exp.json | 4 ++++ .../TestSet/edge_chain_existing_style.exp.json | 4 ++++ .../TestSet/edge_chain_nested_set.exp.json | 4 ++++ testdata/d2oracle/TestSet/edge_index_case.exp.json | 4 ++++ .../d2oracle/TestSet/edge_index_nested.exp.json | 2 ++ .../d2oracle/TestSet/edge_key_and_key.exp.json | 2 ++ testdata/d2oracle/TestSet/edge_label.exp.json | 2 ++ .../d2oracle/TestSet/edge_merge_style.exp.json | 2 ++ .../TestSet/edge_nested_label_set.exp.json | 2 ++ .../TestSet/edge_nested_style_set.exp.json | 2 ++ testdata/d2oracle/TestSet/label_primary.exp.json | 2 ++ testdata/d2oracle/TestSet/map_key_missing.exp.json | 2 ++ testdata/d2oracle/TestSet/nested_alex.exp.json | 2 ++ 120 files changed, 348 insertions(+), 4 deletions(-) diff --git a/d2compiler/compile.go b/d2compiler/compile.go index 895b86d75..506f765f9 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -682,10 +682,9 @@ func (c *compiler) compileSQLTable(obj *d2graph.Object) { if srcID == absID { // Frontend isn't aware of container IDs. d2Col.Reference = strings.TrimPrefix(dstID, parentID+".") - relSrc := strings.TrimPrefix(absID, parentID+".") - e.Attributes.Label.Value = fmt.Sprintf("%s %s %s", relSrc, e.ArrowString(), d2Col.Reference) - // removeContainer() will adjust the edge to point to the table and not inside. - break + e.FromTableRowIndex = len(obj.SQLTable.Columns) + } else { + e.ToTableRowIndex = len(obj.SQLTable.Columns) } } @@ -746,6 +745,8 @@ func flattenContainer(g *d2graph.Graph, obj *d2graph.Object) { newEdge, _ = g.Root.Connect(e.Src.AbsIDArray(), obj.AbsIDArray(), e.SrcArrow, e.DstArrow, e.Attributes.Label.Value) } // TODO more attributes + newEdge.FromTableRowIndex = e.FromTableRowIndex + newEdge.ToTableRowIndex = e.ToTableRowIndex newEdge.Attributes.Label = e.Attributes.Label newEdge.References = e.References } diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index aef91878f..f1165730e 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -607,6 +607,9 @@ type Edge struct { MinWidth int `json:"minWidth"` MinHeight int `json:"minHeight"` + FromTableRowIndex int `json:"fromTableRowIndex"` + ToTableRowIndex int `json:"toTableRowIndex"` + LabelDimensions d2target.TextDimensions `json:"label_dimensions"` LabelPosition *string `json:"labelPosition,omitempty"` LabelPercentage *float64 `json:"labelPercentage,omitempty"` diff --git a/testdata/d2compiler/TestCompile/edge.exp.json b/testdata/d2compiler/TestCompile/edge.exp.json index 9ca4f6511..124e16991 100644 --- a/testdata/d2compiler/TestCompile/edge.exp.json +++ b/testdata/d2compiler/TestCompile/edge.exp.json @@ -74,6 +74,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json index 3110298fc..3d094b9d3 100644 --- a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json +++ b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json @@ -253,6 +253,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_chain.exp.json b/testdata/d2compiler/TestCompile/edge_chain.exp.json index fad3904ac..f64d999d9 100644 --- a/testdata/d2compiler/TestCompile/edge_chain.exp.json +++ b/testdata/d2compiler/TestCompile/edge_chain.exp.json @@ -121,6 +121,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -148,6 +150,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json index df003d462..d065ea860 100644 --- a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json @@ -150,6 +150,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -177,6 +179,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json index 47a51ab19..0bac4d0e8 100644 --- a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json +++ b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json @@ -119,6 +119,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json index 5655158a5..009e8e42d 100644 --- a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json @@ -162,6 +162,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json index cb91401f8..7928b9a1d 100644 --- a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json @@ -130,6 +130,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_index.exp.json b/testdata/d2compiler/TestCompile/edge_index.exp.json index 4ac3a630e..e166f550f 100644 --- a/testdata/d2compiler/TestCompile/edge_index.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index.exp.json @@ -145,6 +145,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_index_map.exp.json b/testdata/d2compiler/TestCompile/edge_index_map.exp.json index 35a310c17..dcb1cd57c 100644 --- a/testdata/d2compiler/TestCompile/edge_index_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_map.exp.json @@ -164,6 +164,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json index b27801d49..8404305e7 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json @@ -174,6 +174,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json index 87518a63e..82dbf0c11 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json @@ -190,6 +190,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json index 169522086..a1717f2ad 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json @@ -203,6 +203,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json index 6db8f6429..4da868821 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json @@ -209,6 +209,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json index c85eccedc..e11003972 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json @@ -222,6 +222,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json index f689762ad..132968412 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json @@ -240,6 +240,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_label_map.exp.json b/testdata/d2compiler/TestCompile/edge_label_map.exp.json index e91142b98..3e8a6b6ba 100644 --- a/testdata/d2compiler/TestCompile/edge_label_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_label_map.exp.json @@ -130,6 +130,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_map.exp.json b/testdata/d2compiler/TestCompile/edge_map.exp.json index e1d436a20..bfb703665 100644 --- a/testdata/d2compiler/TestCompile/edge_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map.exp.json @@ -113,6 +113,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json index 9abaa0abc..90abaad35 100644 --- a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json @@ -142,6 +142,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json index 77788e717..ed7c148d5 100644 --- a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json @@ -158,6 +158,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json index 67b44e188..85ea1c5df 100644 --- a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json @@ -176,6 +176,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json index 44d73ca4d..cf697dee2 100644 --- a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json @@ -138,6 +138,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json index 18161ea9f..8e32b92a4 100644 --- a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json @@ -120,6 +120,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json index 40af4edf1..3e4570240 100644 --- a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json @@ -230,6 +230,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json index 0298cbd45..216975d17 100644 --- a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json @@ -124,6 +124,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json index d55583d16..41f697c38 100644 --- a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json @@ -180,6 +180,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/underscore_edge.exp.json b/testdata/d2compiler/TestCompile/underscore_edge.exp.json index eb8834c51..6ed409295 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge.exp.json @@ -125,6 +125,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json index 6d20bf30c..288c99817 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json @@ -184,6 +184,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -211,6 +213,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json index cdbb0e417..57572fb70 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json @@ -191,6 +191,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -218,6 +220,8 @@ "index": 1, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json index 9dc877365..ddab4d207 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json @@ -196,6 +196,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json index f69c79872..14ecfbd7f 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json @@ -165,6 +165,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestCreate/container_edge.exp.json b/testdata/d2oracle/TestCreate/container_edge.exp.json index 39697a995..bf06c85fc 100644 --- a/testdata/d2oracle/TestCreate/container_edge.exp.json +++ b/testdata/d2oracle/TestCreate/container_edge.exp.json @@ -103,6 +103,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestCreate/container_edge_label.exp.json b/testdata/d2oracle/TestCreate/container_edge_label.exp.json index 4804a6f1e..29ad7eef0 100644 --- a/testdata/d2oracle/TestCreate/container_edge_label.exp.json +++ b/testdata/d2oracle/TestCreate/container_edge_label.exp.json @@ -113,6 +113,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestCreate/edge.exp.json b/testdata/d2oracle/TestCreate/edge.exp.json index 9b2014c1e..fc60bae77 100644 --- a/testdata/d2oracle/TestCreate/edge.exp.json +++ b/testdata/d2oracle/TestCreate/edge.exp.json @@ -74,6 +74,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestCreate/edge_nested.exp.json b/testdata/d2oracle/TestCreate/edge_nested.exp.json index 149603016..1f464b526 100644 --- a/testdata/d2oracle/TestCreate/edge_nested.exp.json +++ b/testdata/d2oracle/TestCreate/edge_nested.exp.json @@ -90,6 +90,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestCreate/edge_scope.exp.json b/testdata/d2oracle/TestCreate/edge_scope.exp.json index ea6ae05e1..8e7821de1 100644 --- a/testdata/d2oracle/TestCreate/edge_scope.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope.exp.json @@ -103,6 +103,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json index dc5658e40..6a3e4d579 100644 --- a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json @@ -103,6 +103,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json index ea215f9ed..b7af67bb8 100644 --- a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json @@ -114,6 +114,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestCreate/edge_unique.exp.json b/testdata/d2oracle/TestCreate/edge_unique.exp.json index 64946f4f7..97da8095e 100644 --- a/testdata/d2oracle/TestCreate/edge_unique.exp.json +++ b/testdata/d2oracle/TestCreate/edge_unique.exp.json @@ -260,6 +260,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -287,6 +289,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -314,6 +318,8 @@ "index": 1, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -341,6 +347,8 @@ "index": 2, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/children.exp.json b/testdata/d2oracle/TestDelete/children.exp.json index f0cfc7ed9..fc9a1b920 100644 --- a/testdata/d2oracle/TestDelete/children.exp.json +++ b/testdata/d2oracle/TestDelete/children.exp.json @@ -97,6 +97,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json index 23512a8fa..31ce9deed 100644 --- a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json @@ -130,6 +130,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json index 87432da31..a525711d8 100644 --- a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json @@ -223,6 +223,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -250,6 +252,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json index 7843427b7..24ceb61d5 100644 --- a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json @@ -199,6 +199,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/children_scope.exp.json b/testdata/d2oracle/TestDelete/children_scope.exp.json index 13095ab3f..dc2091ab8 100644 --- a/testdata/d2oracle/TestDelete/children_scope.exp.json +++ b/testdata/d2oracle/TestDelete/children_scope.exp.json @@ -137,6 +137,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json index be9e9d472..54a921a7c 100644 --- a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json +++ b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json @@ -107,6 +107,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/edge_common.exp.json b/testdata/d2oracle/TestDelete/edge_common.exp.json index 99941b391..925d313c9 100644 --- a/testdata/d2oracle/TestDelete/edge_common.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common.exp.json @@ -74,6 +74,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/edge_common_2.exp.json b/testdata/d2oracle/TestDelete/edge_common_2.exp.json index 08de68293..fb9787232 100644 --- a/testdata/d2oracle/TestDelete/edge_common_2.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_2.exp.json @@ -74,6 +74,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/edge_conflict.exp.json b/testdata/d2oracle/TestDelete/edge_conflict.exp.json index 7a272710b..cfcd34319 100644 --- a/testdata/d2oracle/TestDelete/edge_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/edge_conflict.exp.json @@ -119,6 +119,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/edge_decrement.exp.json b/testdata/d2oracle/TestDelete/edge_decrement.exp.json index d1d9ef1ec..959b0037a 100644 --- a/testdata/d2oracle/TestDelete/edge_decrement.exp.json +++ b/testdata/d2oracle/TestDelete/edge_decrement.exp.json @@ -456,6 +456,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -486,6 +488,8 @@ "index": 1, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -516,6 +520,8 @@ "index": 2, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -546,6 +552,8 @@ "index": 3, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/edge_first.exp.json b/testdata/d2oracle/TestDelete/edge_first.exp.json index 53f981334..f0f488b58 100644 --- a/testdata/d2oracle/TestDelete/edge_first.exp.json +++ b/testdata/d2oracle/TestDelete/edge_first.exp.json @@ -185,6 +185,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -212,6 +214,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json index 7cacbe9bb..64696bc89 100644 --- a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json +++ b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json @@ -107,6 +107,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/edge_key_style.exp.json b/testdata/d2oracle/TestDelete/edge_key_style.exp.json index 4f1b062c7..4198c6047 100644 --- a/testdata/d2oracle/TestDelete/edge_key_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_key_style.exp.json @@ -74,6 +74,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/edge_last.exp.json b/testdata/d2oracle/TestDelete/edge_last.exp.json index 33cd89cd6..d8c091987 100644 --- a/testdata/d2oracle/TestDelete/edge_last.exp.json +++ b/testdata/d2oracle/TestDelete/edge_last.exp.json @@ -222,6 +222,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -249,6 +251,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -276,6 +280,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/edge_map_style.exp.json b/testdata/d2oracle/TestDelete/edge_map_style.exp.json index 9192eebd7..f53be47d0 100644 --- a/testdata/d2oracle/TestDelete/edge_map_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_map_style.exp.json @@ -74,6 +74,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/edge_middle.exp.json b/testdata/d2oracle/TestDelete/edge_middle.exp.json index ddb63fae2..b0d8a0883 100644 --- a/testdata/d2oracle/TestDelete/edge_middle.exp.json +++ b/testdata/d2oracle/TestDelete/edge_middle.exp.json @@ -208,6 +208,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -235,6 +237,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -262,6 +266,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/flat_reserved.exp.json b/testdata/d2oracle/TestDelete/flat_reserved.exp.json index d88534289..3fc782f09 100644 --- a/testdata/d2oracle/TestDelete/flat_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/flat_reserved.exp.json @@ -74,6 +74,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json index 76fbfc09c..cdc15ffc0 100644 --- a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json +++ b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json @@ -97,6 +97,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json index 81d77418a..5031509ac 100644 --- a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json +++ b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json @@ -103,6 +103,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/node_in_edge.exp.json b/testdata/d2oracle/TestDelete/node_in_edge.exp.json index 3052f799d..724743e33 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge.exp.json @@ -172,6 +172,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -199,6 +201,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json index 45740d4b1..39b79da16 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json @@ -211,6 +211,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -238,6 +240,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -265,6 +269,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json index 30d5e1158..e20ab37f8 100644 --- a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json @@ -170,6 +170,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json index f46008172..49546f538 100644 --- a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json @@ -170,6 +170,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/order_1.exp.json b/testdata/d2oracle/TestDelete/order_1.exp.json index 7736e550d..14d3b3449 100644 --- a/testdata/d2oracle/TestDelete/order_1.exp.json +++ b/testdata/d2oracle/TestDelete/order_1.exp.json @@ -97,6 +97,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/order_5.exp.json b/testdata/d2oracle/TestDelete/order_5.exp.json index 54f05a0dc..286378b3e 100644 --- a/testdata/d2oracle/TestDelete/order_5.exp.json +++ b/testdata/d2oracle/TestDelete/order_5.exp.json @@ -149,6 +149,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -176,6 +178,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json index 9fdb4cb6c..54e268dda 100644 --- a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json +++ b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json @@ -271,6 +271,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/underscore_remove.exp.json b/testdata/d2oracle/TestDelete/underscore_remove.exp.json index 88abfd541..406c74572 100644 --- a/testdata/d2oracle/TestDelete/underscore_remove.exp.json +++ b/testdata/d2oracle/TestDelete/underscore_remove.exp.json @@ -143,6 +143,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -170,6 +172,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json index 16aed2451..d9c93c103 100644 --- a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json +++ b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json @@ -134,6 +134,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -161,6 +163,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json b/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json index c97e6fdc1..c4c11a362 100644 --- a/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json +++ b/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json @@ -122,6 +122,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -149,6 +151,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/connected_nested.exp.json b/testdata/d2oracle/TestMove/connected_nested.exp.json index 030919340..23433b9a4 100644 --- a/testdata/d2oracle/TestMove/connected_nested.exp.json +++ b/testdata/d2oracle/TestMove/connected_nested.exp.json @@ -97,6 +97,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/edge_across_containers.exp.json b/testdata/d2oracle/TestMove/edge_across_containers.exp.json index e16514bda..49046296a 100644 --- a/testdata/d2oracle/TestMove/edge_across_containers.exp.json +++ b/testdata/d2oracle/TestMove/edge_across_containers.exp.json @@ -148,6 +148,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/edge_basic.exp.json b/testdata/d2oracle/TestMove/edge_basic.exp.json index b82200541..e84230c97 100644 --- a/testdata/d2oracle/TestMove/edge_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_basic.exp.json @@ -74,6 +74,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json index fa6cea6af..aa2bcc9d4 100644 --- a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json @@ -111,6 +111,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -138,6 +140,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json index f190d1a29..f1b9b0a26 100644 --- a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json @@ -162,6 +162,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -189,6 +191,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json index a1227cd4b..375b91a64 100644 --- a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json @@ -145,6 +145,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -172,6 +174,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json index c4f8fe4ab..28aba03a7 100644 --- a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json @@ -162,6 +162,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -189,6 +191,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/edge_conflict.exp.json b/testdata/d2oracle/TestMove/edge_conflict.exp.json index 517ea0676..140ab2968 100644 --- a/testdata/d2oracle/TestMove/edge_conflict.exp.json +++ b/testdata/d2oracle/TestMove/edge_conflict.exp.json @@ -148,6 +148,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/edge_into_container.exp.json b/testdata/d2oracle/TestMove/edge_into_container.exp.json index f2ab40dd1..181af1439 100644 --- a/testdata/d2oracle/TestMove/edge_into_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_into_container.exp.json @@ -137,6 +137,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json index f2658dc1a..568dbebfb 100644 --- a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json @@ -103,6 +103,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json index 13f4ebe2a..67b45ed26 100644 --- a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json @@ -114,6 +114,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/full_edge_slice.exp.json b/testdata/d2oracle/TestMove/full_edge_slice.exp.json index 0d5875894..f25008ec8 100644 --- a/testdata/d2oracle/TestMove/full_edge_slice.exp.json +++ b/testdata/d2oracle/TestMove/full_edge_slice.exp.json @@ -217,6 +217,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -244,6 +246,8 @@ "index": 1, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/gnarly_1.exp.json b/testdata/d2oracle/TestMove/gnarly_1.exp.json index dc97d0024..a6b80bf4d 100644 --- a/testdata/d2oracle/TestMove/gnarly_1.exp.json +++ b/testdata/d2oracle/TestMove/gnarly_1.exp.json @@ -361,6 +361,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -388,6 +390,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -415,6 +419,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json index a74d2c5cd..a94526ac5 100644 --- a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json +++ b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json @@ -130,6 +130,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json index 593084ee0..ed99f0a61 100644 --- a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json +++ b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json @@ -170,6 +170,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/nhooyr_two.exp.json b/testdata/d2oracle/TestMove/nhooyr_two.exp.json index 326f0c5d7..2f0420e17 100644 --- a/testdata/d2oracle/TestMove/nhooyr_two.exp.json +++ b/testdata/d2oracle/TestMove/nhooyr_two.exp.json @@ -178,6 +178,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/parentheses.exp.json b/testdata/d2oracle/TestMove/parentheses.exp.json index 81e26df25..8a3002281 100644 --- a/testdata/d2oracle/TestMove/parentheses.exp.json +++ b/testdata/d2oracle/TestMove/parentheses.exp.json @@ -113,6 +113,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json index d4f638277..8856c1d3d 100644 --- a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json +++ b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json @@ -120,6 +120,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json index c25fc70ca..d1883d2e0 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json @@ -137,6 +137,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json index 1177bff53..3a80fc825 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json @@ -103,6 +103,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json index aef075e64..67f4256e2 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json @@ -114,6 +114,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json index 01d482296..719a51f26 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json @@ -114,6 +114,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json index ac60f92d9..18bc1bb71 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json @@ -103,6 +103,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json index 6aa8777c1..dbe464ab5 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json @@ -136,6 +136,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json index 6f2f331e9..0c69b2044 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json @@ -166,6 +166,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json index 60bf00ba9..53671a1e7 100644 --- a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json +++ b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json @@ -183,6 +183,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestRename/arrows.exp.json b/testdata/d2oracle/TestRename/arrows.exp.json index e83ff7555..0059a0ee0 100644 --- a/testdata/d2oracle/TestRename/arrows.exp.json +++ b/testdata/d2oracle/TestRename/arrows.exp.json @@ -74,6 +74,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestRename/arrows_chain.exp.json b/testdata/d2oracle/TestRename/arrows_chain.exp.json index 7838e805c..d2f0c684f 100644 --- a/testdata/d2oracle/TestRename/arrows_chain.exp.json +++ b/testdata/d2oracle/TestRename/arrows_chain.exp.json @@ -148,6 +148,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -175,6 +177,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -202,6 +206,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestRename/arrows_complex.exp.json b/testdata/d2oracle/TestRename/arrows_complex.exp.json index 8cfc0614e..2c23df4e9 100644 --- a/testdata/d2oracle/TestRename/arrows_complex.exp.json +++ b/testdata/d2oracle/TestRename/arrows_complex.exp.json @@ -128,6 +128,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json index 385ac743d..370c2dbd7 100644 --- a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json +++ b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json @@ -164,6 +164,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -191,6 +193,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -218,6 +222,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json index a05533059..6c590ee96 100644 --- a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json +++ b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json @@ -214,6 +214,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -241,6 +243,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -268,6 +272,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestRename/complex_edge_1.exp.json b/testdata/d2oracle/TestRename/complex_edge_1.exp.json index 43127797e..e043fe96b 100644 --- a/testdata/d2oracle/TestRename/complex_edge_1.exp.json +++ b/testdata/d2oracle/TestRename/complex_edge_1.exp.json @@ -128,6 +128,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestRename/complex_edge_2.exp.json b/testdata/d2oracle/TestRename/complex_edge_2.exp.json index a7920769a..8d4b5bcbb 100644 --- a/testdata/d2oracle/TestRename/complex_edge_2.exp.json +++ b/testdata/d2oracle/TestRename/complex_edge_2.exp.json @@ -128,6 +128,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestRename/container.exp.json b/testdata/d2oracle/TestRename/container.exp.json index 2b263f935..dfc7368c1 100644 --- a/testdata/d2oracle/TestRename/container.exp.json +++ b/testdata/d2oracle/TestRename/container.exp.json @@ -753,6 +753,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -783,6 +785,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -810,6 +814,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -837,6 +843,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -864,6 +872,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -891,6 +901,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -918,6 +930,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestRename/edges.exp.json b/testdata/d2oracle/TestRename/edges.exp.json index a67dce07d..05332edac 100644 --- a/testdata/d2oracle/TestRename/edges.exp.json +++ b/testdata/d2oracle/TestRename/edges.exp.json @@ -418,6 +418,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -445,6 +447,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -472,6 +476,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -499,6 +505,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -526,6 +534,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -553,6 +563,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/edge.exp.json b/testdata/d2oracle/TestSet/edge.exp.json index 507949965..84eaa0647 100644 --- a/testdata/d2oracle/TestSet/edge.exp.json +++ b/testdata/d2oracle/TestSet/edge.exp.json @@ -84,6 +84,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/edge_append_style.exp.json b/testdata/d2oracle/TestSet/edge_append_style.exp.json index 8f0021f3f..5149efba5 100644 --- a/testdata/d2oracle/TestSet/edge_append_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_append_style.exp.json @@ -119,6 +119,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/edge_chain.exp.json b/testdata/d2oracle/TestSet/edge_chain.exp.json index a4a3367d0..197fd7e8f 100644 --- a/testdata/d2oracle/TestSet/edge_chain.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain.exp.json @@ -211,6 +211,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -241,6 +243,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json index 9d923038f..5aec0843b 100644 --- a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json @@ -194,6 +194,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -228,6 +230,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json index 812c17710..b733a2aad 100644 --- a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json @@ -278,6 +278,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -305,6 +307,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json index 8e321df40..4788f201e 100644 --- a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json @@ -234,6 +234,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -268,6 +270,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/edge_index_case.exp.json b/testdata/d2oracle/TestSet/edge_index_case.exp.json index 6ab4ab7cb..ed7457e4a 100644 --- a/testdata/d2oracle/TestSet/edge_index_case.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_case.exp.json @@ -188,6 +188,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -215,6 +217,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/edge_index_nested.exp.json b/testdata/d2oracle/TestSet/edge_index_nested.exp.json index 375636762..eee99c486 100644 --- a/testdata/d2oracle/TestSet/edge_index_nested.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_nested.exp.json @@ -113,6 +113,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json index 421bb7d40..c2429d831 100644 --- a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json +++ b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json @@ -164,6 +164,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/edge_label.exp.json b/testdata/d2oracle/TestSet/edge_label.exp.json index 1f228e913..84ca3dd12 100644 --- a/testdata/d2oracle/TestSet/edge_label.exp.json +++ b/testdata/d2oracle/TestSet/edge_label.exp.json @@ -129,6 +129,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/edge_merge_style.exp.json b/testdata/d2oracle/TestSet/edge_merge_style.exp.json index 121ce1019..02875c753 100644 --- a/testdata/d2oracle/TestSet/edge_merge_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_merge_style.exp.json @@ -166,6 +166,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json index 5d36f0f28..f90a08042 100644 --- a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json @@ -113,6 +113,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json index 0b5d5025b..ea3e1858e 100644 --- a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json @@ -159,6 +159,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/label_primary.exp.json b/testdata/d2oracle/TestSet/label_primary.exp.json index 719f76e71..fd5dae0fa 100644 --- a/testdata/d2oracle/TestSet/label_primary.exp.json +++ b/testdata/d2oracle/TestSet/label_primary.exp.json @@ -109,6 +109,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/map_key_missing.exp.json b/testdata/d2oracle/TestSet/map_key_missing.exp.json index 9253e09f0..6cb4cafa7 100644 --- a/testdata/d2oracle/TestSet/map_key_missing.exp.json +++ b/testdata/d2oracle/TestSet/map_key_missing.exp.json @@ -107,6 +107,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/nested_alex.exp.json b/testdata/d2oracle/TestSet/nested_alex.exp.json index 29e099bda..e69c81902 100644 --- a/testdata/d2oracle/TestSet/nested_alex.exp.json +++ b/testdata/d2oracle/TestSet/nested_alex.exp.json @@ -179,6 +179,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, + "fromTableRowIndex": 0, + "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 From 0af598557c6a4bd35a4c17a91aa53de070b103a6 Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Tue, 15 Nov 2022 16:32:01 -0800 Subject: [PATCH 15/36] pull_request_template: Add reminder to update changelog and docs --- .github/pull_request_template.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index e61c2ae64..f24865554 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,2 +1,3 @@ + From 9fefb95525f5b954718954f832b8c8c116abba73 Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Tue, 15 Nov 2022 17:49:37 -0800 Subject: [PATCH 16/36] ci/sub: Update [ci-base] --- ci/sub | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/sub b/ci/sub index 2fd92e497..237ad4b4b 160000 --- a/ci/sub +++ b/ci/sub @@ -1 +1 @@ -Subproject commit 2fd92e49721b984e3a3ce9ea64810947c5eaf442 +Subproject commit 237ad4b4bc52c0b27eb9d9b7e1496d8a9453dd05 From 756a2315d96922f0fc512ef45370933a88495f9d Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Wed, 16 Nov 2022 03:16:57 -0800 Subject: [PATCH 17/36] ci: Fixes --- ci/release/template/scripts/install.sh | 4 ++-- ci/release/template/scripts/lib.sh | 4 ++++ ci/release/template/scripts/uninstall.sh | 2 +- ci/sub | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ci/release/template/scripts/install.sh b/ci/release/template/scripts/install.sh index 4b4ae2d08..043e5d098 100755 --- a/ci/release/template/scripts/install.sh +++ b/ci/release/template/scripts/install.sh @@ -4,14 +4,14 @@ cd -- "$(dirname "$0")/.." . ./scripts/lib.sh main() { - if [ ! -e "${PREFIX-}" ]; then + if [ -z "${PREFIX-}" ]; then echoerr "\$PREFIX must be set to a unix prefix directory in which to install d2 like /usr/local" return 1 fi sh_c mkdir -p "$PREFIX/bin" - sh_c mkdir -p "$PREFIX/share/man/man1" sh_c install ./bin/d2 "$PREFIX/bin/d2" + sh_c mkdir -p "$PREFIX/share/man/man1" sh_c install ./man/d2.1 "$PREFIX/share/man/man1" } diff --git a/ci/release/template/scripts/lib.sh b/ci/release/template/scripts/lib.sh index 95244284d..0a232eb74 100644 --- a/ci/release/template/scripts/lib.sh +++ b/ci/release/template/scripts/lib.sh @@ -1,5 +1,9 @@ #!/bin/sh +if [ -n "${DEBUG-}" ]; then + set -x +fi + rand() { seed="$1" range="$2" diff --git a/ci/release/template/scripts/uninstall.sh b/ci/release/template/scripts/uninstall.sh index d195463f3..e21877ca9 100755 --- a/ci/release/template/scripts/uninstall.sh +++ b/ci/release/template/scripts/uninstall.sh @@ -4,7 +4,7 @@ cd -- "$(dirname "$0")/.." . ./scripts/lib.sh main() { - if [ ! -e "${PREFIX-}" ]; then + if [ -z "${PREFIX-}" ]; then echoerr "\$PREFIX must be set to a unix prefix directory from which to uninstall d2 like /usr/local" return 1 fi diff --git a/ci/sub b/ci/sub index 237ad4b4b..75d882344 160000 --- a/ci/sub +++ b/ci/sub @@ -1 +1 @@ -Subproject commit 237ad4b4bc52c0b27eb9d9b7e1496d8a9453dd05 +Subproject commit 75d882344578aa409a8f81c8f1ee931e0f0297d0 From 93e95ad68f3f27be01302b24ddcb3cb8bc61d108 Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Wed, 16 Nov 2022 04:01:42 -0800 Subject: [PATCH 18/36] release/build.sh: Lock remote hosts when building --- ci/release/build.sh | 4 ++++ ci/sub | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ci/release/build.sh b/ci/release/build.sh index b716a91a0..9a5e6219d 100755 --- a/ci/release/build.sh +++ b/ci/release/build.sh @@ -161,6 +161,8 @@ build_local() { } build_rhost_macos() { + sh_c lockfile_ssh "$RHOST" .d2-build-lock + trap unlockfile_ssh EXIT sh_c ssh "$RHOST" mkdir -p src sh_c rsync --archive --human-readable --delete ./ "$RHOST:src/d2/" sh_c ssh -tttt "$RHOST" "DRY_RUN=${DRY_RUN-} \ @@ -177,6 +179,8 @@ PATH=\\\"/usr/local/bin:/usr/local/sbin:/opt/homebrew/bin:/opt/homebrew/sbin\\\$ } build_rhost_linux() { + sh_c lockfile_ssh "$RHOST" .d2-build-lock + trap unlockfile_ssh EXIT sh_c ssh "$RHOST" mkdir -p src sh_c rsync --archive --human-readable --delete ./ "$RHOST:src/d2/" sh_c ssh -tttt "$RHOST" "DRY_RUN=${DRY_RUN-} \ diff --git a/ci/sub b/ci/sub index 75d882344..9bc384b72 160000 --- a/ci/sub +++ b/ci/sub @@ -1 +1 @@ -Subproject commit 75d882344578aa409a8f81c8f1ee931e0f0297d0 +Subproject commit 9bc384b724ff8b9007da5ecec809d70f9959a018 From 4c731d7b2447f6b67205b46fbc22cf78e31737cd Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Wed, 16 Nov 2022 04:02:35 -0800 Subject: [PATCH 19/36] release/build.sh: RHOST -> REMOTE_HOST --- ci/release/build.sh | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/ci/release/build.sh b/ci/release/build.sh index 9a5e6219d..242ebd6de 100755 --- a/ci/release/build.sh +++ b/ci/release/build.sh @@ -118,10 +118,10 @@ build() { macos) case $ARCH in amd64) - RHOST=$TSTRUCT_MACOS_AMD64_BUILDER build_rhost_macos + REMOTE_HOST=$TSTRUCT_MACOS_AMD64_BUILDER build_remote_macos ;; arm64) - RHOST=$TSTRUCT_MACOS_ARM64_BUILDER build_rhost_macos + REMOTE_HOST=$TSTRUCT_MACOS_ARM64_BUILDER build_remote_macos ;; *) warn "no builder for OS=$OS ARCH=$ARCH, building locally..." @@ -132,10 +132,10 @@ build() { linux) case $ARCH in amd64) - RHOST=$TSTRUCT_LINUX_AMD64_BUILDER build_rhost_linux + REMOTE_HOST=$TSTRUCT_LINUX_AMD64_BUILDER build_remote_linux ;; arm64) - RHOST=$TSTRUCT_LINUX_ARM64_BUILDER build_rhost_linux + REMOTE_HOST=$TSTRUCT_LINUX_ARM64_BUILDER build_remote_linux ;; *) warn "no builder for OS=$OS ARCH=$ARCH, building locally..." @@ -160,12 +160,12 @@ build_local() { sh_c ./ci/release/_build.sh } -build_rhost_macos() { - sh_c lockfile_ssh "$RHOST" .d2-build-lock +build_remote_macos() { + sh_c lockfile_ssh "$REMOTE_HOST" .d2-build-lock trap unlockfile_ssh EXIT - sh_c ssh "$RHOST" mkdir -p src - sh_c rsync --archive --human-readable --delete ./ "$RHOST:src/d2/" - sh_c ssh -tttt "$RHOST" "DRY_RUN=${DRY_RUN-} \ + sh_c ssh "$REMOTE_HOST" mkdir -p src + sh_c rsync --archive --human-readable --delete ./ "$REMOTE_HOST:src/d2/" + sh_c ssh -tttt "$REMOTE_HOST" "DRY_RUN=${DRY_RUN-} \ HW_BUILD_DIR=$HW_BUILD_DIR \ VERSION=$VERSION \ OS=$OS \ @@ -175,15 +175,15 @@ TERM=$TERM \ PATH=\\\"/usr/local/bin:/usr/local/sbin:/opt/homebrew/bin:/opt/homebrew/sbin\\\${PATH+:\\\$PATH}\\\" \ ./src/d2/ci/release/_build.sh" sh_c mkdir -p "$HW_BUILD_DIR" - sh_c rsync --archive --human-readable "$RHOST:src/d2/$ARCHIVE" "$ARCHIVE" + sh_c rsync --archive --human-readable "$REMOTE_HOST:src/d2/$ARCHIVE" "$ARCHIVE" } -build_rhost_linux() { - sh_c lockfile_ssh "$RHOST" .d2-build-lock +build_remote_linux() { + sh_c lockfile_ssh "$REMOTE_HOST" .d2-build-lock trap unlockfile_ssh EXIT - sh_c ssh "$RHOST" mkdir -p src - sh_c rsync --archive --human-readable --delete ./ "$RHOST:src/d2/" - sh_c ssh -tttt "$RHOST" "DRY_RUN=${DRY_RUN-} \ + sh_c ssh "$REMOTE_HOST" mkdir -p src + sh_c rsync --archive --human-readable --delete ./ "$REMOTE_HOST:src/d2/" + sh_c ssh -tttt "$REMOTE_HOST" "DRY_RUN=${DRY_RUN-} \ HW_BUILD_DIR=$HW_BUILD_DIR \ VERSION=$VERSION \ OS=$OS \ @@ -192,7 +192,7 @@ ARCHIVE=$ARCHIVE \ TERM=$TERM \ ./src/d2/ci/release/build_docker.sh" sh_c mkdir -p "$HW_BUILD_DIR" - sh_c rsync --archive --human-readable "$RHOST:src/d2/$ARCHIVE" "$ARCHIVE" + sh_c rsync --archive --human-readable "$REMOTE_HOST:src/d2/$ARCHIVE" "$ARCHIVE" } ssh() { From 358862e317995e446bb32faffe4615be4cb706a6 Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Wed, 16 Nov 2022 04:24:51 -0800 Subject: [PATCH 20/36] ci/sub: Update --- ci/sub | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/sub b/ci/sub index 9bc384b72..7f058d87e 160000 --- a/ci/sub +++ b/ci/sub @@ -1 +1 @@ -Subproject commit 9bc384b724ff8b9007da5ecec809d70f9959a018 +Subproject commit 7f058d87e852cc099f51ee5d5056ebd6f87c3dd6 From f630edba2261bca48f667f3e2eb972f9b4a5f688 Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Wed, 16 Nov 2022 05:17:57 -0800 Subject: [PATCH 21/36] install.sh: Output MANPATH with trailing colon Bizarre requirement to extend the system MANPATH. --- ci/release/_install.sh | 2 +- install.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/release/_install.sh b/ci/release/_install.sh index 7afd53f1e..7406eca3f 100755 --- a/ci/release/_install.sh +++ b/ci/release/_install.sh @@ -194,7 +194,7 @@ EOF if ! manpath | grep -qF "$PREFIX/share/man"; then logcat >&2 <&2 < Date: Wed, 16 Nov 2022 05:18:27 -0800 Subject: [PATCH 22/36] ci/sub: Update --- ci/sub | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/sub b/ci/sub index 7f058d87e..6267fa6de 160000 --- a/ci/sub +++ b/ci/sub @@ -1 +1 @@ -Subproject commit 7f058d87e852cc099f51ee5d5056ebd6f87c3dd6 +Subproject commit 6267fa6de949a1639435fb857154e15aab61f172 From 4647ca32643ce774b24ea450742fbe5b208c4ddf Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Wed, 16 Nov 2022 05:28:37 -0800 Subject: [PATCH 23/36] ci/sub: Update --- ci/sub | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/sub b/ci/sub index 6267fa6de..65baeaa0e 160000 --- a/ci/sub +++ b/ci/sub @@ -1 +1 @@ -Subproject commit 6267fa6de949a1639435fb857154e15aab61f172 +Subproject commit 65baeaa0e48fff12b12b1d04a0b013ba71e20add From 61bf09d088d70dfc796c4ea5607a114bd284cbcf Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Wed, 16 Nov 2022 06:14:07 -0800 Subject: [PATCH 24/36] aws: Update scripts --- ci/release/builders/aws_copy_keys.sh | 61 ++++++++++++++++++++++++++ ci/release/builders/aws_ensure.sh | 44 +++++++++---------- ci/release/builders/aws_ssh_copy_id.sh | 43 ------------------ 3 files changed, 83 insertions(+), 65 deletions(-) create mode 100755 ci/release/builders/aws_copy_keys.sh delete mode 100755 ci/release/builders/aws_ssh_copy_id.sh diff --git a/ci/release/builders/aws_copy_keys.sh b/ci/release/builders/aws_copy_keys.sh new file mode 100755 index 000000000..df5c46408 --- /dev/null +++ b/ci/release/builders/aws_copy_keys.sh @@ -0,0 +1,61 @@ +#!/bin/sh +set -eu +cd -- "$(dirname "$0")/../../.." +. ./ci/sub/lib.sh + +help() { + cat < .ssh/authorized_keys.dedup' + sh_c ssh "$REMOTE_HOST" 'cp .ssh/authorized_keys.dedup .ssh/authorized_keys' + sh_c ssh "$REMOTE_HOST" 'rm .ssh/authorized_keys.dedup' +} + +main "$@" diff --git a/ci/release/builders/aws_ensure.sh b/ci/release/builders/aws_ensure.sh index dfeb3443c..c82d68fdb 100755 --- a/ci/release/builders/aws_ensure.sh +++ b/ci/release/builders/aws_ensure.sh @@ -41,12 +41,12 @@ main() { fi if [ -z "${SKIP_CREATE-}" ]; then - create_rhosts + create_remote_hosts fi - init_rhosts + init_remote_hosts } -create_rhosts() { +create_remote_hosts() { KEY_NAME=$(aws ec2 describe-key-pairs | jq -r .KeyPairs[0].KeyName) VPC_ID=$(aws ec2 describe-vpcs | jq -r .Vpcs[0].VpcId) @@ -194,15 +194,15 @@ create_rhosts() { done } -init_rhosts() { +init_remote_hosts() { header linux-amd64 - RHOST=$TSTRUCT_LINUX_AMD64_BUILDER init_rhost_linux + REMOTE_HOST=$TSTRUCT_LINUX_AMD64_BUILDER init_remote_linux header linux-arm64 - RHOST=$TSTRUCT_LINUX_ARM64_BUILDER init_rhost_linux + REMOTE_HOST=$TSTRUCT_LINUX_ARM64_BUILDER init_remote_linux header macos-amd64 - RHOST=$TSTRUCT_MACOS_AMD64_BUILDER init_rhost_macos + REMOTE_HOST=$TSTRUCT_MACOS_AMD64_BUILDER init_remote_macos header macos-arm64 - RHOST=$TSTRUCT_MACOS_ARM64_BUILDER init_rhost_macos + REMOTE_HOST=$TSTRUCT_MACOS_ARM64_BUILDER init_remote_macos COLOR=2 header summary log "export TSTRUCT_LINUX_AMD64_BUILDER=$TSTRUCT_LINUX_AMD64_BUILDER" @@ -211,32 +211,32 @@ init_rhosts() { log "export TSTRUCT_MACOS_ARM64_BUILDER=$TSTRUCT_MACOS_ARM64_BUILDER" } -init_rhost_linux() { +init_remote_linux() { while true; do - if sh_c ssh "$RHOST" :; then + if sh_c ssh "$REMOTE_HOST" :; then break fi sleep 5 done - sh_c ssh "$RHOST" 'sudo yum upgrade -y' - sh_c ssh "$RHOST" 'sudo yum install -y docker' - sh_c ssh "$RHOST" 'sudo systemctl start docker' - sh_c ssh "$RHOST" 'sudo systemctl enable docker' - sh_c ssh "$RHOST" 'sudo usermod -a -G docker ec2-user' - sh_c ssh "$RHOST" 'sudo reboot' || true + sh_c ssh "$REMOTE_HOST" 'sudo yum upgrade -y' + sh_c ssh "$REMOTE_HOST" 'sudo yum install -y docker' + sh_c ssh "$REMOTE_HOST" 'sudo systemctl start docker' + sh_c ssh "$REMOTE_HOST" 'sudo systemctl enable docker' + sh_c ssh "$REMOTE_HOST" 'sudo usermod -a -G docker ec2-user' + sh_c ssh "$REMOTE_HOST" 'sudo reboot' || true } -init_rhost_macos() { +init_remote_macos() { while true; do - if sh_c ssh "$RHOST" :; then + if sh_c ssh "$REMOTE_HOST" :; then break fi sleep 5 done - sh_c ssh "$RHOST" '": | /bin/bash -c \"\$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)\""' - sh_c ssh "$RHOST" 'PATH="/usr/local/bin:/opt/homebrew/bin:\$PATH" brew update' - sh_c ssh "$RHOST" 'PATH="/usr/local/bin:/opt/homebrew/bin:\$PATH" brew upgrade' - sh_c ssh "$RHOST" 'PATH="/usr/local/bin:/opt/homebrew/bin:\$PATH" brew install go' + sh_c ssh "$REMOTE_HOST" '": | /bin/bash -c \"\$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)\""' + sh_c ssh "$REMOTE_HOST" 'PATH="/usr/local/bin:/opt/homebrew/bin:\$PATH" brew update' + sh_c ssh "$REMOTE_HOST" 'PATH="/usr/local/bin:/opt/homebrew/bin:\$PATH" brew upgrade' + sh_c ssh "$REMOTE_HOST" 'PATH="/usr/local/bin:/opt/homebrew/bin:\$PATH" brew install go' } main "$@" diff --git a/ci/release/builders/aws_ssh_copy_id.sh b/ci/release/builders/aws_ssh_copy_id.sh deleted file mode 100755 index d50a96d9d..000000000 --- a/ci/release/builders/aws_ssh_copy_id.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -set -eu -cd -- "$(dirname "$0")/../../.." -. ./ci/sub/lib.sh - -help() { - cat < Date: Wed, 16 Nov 2022 11:51:55 -0300 Subject: [PATCH 25/36] Rename rows to columns and omit empty indices --- d2compiler/compile.go | 15 +++++++++------ d2graph/d2graph.go | 4 ++-- e2etests/stable_test.go | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 8 deletions(-) diff --git a/d2compiler/compile.go b/d2compiler/compile.go index 506f765f9..570a12908 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -680,11 +680,12 @@ func (c *compiler) compileSQLTable(obj *d2graph.Object) { continue } if srcID == absID { - // Frontend isn't aware of container IDs. d2Col.Reference = strings.TrimPrefix(dstID, parentID+".") - e.FromTableRowIndex = len(obj.SQLTable.Columns) - } else { - e.ToTableRowIndex = len(obj.SQLTable.Columns) + e.FromTableColumnIndex = new(int) + *e.FromTableColumnIndex = len(obj.SQLTable.Columns) + } else if dstID == absID { + e.ToTableColumnIndex = new(int) + *e.ToTableColumnIndex = len(obj.SQLTable.Columns) } } @@ -745,8 +746,10 @@ func flattenContainer(g *d2graph.Graph, obj *d2graph.Object) { newEdge, _ = g.Root.Connect(e.Src.AbsIDArray(), obj.AbsIDArray(), e.SrcArrow, e.DstArrow, e.Attributes.Label.Value) } // TODO more attributes - newEdge.FromTableRowIndex = e.FromTableRowIndex - newEdge.ToTableRowIndex = e.ToTableRowIndex + newEdge.FromTableColumnIndex = new(int) + *newEdge.FromTableColumnIndex = *e.FromTableColumnIndex + newEdge.ToTableColumnIndex = new(int) + *newEdge.ToTableColumnIndex = *e.ToTableColumnIndex newEdge.Attributes.Label = e.Attributes.Label newEdge.References = e.References } diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index f1165730e..170aad88d 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -607,8 +607,8 @@ type Edge struct { MinWidth int `json:"minWidth"` MinHeight int `json:"minHeight"` - FromTableRowIndex int `json:"fromTableRowIndex"` - ToTableRowIndex int `json:"toTableRowIndex"` + FromTableColumnIndex *int `json:"fromTableColumnIndex,omitempty"` + ToTableColumnIndex *int `json:"toTableColumnIndex,omitempty"` LabelDimensions d2target.TextDimensions `json:"label_dimensions"` LabelPosition *string `json:"labelPosition,omitempty"` diff --git a/e2etests/stable_test.go b/e2etests/stable_test.go index c9a1a87fc..64d2403bb 100644 --- a/e2etests/stable_test.go +++ b/e2etests/stable_test.go @@ -831,6 +831,44 @@ a -> md -> b +setTimeout(seconds int) } `, + }, { + name: "sql_tables", + script: ` + users: { + shape: sql_table + id: int + name: string + email: string + password: string + last_login: datetime + } + + products: { + shape: sql_table + id: int + price: decimal + sku: string + name: string + } + + orders: { + shape: sql_table + id: int + user_id: int + product_id: int + } + + shipments: { + shape: sql_table + id: int + order_id: int + tracking_number: string + status: string + } + + users.id <-> orders.user_id + products.id <-> orders.product_id + shipments.order_id <-> orders.id`, }, } From 618d7f5edf82c073705839986119aab851bf6787 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlio=20C=C3=A9sar=20Batista?= Date: Wed, 16 Nov 2022 11:56:28 -0300 Subject: [PATCH 26/36] Update tests --- d2compiler/compile.go | 12 +- .../stable/sql_tables/dagre/board.exp.json | 396 ++++++++++++++++++ .../stable/sql_tables/dagre/sketch.exp.svg | 56 +++ .../stable/sql_tables/elk/board.exp.json | 385 +++++++++++++++++ .../stable/sql_tables/elk/sketch.exp.svg | 56 +++ testdata/d2compiler/TestCompile/edge.exp.json | 2 - .../edge_arrowhead_fields.exp.json | 2 - .../TestCompile/edge_chain.exp.json | 4 - .../TestCompile/edge_chain_map.exp.json | 4 - .../TestCompile/edge_exclusive_style.exp.json | 2 - .../TestCompile/edge_flat_arrowhead.exp.json | 2 - .../edge_flat_label_arrowhead.exp.json | 2 - .../TestCompile/edge_index.exp.json | 2 - .../TestCompile/edge_index_map.exp.json | 2 - .../TestCompile/edge_index_nested.exp.json | 2 - .../edge_index_nested_cross_scope.exp.json | 2 - .../edge_key_group_flat_nested.exp.json | 2 - ..._key_group_flat_nested_underscore.exp.json | 2 - ..._group_map_flat_nested_underscore.exp.json | 2 - ...e_key_group_map_nested_underscore.exp.json | 2 - .../TestCompile/edge_label_map.exp.json | 2 - .../d2compiler/TestCompile/edge_map.exp.json | 2 - .../TestCompile/edge_map_arrowhead.exp.json | 2 - .../TestCompile/edge_map_group_flat.exp.json | 2 - .../edge_map_group_semiflat.exp.json | 2 - .../TestCompile/edge_map_nested.exp.json | 2 - .../TestCompile/edge_map_nested_flat.exp.json | 2 - .../TestCompile/edge_mixed_arrowhead.exp.json | 2 - .../edge_non_shape_arrowhead.exp.json | 2 - .../edge_semiflat_arrowhead.exp.json | 2 - .../TestCompile/underscore_edge.exp.json | 2 - .../underscore_edge_chain.exp.json | 4 - .../underscore_edge_existing.exp.json | 4 - .../underscore_edge_index.exp.json | 2 - .../underscore_edge_nested.exp.json | 2 - .../TestCreate/container_edge.exp.json | 2 - .../TestCreate/container_edge_label.exp.json | 2 - testdata/d2oracle/TestCreate/edge.exp.json | 2 - .../d2oracle/TestCreate/edge_nested.exp.json | 2 - .../d2oracle/TestCreate/edge_scope.exp.json | 2 - .../TestCreate/edge_scope_flat.exp.json | 2 - .../TestCreate/edge_scope_nested.exp.json | 2 - .../d2oracle/TestCreate/edge_unique.exp.json | 8 - .../d2oracle/TestDelete/children.exp.json | 2 - .../children_edge_conflicts.exp.json | 2 - .../children_edges_flat_conflicts.exp.json | 4 - .../children_multiple_conflicts.exp.json | 2 - .../TestDelete/children_scope.exp.json | 2 - .../edge_both_identical_childs.exp.json | 2 - .../d2oracle/TestDelete/edge_common.exp.json | 2 - .../TestDelete/edge_common_2.exp.json | 2 - .../TestDelete/edge_conflict.exp.json | 2 - .../TestDelete/edge_decrement.exp.json | 8 - .../d2oracle/TestDelete/edge_first.exp.json | 4 - .../TestDelete/edge_identical_child.exp.json | 2 - .../TestDelete/edge_key_style.exp.json | 2 - .../d2oracle/TestDelete/edge_last.exp.json | 6 - .../TestDelete/edge_map_style.exp.json | 2 - .../d2oracle/TestDelete/edge_middle.exp.json | 6 - .../TestDelete/flat_reserved.exp.json | 2 - .../TestDelete/hoist_edge_children.exp.json | 2 - .../TestDelete/nested_edge_key_style.exp.json | 2 - .../d2oracle/TestDelete/node_in_edge.exp.json | 4 - .../TestDelete/node_in_edge_last.exp.json | 6 - .../only_delete_edge_reserved.exp.json | 2 - .../only_delete_obj_reserved.exp.json | 2 - testdata/d2oracle/TestDelete/order_1.exp.json | 2 - testdata/d2oracle/TestDelete/order_5.exp.json | 4 - .../TestDelete/shape_sql_table.exp.json | 2 - .../TestDelete/underscore_remove.exp.json | 4 - .../TestMove/chain_connected_nested.exp.json | 4 - ..._connected_nested_no_extra_create.exp.json | 4 - .../TestMove/connected_nested.exp.json | 2 - .../TestMove/edge_across_containers.exp.json | 2 - .../d2oracle/TestMove/edge_basic.exp.json | 2 - .../TestMove/edge_chain_basic.exp.json | 4 - .../TestMove/edge_chain_circular.exp.json | 4 - .../edge_chain_into_container.exp.json | 4 - .../edge_chain_out_container.exp.json | 4 - .../d2oracle/TestMove/edge_conflict.exp.json | 2 - .../TestMove/edge_into_container.exp.json | 2 - .../TestMove/edge_nested_basic.exp.json | 2 - .../TestMove/edge_out_of_container.exp.json | 2 - .../TestMove/full_edge_slice.exp.json | 4 - testdata/d2oracle/TestMove/gnarly_1.exp.json | 6 - .../TestMove/move_out_of_edge.exp.json | 2 - .../TestMove/move_out_of_nested_edge.exp.json | 2 - .../d2oracle/TestMove/nhooyr_two.exp.json | 2 - .../d2oracle/TestMove/parentheses.exp.json | 2 - .../TestMove/partial_edge_slice.exp.json | 2 - .../underscore_edge_children.exp.json | 2 - .../underscore_edge_container_1.exp.json | 2 - .../underscore_edge_container_2.exp.json | 2 - .../underscore_edge_container_3.exp.json | 2 - .../underscore_edge_container_4.exp.json | 2 - .../underscore_edge_container_5.exp.json | 2 - .../TestMove/underscore_edge_split.exp.json | 2 - .../unique_name_with_references.exp.json | 2 - testdata/d2oracle/TestRename/arrows.exp.json | 2 - .../d2oracle/TestRename/arrows_chain.exp.json | 6 - .../TestRename/arrows_complex.exp.json | 2 - .../TestRename/arrows_trim_common.exp.json | 6 - .../TestRename/arrows_trim_common_2.exp.json | 6 - .../TestRename/complex_edge_1.exp.json | 2 - .../TestRename/complex_edge_2.exp.json | 2 - .../d2oracle/TestRename/container.exp.json | 14 - testdata/d2oracle/TestRename/edges.exp.json | 12 - testdata/d2oracle/TestSet/edge.exp.json | 2 - .../TestSet/edge_append_style.exp.json | 2 - testdata/d2oracle/TestSet/edge_chain.exp.json | 4 - .../TestSet/edge_chain_append_style.exp.json | 4 - .../edge_chain_existing_style.exp.json | 4 - .../TestSet/edge_chain_nested_set.exp.json | 4 - .../d2oracle/TestSet/edge_index_case.exp.json | 4 - .../TestSet/edge_index_nested.exp.json | 2 - .../TestSet/edge_key_and_key.exp.json | 2 - testdata/d2oracle/TestSet/edge_label.exp.json | 2 - .../TestSet/edge_merge_style.exp.json | 2 - .../TestSet/edge_nested_label_set.exp.json | 2 - .../TestSet/edge_nested_style_set.exp.json | 2 - .../d2oracle/TestSet/label_primary.exp.json | 2 - .../d2oracle/TestSet/map_key_missing.exp.json | 2 - .../d2oracle/TestSet/nested_alex.exp.json | 2 - 123 files changed, 901 insertions(+), 344 deletions(-) create mode 100644 e2etests/testdata/stable/sql_tables/dagre/board.exp.json create mode 100644 e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg create mode 100644 e2etests/testdata/stable/sql_tables/elk/board.exp.json create mode 100644 e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg diff --git a/d2compiler/compile.go b/d2compiler/compile.go index 570a12908..d2bd49d2e 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -746,10 +746,14 @@ func flattenContainer(g *d2graph.Graph, obj *d2graph.Object) { newEdge, _ = g.Root.Connect(e.Src.AbsIDArray(), obj.AbsIDArray(), e.SrcArrow, e.DstArrow, e.Attributes.Label.Value) } // TODO more attributes - newEdge.FromTableColumnIndex = new(int) - *newEdge.FromTableColumnIndex = *e.FromTableColumnIndex - newEdge.ToTableColumnIndex = new(int) - *newEdge.ToTableColumnIndex = *e.ToTableColumnIndex + if e.FromTableColumnIndex != nil { + newEdge.FromTableColumnIndex = new(int) + *newEdge.FromTableColumnIndex = *e.FromTableColumnIndex + } + if e.ToTableColumnIndex != nil { + newEdge.ToTableColumnIndex = new(int) + *newEdge.ToTableColumnIndex = *e.ToTableColumnIndex + } newEdge.Attributes.Label = e.Attributes.Label newEdge.References = e.References } diff --git a/e2etests/testdata/stable/sql_tables/dagre/board.exp.json b/e2etests/testdata/stable/sql_tables/dagre/board.exp.json new file mode 100644 index 000000000..da031d9b2 --- /dev/null +++ b/e2etests/testdata/stable/sql_tables/dagre/board.exp.json @@ -0,0 +1,396 @@ +{ + "name": "", + "shapes": [ + { + "id": "users", + "type": "sql_table", + "pos": { + "x": 0, + "y": 0 + }, + "width": 259, + "height": 216, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#FFFFFF", + "stroke": "#0A0F25", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": [ + { + "name": "id", + "type": "int", + "constraint": "", + "reference": "orders.user_id" + }, + { + "name": "name", + "type": "string", + "constraint": "", + "reference": "" + }, + { + "name": "email", + "type": "string", + "constraint": "", + "reference": "" + }, + { + "name": "password", + "type": "string", + "constraint": "", + "reference": "" + }, + { + "name": "last_login", + "type": "datetime", + "constraint": "", + "reference": "" + } + ], + "label": "users", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 61, + "labelHeight": 36 + }, + { + "id": "products", + "type": "sql_table", + "pos": { + "x": 319, + "y": 18 + }, + "width": 290, + "height": 180, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#FFFFFF", + "stroke": "#0A0F25", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": [ + { + "name": "id", + "type": "int", + "constraint": "", + "reference": "orders.product_id" + }, + { + "name": "price", + "type": "decimal", + "constraint": "", + "reference": "" + }, + { + "name": "sku", + "type": "string", + "constraint": "", + "reference": "" + }, + { + "name": "name", + "type": "string", + "constraint": "", + "reference": "" + } + ], + "label": "products", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 99, + "labelHeight": 36 + }, + { + "id": "orders", + "type": "sql_table", + "pos": { + "x": 357, + "y": 316 + }, + "width": 215, + "height": 144, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#FFFFFF", + "stroke": "#0A0F25", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": [ + { + "name": "id", + "type": "int", + "constraint": "", + "reference": "" + }, + { + "name": "user_id", + "type": "int", + "constraint": "", + "reference": "" + }, + { + "name": "product_id", + "type": "int", + "constraint": "", + "reference": "" + } + ], + "label": "orders", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 74, + "labelHeight": 36 + }, + { + "id": "shipments", + "type": "sql_table", + "pos": { + "x": 669, + "y": 18 + }, + "width": 293, + "height": 180, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#FFFFFF", + "stroke": "#0A0F25", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": [ + { + "name": "id", + "type": "int", + "constraint": "", + "reference": "" + }, + { + "name": "order_id", + "type": "int", + "constraint": "", + "reference": "orders.id" + }, + { + "name": "tracking_number", + "type": "string", + "constraint": "", + "reference": "" + }, + { + "name": "status", + "type": "string", + "constraint": "", + "reference": "" + } + ], + "label": "shipments", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 116, + "labelHeight": 36 + } + ], + "connections": [ + { + "id": "(users <-> orders)[0]", + "src": "users", + "srcArrow": "triangle", + "srcLabel": "", + "dst": "orders", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 129.5, + "y": 216 + }, + { + "x": 129.5, + "y": 256 + }, + { + "x": 174.9, + "y": 282.55844544095663 + }, + { + "x": 356.5, + "y": 348.7922272047833 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null + }, + { + "id": "(products <-> orders)[0]", + "src": "products", + "srcArrow": "triangle", + "srcLabel": "", + "dst": "orders", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 464, + "y": 198 + }, + { + "x": 464, + "y": 252.4 + }, + { + "x": 464, + "y": 276 + }, + { + "x": 464, + "y": 316 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null + }, + { + "id": "(shipments <-> orders)[0]", + "src": "shipments", + "srcArrow": "triangle", + "srcLabel": "", + "dst": "orders", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 815.5, + "y": 198 + }, + { + "x": 815.5, + "y": 252.4 + }, + { + "x": 766.7, + "y": 283 + }, + { + "x": 571.5, + "y": 351 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null + } + ] +} diff --git a/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg b/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg new file mode 100644 index 000000000..065687658 --- /dev/null +++ b/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg @@ -0,0 +1,56 @@ + +usersid +int +name +string +email +string +password +string +last_login +datetime +productsid +int +price +decimal +sku +string +name +string +ordersid +int +user_id +int +product_id +int +shipmentsid +int +order_id +int +tracking_number +string +status +string + \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_tables/elk/board.exp.json b/e2etests/testdata/stable/sql_tables/elk/board.exp.json new file mode 100644 index 000000000..abc5d00bf --- /dev/null +++ b/e2etests/testdata/stable/sql_tables/elk/board.exp.json @@ -0,0 +1,385 @@ +{ + "name": "", + "shapes": [ + { + "id": "users", + "type": "sql_table", + "pos": { + "x": 46, + "y": 412 + }, + "width": 259, + "height": 216, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#FFFFFF", + "stroke": "#0A0F25", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": [ + { + "name": "id", + "type": "int", + "constraint": "", + "reference": "orders.user_id" + }, + { + "name": "name", + "type": "string", + "constraint": "", + "reference": "" + }, + { + "name": "email", + "type": "string", + "constraint": "", + "reference": "" + }, + { + "name": "password", + "type": "string", + "constraint": "", + "reference": "" + }, + { + "name": "last_login", + "type": "datetime", + "constraint": "", + "reference": "" + } + ], + "label": "users", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 61, + "labelHeight": 36 + }, + { + "id": "products", + "type": "sql_table", + "pos": { + "x": 15, + "y": 212 + }, + "width": 290, + "height": 180, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#FFFFFF", + "stroke": "#0A0F25", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": [ + { + "name": "id", + "type": "int", + "constraint": "", + "reference": "orders.product_id" + }, + { + "name": "price", + "type": "decimal", + "constraint": "", + "reference": "" + }, + { + "name": "sku", + "type": "string", + "constraint": "", + "reference": "" + }, + { + "name": "name", + "type": "string", + "constraint": "", + "reference": "" + } + ], + "label": "products", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 99, + "labelHeight": 36 + }, + { + "id": "orders", + "type": "sql_table", + "pos": { + "x": 405, + "y": 230 + }, + "width": 215, + "height": 144, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#FFFFFF", + "stroke": "#0A0F25", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": [ + { + "name": "id", + "type": "int", + "constraint": "", + "reference": "" + }, + { + "name": "user_id", + "type": "int", + "constraint": "", + "reference": "" + }, + { + "name": "product_id", + "type": "int", + "constraint": "", + "reference": "" + } + ], + "label": "orders", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 74, + "labelHeight": 36 + }, + { + "id": "shipments", + "type": "sql_table", + "pos": { + "x": 12, + "y": 12 + }, + "width": 293, + "height": 180, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#FFFFFF", + "stroke": "#0A0F25", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": [ + { + "name": "id", + "type": "int", + "constraint": "", + "reference": "" + }, + { + "name": "order_id", + "type": "int", + "constraint": "", + "reference": "orders.id" + }, + { + "name": "tracking_number", + "type": "string", + "constraint": "", + "reference": "" + }, + { + "name": "status", + "type": "string", + "constraint": "", + "reference": "" + } + ], + "label": "shipments", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 116, + "labelHeight": 36 + } + ], + "connections": [ + { + "id": "(users <-> orders)[0]", + "src": "users", + "srcArrow": "triangle", + "srcLabel": "", + "dst": "orders", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 305, + "y": 520 + }, + { + "x": 355, + "y": 520 + }, + { + "x": 355, + "y": 338 + }, + { + "x": 405, + "y": 338 + } + ], + "animated": false, + "tooltip": "", + "icon": null + }, + { + "id": "(products <-> orders)[0]", + "src": "products", + "srcArrow": "triangle", + "srcLabel": "", + "dst": "orders", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 305, + "y": 302 + }, + { + "x": 405, + "y": 302 + } + ], + "animated": false, + "tooltip": "", + "icon": null + }, + { + "id": "(shipments <-> orders)[0]", + "src": "shipments", + "srcArrow": "triangle", + "srcLabel": "", + "dst": "orders", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 305, + "y": 102 + }, + { + "x": 355, + "y": 102 + }, + { + "x": 355, + "y": 266 + }, + { + "x": 405, + "y": 266 + } + ], + "animated": false, + "tooltip": "", + "icon": null + } + ] +} diff --git a/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg b/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg new file mode 100644 index 000000000..e20e68fe8 --- /dev/null +++ b/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg @@ -0,0 +1,56 @@ + +usersid +int +name +string +email +string +password +string +last_login +datetime +productsid +int +price +decimal +sku +string +name +string +ordersid +int +user_id +int +product_id +int +shipmentsid +int +order_id +int +tracking_number +string +status +string + \ No newline at end of file diff --git a/testdata/d2compiler/TestCompile/edge.exp.json b/testdata/d2compiler/TestCompile/edge.exp.json index 124e16991..9ca4f6511 100644 --- a/testdata/d2compiler/TestCompile/edge.exp.json +++ b/testdata/d2compiler/TestCompile/edge.exp.json @@ -74,8 +74,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json index 3d094b9d3..3110298fc 100644 --- a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json +++ b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json @@ -253,8 +253,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_chain.exp.json b/testdata/d2compiler/TestCompile/edge_chain.exp.json index f64d999d9..fad3904ac 100644 --- a/testdata/d2compiler/TestCompile/edge_chain.exp.json +++ b/testdata/d2compiler/TestCompile/edge_chain.exp.json @@ -121,8 +121,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -150,8 +148,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json index d065ea860..df003d462 100644 --- a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json @@ -150,8 +150,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -179,8 +177,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json index 0bac4d0e8..47a51ab19 100644 --- a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json +++ b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json @@ -119,8 +119,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json index 009e8e42d..5655158a5 100644 --- a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json @@ -162,8 +162,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json index 7928b9a1d..cb91401f8 100644 --- a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json @@ -130,8 +130,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_index.exp.json b/testdata/d2compiler/TestCompile/edge_index.exp.json index e166f550f..4ac3a630e 100644 --- a/testdata/d2compiler/TestCompile/edge_index.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index.exp.json @@ -145,8 +145,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_index_map.exp.json b/testdata/d2compiler/TestCompile/edge_index_map.exp.json index dcb1cd57c..35a310c17 100644 --- a/testdata/d2compiler/TestCompile/edge_index_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_map.exp.json @@ -164,8 +164,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json index 8404305e7..b27801d49 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json @@ -174,8 +174,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json index 82dbf0c11..87518a63e 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json @@ -190,8 +190,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json index a1717f2ad..169522086 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json @@ -203,8 +203,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json index 4da868821..6db8f6429 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested_underscore.exp.json @@ -209,8 +209,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json index e11003972..c85eccedc 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_map_flat_nested_underscore.exp.json @@ -222,8 +222,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json b/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json index 132968412..f689762ad 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_map_nested_underscore.exp.json @@ -240,8 +240,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_label_map.exp.json b/testdata/d2compiler/TestCompile/edge_label_map.exp.json index 3e8a6b6ba..e91142b98 100644 --- a/testdata/d2compiler/TestCompile/edge_label_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_label_map.exp.json @@ -130,8 +130,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_map.exp.json b/testdata/d2compiler/TestCompile/edge_map.exp.json index bfb703665..e1d436a20 100644 --- a/testdata/d2compiler/TestCompile/edge_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map.exp.json @@ -113,8 +113,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json index 90abaad35..9abaa0abc 100644 --- a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json @@ -142,8 +142,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json index ed7c148d5..77788e717 100644 --- a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json @@ -158,8 +158,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json index 85ea1c5df..67b44e188 100644 --- a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json @@ -176,8 +176,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json index cf697dee2..44d73ca4d 100644 --- a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json @@ -138,8 +138,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json index 8e32b92a4..18161ea9f 100644 --- a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json @@ -120,8 +120,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json index 3e4570240..40af4edf1 100644 --- a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json @@ -230,8 +230,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json index 216975d17..0298cbd45 100644 --- a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json @@ -124,8 +124,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json index 41f697c38..d55583d16 100644 --- a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json @@ -180,8 +180,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/underscore_edge.exp.json b/testdata/d2compiler/TestCompile/underscore_edge.exp.json index 6ed409295..eb8834c51 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge.exp.json @@ -125,8 +125,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json index 288c99817..6d20bf30c 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json @@ -184,8 +184,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -213,8 +211,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json index 57572fb70..cdbb0e417 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json @@ -191,8 +191,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -220,8 +218,6 @@ "index": 1, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json index ddab4d207..9dc877365 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json @@ -196,8 +196,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json index 14ecfbd7f..f69c79872 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json @@ -165,8 +165,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestCreate/container_edge.exp.json b/testdata/d2oracle/TestCreate/container_edge.exp.json index bf06c85fc..39697a995 100644 --- a/testdata/d2oracle/TestCreate/container_edge.exp.json +++ b/testdata/d2oracle/TestCreate/container_edge.exp.json @@ -103,8 +103,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestCreate/container_edge_label.exp.json b/testdata/d2oracle/TestCreate/container_edge_label.exp.json index 29ad7eef0..4804a6f1e 100644 --- a/testdata/d2oracle/TestCreate/container_edge_label.exp.json +++ b/testdata/d2oracle/TestCreate/container_edge_label.exp.json @@ -113,8 +113,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestCreate/edge.exp.json b/testdata/d2oracle/TestCreate/edge.exp.json index fc60bae77..9b2014c1e 100644 --- a/testdata/d2oracle/TestCreate/edge.exp.json +++ b/testdata/d2oracle/TestCreate/edge.exp.json @@ -74,8 +74,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestCreate/edge_nested.exp.json b/testdata/d2oracle/TestCreate/edge_nested.exp.json index 1f464b526..149603016 100644 --- a/testdata/d2oracle/TestCreate/edge_nested.exp.json +++ b/testdata/d2oracle/TestCreate/edge_nested.exp.json @@ -90,8 +90,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestCreate/edge_scope.exp.json b/testdata/d2oracle/TestCreate/edge_scope.exp.json index 8e7821de1..ea6ae05e1 100644 --- a/testdata/d2oracle/TestCreate/edge_scope.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope.exp.json @@ -103,8 +103,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json index 6a3e4d579..dc5658e40 100644 --- a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json @@ -103,8 +103,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json index b7af67bb8..ea215f9ed 100644 --- a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json @@ -114,8 +114,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestCreate/edge_unique.exp.json b/testdata/d2oracle/TestCreate/edge_unique.exp.json index 97da8095e..64946f4f7 100644 --- a/testdata/d2oracle/TestCreate/edge_unique.exp.json +++ b/testdata/d2oracle/TestCreate/edge_unique.exp.json @@ -260,8 +260,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -289,8 +287,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -318,8 +314,6 @@ "index": 1, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -347,8 +341,6 @@ "index": 2, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/children.exp.json b/testdata/d2oracle/TestDelete/children.exp.json index fc9a1b920..f0cfc7ed9 100644 --- a/testdata/d2oracle/TestDelete/children.exp.json +++ b/testdata/d2oracle/TestDelete/children.exp.json @@ -97,8 +97,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json index 31ce9deed..23512a8fa 100644 --- a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json @@ -130,8 +130,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json index a525711d8..87432da31 100644 --- a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json @@ -223,8 +223,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -252,8 +250,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json index 24ceb61d5..7843427b7 100644 --- a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json @@ -199,8 +199,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/children_scope.exp.json b/testdata/d2oracle/TestDelete/children_scope.exp.json index dc2091ab8..13095ab3f 100644 --- a/testdata/d2oracle/TestDelete/children_scope.exp.json +++ b/testdata/d2oracle/TestDelete/children_scope.exp.json @@ -137,8 +137,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json index 54a921a7c..be9e9d472 100644 --- a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json +++ b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json @@ -107,8 +107,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/edge_common.exp.json b/testdata/d2oracle/TestDelete/edge_common.exp.json index 925d313c9..99941b391 100644 --- a/testdata/d2oracle/TestDelete/edge_common.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common.exp.json @@ -74,8 +74,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/edge_common_2.exp.json b/testdata/d2oracle/TestDelete/edge_common_2.exp.json index fb9787232..08de68293 100644 --- a/testdata/d2oracle/TestDelete/edge_common_2.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_2.exp.json @@ -74,8 +74,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/edge_conflict.exp.json b/testdata/d2oracle/TestDelete/edge_conflict.exp.json index cfcd34319..7a272710b 100644 --- a/testdata/d2oracle/TestDelete/edge_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/edge_conflict.exp.json @@ -119,8 +119,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/edge_decrement.exp.json b/testdata/d2oracle/TestDelete/edge_decrement.exp.json index 959b0037a..d1d9ef1ec 100644 --- a/testdata/d2oracle/TestDelete/edge_decrement.exp.json +++ b/testdata/d2oracle/TestDelete/edge_decrement.exp.json @@ -456,8 +456,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -488,8 +486,6 @@ "index": 1, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -520,8 +516,6 @@ "index": 2, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -552,8 +546,6 @@ "index": 3, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/edge_first.exp.json b/testdata/d2oracle/TestDelete/edge_first.exp.json index f0f488b58..53f981334 100644 --- a/testdata/d2oracle/TestDelete/edge_first.exp.json +++ b/testdata/d2oracle/TestDelete/edge_first.exp.json @@ -185,8 +185,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -214,8 +212,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json index 64696bc89..7cacbe9bb 100644 --- a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json +++ b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json @@ -107,8 +107,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/edge_key_style.exp.json b/testdata/d2oracle/TestDelete/edge_key_style.exp.json index 4198c6047..4f1b062c7 100644 --- a/testdata/d2oracle/TestDelete/edge_key_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_key_style.exp.json @@ -74,8 +74,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/edge_last.exp.json b/testdata/d2oracle/TestDelete/edge_last.exp.json index d8c091987..33cd89cd6 100644 --- a/testdata/d2oracle/TestDelete/edge_last.exp.json +++ b/testdata/d2oracle/TestDelete/edge_last.exp.json @@ -222,8 +222,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -251,8 +249,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -280,8 +276,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/edge_map_style.exp.json b/testdata/d2oracle/TestDelete/edge_map_style.exp.json index f53be47d0..9192eebd7 100644 --- a/testdata/d2oracle/TestDelete/edge_map_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_map_style.exp.json @@ -74,8 +74,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/edge_middle.exp.json b/testdata/d2oracle/TestDelete/edge_middle.exp.json index b0d8a0883..ddb63fae2 100644 --- a/testdata/d2oracle/TestDelete/edge_middle.exp.json +++ b/testdata/d2oracle/TestDelete/edge_middle.exp.json @@ -208,8 +208,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -237,8 +235,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -266,8 +262,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/flat_reserved.exp.json b/testdata/d2oracle/TestDelete/flat_reserved.exp.json index 3fc782f09..d88534289 100644 --- a/testdata/d2oracle/TestDelete/flat_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/flat_reserved.exp.json @@ -74,8 +74,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json index cdc15ffc0..76fbfc09c 100644 --- a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json +++ b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json @@ -97,8 +97,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json index 5031509ac..81d77418a 100644 --- a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json +++ b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json @@ -103,8 +103,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/node_in_edge.exp.json b/testdata/d2oracle/TestDelete/node_in_edge.exp.json index 724743e33..3052f799d 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge.exp.json @@ -172,8 +172,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -201,8 +199,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json index 39b79da16..45740d4b1 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json @@ -211,8 +211,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -240,8 +238,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -269,8 +265,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json index e20ab37f8..30d5e1158 100644 --- a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json @@ -170,8 +170,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json index 49546f538..f46008172 100644 --- a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json @@ -170,8 +170,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/order_1.exp.json b/testdata/d2oracle/TestDelete/order_1.exp.json index 14d3b3449..7736e550d 100644 --- a/testdata/d2oracle/TestDelete/order_1.exp.json +++ b/testdata/d2oracle/TestDelete/order_1.exp.json @@ -97,8 +97,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/order_5.exp.json b/testdata/d2oracle/TestDelete/order_5.exp.json index 286378b3e..54f05a0dc 100644 --- a/testdata/d2oracle/TestDelete/order_5.exp.json +++ b/testdata/d2oracle/TestDelete/order_5.exp.json @@ -149,8 +149,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -178,8 +176,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json index 54e268dda..9fdb4cb6c 100644 --- a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json +++ b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json @@ -271,8 +271,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestDelete/underscore_remove.exp.json b/testdata/d2oracle/TestDelete/underscore_remove.exp.json index 406c74572..88abfd541 100644 --- a/testdata/d2oracle/TestDelete/underscore_remove.exp.json +++ b/testdata/d2oracle/TestDelete/underscore_remove.exp.json @@ -143,8 +143,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -172,8 +170,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json index d9c93c103..16aed2451 100644 --- a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json +++ b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json @@ -134,8 +134,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -163,8 +161,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json b/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json index c4c11a362..c97e6fdc1 100644 --- a/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json +++ b/testdata/d2oracle/TestMove/chain_connected_nested_no_extra_create.exp.json @@ -122,8 +122,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -151,8 +149,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/connected_nested.exp.json b/testdata/d2oracle/TestMove/connected_nested.exp.json index 23433b9a4..030919340 100644 --- a/testdata/d2oracle/TestMove/connected_nested.exp.json +++ b/testdata/d2oracle/TestMove/connected_nested.exp.json @@ -97,8 +97,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/edge_across_containers.exp.json b/testdata/d2oracle/TestMove/edge_across_containers.exp.json index 49046296a..e16514bda 100644 --- a/testdata/d2oracle/TestMove/edge_across_containers.exp.json +++ b/testdata/d2oracle/TestMove/edge_across_containers.exp.json @@ -148,8 +148,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/edge_basic.exp.json b/testdata/d2oracle/TestMove/edge_basic.exp.json index e84230c97..b82200541 100644 --- a/testdata/d2oracle/TestMove/edge_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_basic.exp.json @@ -74,8 +74,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json index aa2bcc9d4..fa6cea6af 100644 --- a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json @@ -111,8 +111,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -140,8 +138,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json index f1b9b0a26..f190d1a29 100644 --- a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json @@ -162,8 +162,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -191,8 +189,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json index 375b91a64..a1227cd4b 100644 --- a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json @@ -145,8 +145,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -174,8 +172,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json index 28aba03a7..c4f8fe4ab 100644 --- a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json @@ -162,8 +162,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -191,8 +189,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/edge_conflict.exp.json b/testdata/d2oracle/TestMove/edge_conflict.exp.json index 140ab2968..517ea0676 100644 --- a/testdata/d2oracle/TestMove/edge_conflict.exp.json +++ b/testdata/d2oracle/TestMove/edge_conflict.exp.json @@ -148,8 +148,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/edge_into_container.exp.json b/testdata/d2oracle/TestMove/edge_into_container.exp.json index 181af1439..f2ab40dd1 100644 --- a/testdata/d2oracle/TestMove/edge_into_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_into_container.exp.json @@ -137,8 +137,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json index 568dbebfb..f2658dc1a 100644 --- a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json @@ -103,8 +103,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json index 67b45ed26..13f4ebe2a 100644 --- a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json @@ -114,8 +114,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/full_edge_slice.exp.json b/testdata/d2oracle/TestMove/full_edge_slice.exp.json index f25008ec8..0d5875894 100644 --- a/testdata/d2oracle/TestMove/full_edge_slice.exp.json +++ b/testdata/d2oracle/TestMove/full_edge_slice.exp.json @@ -217,8 +217,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -246,8 +244,6 @@ "index": 1, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/gnarly_1.exp.json b/testdata/d2oracle/TestMove/gnarly_1.exp.json index a6b80bf4d..dc97d0024 100644 --- a/testdata/d2oracle/TestMove/gnarly_1.exp.json +++ b/testdata/d2oracle/TestMove/gnarly_1.exp.json @@ -361,8 +361,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -390,8 +388,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -419,8 +415,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json index a94526ac5..a74d2c5cd 100644 --- a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json +++ b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json @@ -130,8 +130,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json index ed99f0a61..593084ee0 100644 --- a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json +++ b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json @@ -170,8 +170,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/nhooyr_two.exp.json b/testdata/d2oracle/TestMove/nhooyr_two.exp.json index 2f0420e17..326f0c5d7 100644 --- a/testdata/d2oracle/TestMove/nhooyr_two.exp.json +++ b/testdata/d2oracle/TestMove/nhooyr_two.exp.json @@ -178,8 +178,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/parentheses.exp.json b/testdata/d2oracle/TestMove/parentheses.exp.json index 8a3002281..81e26df25 100644 --- a/testdata/d2oracle/TestMove/parentheses.exp.json +++ b/testdata/d2oracle/TestMove/parentheses.exp.json @@ -113,8 +113,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json index 8856c1d3d..d4f638277 100644 --- a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json +++ b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json @@ -120,8 +120,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json index d1883d2e0..c25fc70ca 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json @@ -137,8 +137,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json index 3a80fc825..1177bff53 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json @@ -103,8 +103,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json index 67f4256e2..aef075e64 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json @@ -114,8 +114,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json index 719a51f26..01d482296 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json @@ -114,8 +114,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json index 18bc1bb71..ac60f92d9 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json @@ -103,8 +103,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json index dbe464ab5..6aa8777c1 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json @@ -136,8 +136,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json index 0c69b2044..6f2f331e9 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json @@ -166,8 +166,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json index 53671a1e7..60bf00ba9 100644 --- a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json +++ b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json @@ -183,8 +183,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestRename/arrows.exp.json b/testdata/d2oracle/TestRename/arrows.exp.json index 0059a0ee0..e83ff7555 100644 --- a/testdata/d2oracle/TestRename/arrows.exp.json +++ b/testdata/d2oracle/TestRename/arrows.exp.json @@ -74,8 +74,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestRename/arrows_chain.exp.json b/testdata/d2oracle/TestRename/arrows_chain.exp.json index d2f0c684f..7838e805c 100644 --- a/testdata/d2oracle/TestRename/arrows_chain.exp.json +++ b/testdata/d2oracle/TestRename/arrows_chain.exp.json @@ -148,8 +148,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -177,8 +175,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -206,8 +202,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestRename/arrows_complex.exp.json b/testdata/d2oracle/TestRename/arrows_complex.exp.json index 2c23df4e9..8cfc0614e 100644 --- a/testdata/d2oracle/TestRename/arrows_complex.exp.json +++ b/testdata/d2oracle/TestRename/arrows_complex.exp.json @@ -128,8 +128,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json index 370c2dbd7..385ac743d 100644 --- a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json +++ b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json @@ -164,8 +164,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -193,8 +191,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -222,8 +218,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json index 6c590ee96..a05533059 100644 --- a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json +++ b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json @@ -214,8 +214,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -243,8 +241,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -272,8 +268,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestRename/complex_edge_1.exp.json b/testdata/d2oracle/TestRename/complex_edge_1.exp.json index e043fe96b..43127797e 100644 --- a/testdata/d2oracle/TestRename/complex_edge_1.exp.json +++ b/testdata/d2oracle/TestRename/complex_edge_1.exp.json @@ -128,8 +128,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestRename/complex_edge_2.exp.json b/testdata/d2oracle/TestRename/complex_edge_2.exp.json index 8d4b5bcbb..a7920769a 100644 --- a/testdata/d2oracle/TestRename/complex_edge_2.exp.json +++ b/testdata/d2oracle/TestRename/complex_edge_2.exp.json @@ -128,8 +128,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestRename/container.exp.json b/testdata/d2oracle/TestRename/container.exp.json index dfc7368c1..2b263f935 100644 --- a/testdata/d2oracle/TestRename/container.exp.json +++ b/testdata/d2oracle/TestRename/container.exp.json @@ -753,8 +753,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -785,8 +783,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -814,8 +810,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -843,8 +837,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -872,8 +864,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -901,8 +891,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -930,8 +918,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestRename/edges.exp.json b/testdata/d2oracle/TestRename/edges.exp.json index 05332edac..a67dce07d 100644 --- a/testdata/d2oracle/TestRename/edges.exp.json +++ b/testdata/d2oracle/TestRename/edges.exp.json @@ -418,8 +418,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -447,8 +445,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -476,8 +472,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -505,8 +499,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -534,8 +526,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -563,8 +553,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/edge.exp.json b/testdata/d2oracle/TestSet/edge.exp.json index 84eaa0647..507949965 100644 --- a/testdata/d2oracle/TestSet/edge.exp.json +++ b/testdata/d2oracle/TestSet/edge.exp.json @@ -84,8 +84,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/edge_append_style.exp.json b/testdata/d2oracle/TestSet/edge_append_style.exp.json index 5149efba5..8f0021f3f 100644 --- a/testdata/d2oracle/TestSet/edge_append_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_append_style.exp.json @@ -119,8 +119,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/edge_chain.exp.json b/testdata/d2oracle/TestSet/edge_chain.exp.json index 197fd7e8f..a4a3367d0 100644 --- a/testdata/d2oracle/TestSet/edge_chain.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain.exp.json @@ -211,8 +211,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -243,8 +241,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json index 5aec0843b..9d923038f 100644 --- a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json @@ -194,8 +194,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -230,8 +228,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json index b733a2aad..812c17710 100644 --- a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json @@ -278,8 +278,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -307,8 +305,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json index 4788f201e..8e321df40 100644 --- a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json @@ -234,8 +234,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -270,8 +268,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/edge_index_case.exp.json b/testdata/d2oracle/TestSet/edge_index_case.exp.json index ed7457e4a..6ab4ab7cb 100644 --- a/testdata/d2oracle/TestSet/edge_index_case.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_case.exp.json @@ -188,8 +188,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 @@ -217,8 +215,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/edge_index_nested.exp.json b/testdata/d2oracle/TestSet/edge_index_nested.exp.json index eee99c486..375636762 100644 --- a/testdata/d2oracle/TestSet/edge_index_nested.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_nested.exp.json @@ -113,8 +113,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json index c2429d831..421bb7d40 100644 --- a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json +++ b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json @@ -164,8 +164,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/edge_label.exp.json b/testdata/d2oracle/TestSet/edge_label.exp.json index 84ca3dd12..1f228e913 100644 --- a/testdata/d2oracle/TestSet/edge_label.exp.json +++ b/testdata/d2oracle/TestSet/edge_label.exp.json @@ -129,8 +129,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/edge_merge_style.exp.json b/testdata/d2oracle/TestSet/edge_merge_style.exp.json index 02875c753..121ce1019 100644 --- a/testdata/d2oracle/TestSet/edge_merge_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_merge_style.exp.json @@ -166,8 +166,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json index f90a08042..5d36f0f28 100644 --- a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json @@ -113,8 +113,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json index ea3e1858e..0b5d5025b 100644 --- a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json @@ -159,8 +159,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/label_primary.exp.json b/testdata/d2oracle/TestSet/label_primary.exp.json index fd5dae0fa..719f76e71 100644 --- a/testdata/d2oracle/TestSet/label_primary.exp.json +++ b/testdata/d2oracle/TestSet/label_primary.exp.json @@ -109,8 +109,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/map_key_missing.exp.json b/testdata/d2oracle/TestSet/map_key_missing.exp.json index 6cb4cafa7..9253e09f0 100644 --- a/testdata/d2oracle/TestSet/map_key_missing.exp.json +++ b/testdata/d2oracle/TestSet/map_key_missing.exp.json @@ -107,8 +107,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 diff --git a/testdata/d2oracle/TestSet/nested_alex.exp.json b/testdata/d2oracle/TestSet/nested_alex.exp.json index e69c81902..29e099bda 100644 --- a/testdata/d2oracle/TestSet/nested_alex.exp.json +++ b/testdata/d2oracle/TestSet/nested_alex.exp.json @@ -179,8 +179,6 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableRowIndex": 0, - "toTableRowIndex": 0, "label_dimensions": { "width": 0, "height": 0 From 28627ad3927c807bd1a434ab4979c26e70a9498d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlio=20C=C3=A9sar=20Batista?= Date: Wed, 16 Nov 2022 12:02:22 -0300 Subject: [PATCH 27/36] Update changelog --- ci/release/changelogs/next.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index 501bb82d7..b07e16c9e 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -6,7 +6,7 @@ For v0.0.99 we focused on X, Y and Z. Enjoy! #### Improvements 🔧 -- Improves something or the other #9999 +- Add table columns indices in edges between SQL Tables so that layout engines can route exactly between rows #### Bugfixes 🔴 From d395dac271ab6bb1136a3235d669d89c52966572 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlio=20C=C3=A9sar=20Batista?= Date: Wed, 16 Nov 2022 12:14:17 -0300 Subject: [PATCH 28/36] Update changelog --- ci/release/changelogs/next.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index b07e16c9e..ffd49ca9c 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -6,7 +6,7 @@ For v0.0.99 we focused on X, Y and Z. Enjoy! #### Improvements 🔧 -- Add table columns indices in edges between SQL Tables so that layout engines can route exactly between rows +- Add table columns indices in edges between SQL Tables so that layout engines can route exactly between them #### Bugfixes 🔴 From 36af87582bfa7ee0c3183b9646ad949ed4c2daeb Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Wed, 16 Nov 2022 07:47:55 -0800 Subject: [PATCH 29/36] release/build.sh: Fix tty issues and add --lockfile-force --- ci/release/build.sh | 13 ++++++++++--- ci/sub | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ci/release/build.sh b/ci/release/build.sh index 242ebd6de..135160f82 100755 --- a/ci/release/build.sh +++ b/ci/release/build.sh @@ -5,7 +5,7 @@ cd -- "$(dirname "$0")/../.." help() { cat </d2---.tar.gz @@ -35,6 +35,9 @@ Flags: --version vX.X.X Use to overwrite the version detected from git. + +--lockfile-force + Forcefully take ownership of remote builder lockfiles. EOF } @@ -71,6 +74,10 @@ main() { flag_nonemptyarg && shift "$FLAGSHIFT" VERSION=$FLAGARG ;; + lockfile-force) + flag_noarg && shift "$FLAGSHIFT" + LOCKFILE_FORCE=1 + ;; '') shift "$FLAGSHIFT" break @@ -165,7 +172,7 @@ build_remote_macos() { trap unlockfile_ssh EXIT sh_c ssh "$REMOTE_HOST" mkdir -p src sh_c rsync --archive --human-readable --delete ./ "$REMOTE_HOST:src/d2/" - sh_c ssh -tttt "$REMOTE_HOST" "DRY_RUN=${DRY_RUN-} \ + sh_c ssh "$REMOTE_HOST" "DRY_RUN=${DRY_RUN-} \ HW_BUILD_DIR=$HW_BUILD_DIR \ VERSION=$VERSION \ OS=$OS \ @@ -183,7 +190,7 @@ build_remote_linux() { trap unlockfile_ssh EXIT sh_c ssh "$REMOTE_HOST" mkdir -p src sh_c rsync --archive --human-readable --delete ./ "$REMOTE_HOST:src/d2/" - sh_c ssh -tttt "$REMOTE_HOST" "DRY_RUN=${DRY_RUN-} \ + sh_c ssh "$REMOTE_HOST" "DRY_RUN=${DRY_RUN-} \ HW_BUILD_DIR=$HW_BUILD_DIR \ VERSION=$VERSION \ OS=$OS \ diff --git a/ci/sub b/ci/sub index 65baeaa0e..df51b9089 160000 --- a/ci/sub +++ b/ci/sub @@ -1 +1 @@ -Subproject commit 65baeaa0e48fff12b12b1d04a0b013ba71e20add +Subproject commit df51b90892737ebe9feca3dd982bcdfc7f684834 From d63caac6a8f19aaf8077209f4cfe645753c68ee4 Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Wed, 16 Nov 2022 08:24:21 -0800 Subject: [PATCH 30/36] ci/release/builders: Switch to Debian 11 for linux builders host OS --- ci/release/builders/aws_ensure.sh | 45 ++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/ci/release/builders/aws_ensure.sh b/ci/release/builders/aws_ensure.sh index c82d68fdb..3a875d832 100755 --- a/ci/release/builders/aws_ensure.sh +++ b/ci/release/builders/aws_ensure.sh @@ -77,7 +77,7 @@ create_remote_hosts() { | jq -r '.Reservations[].Instances[].State.Name') if [ -z "$state" ]; then sh_c aws ec2 run-instances \ - --image-id=ami-0d593311db5abb72b \ + --image-id=ami-071e6cafc48327ca2 \ --count=1 \ --instance-type=t2.small \ --security-groups=ssh \ @@ -90,8 +90,8 @@ create_remote_hosts() { --filters 'Name=instance-state-name,Values=pending,running,stopping,stopped' 'Name=tag:Name,Values=d2-builder-linux-amd64' \ | jq -r '.Reservations[].Instances[].PublicDnsName') if [ -n "$dnsname" ]; then - log "TSTRUCT_LINUX_AMD64_BUILDER=ec2-user@$dnsname" - export TSTRUCT_LINUX_AMD64_BUILDER=ec2-user@$dnsname + log "TSTRUCT_LINUX_AMD64_BUILDER=admin@$dnsname" + export TSTRUCT_LINUX_AMD64_BUILDER=admin@$dnsname break fi sleep 5 @@ -103,7 +103,7 @@ create_remote_hosts() { | jq -r '.Reservations[].Instances[].State.Name') if [ -z "$state" ]; then sh_c aws ec2 run-instances \ - --image-id=ami-0efabcf945ffd8831 \ + --image-id=ami-0e67506f183e5ab60 \ --count=1 \ --instance-type=t4g.small \ --security-groups=ssh \ @@ -116,8 +116,8 @@ create_remote_hosts() { --filters 'Name=instance-state-name,Values=pending,running,stopping,stopped' 'Name=tag:Name,Values=d2-builder-linux-arm64' \ | jq -r '.Reservations[].Instances[].PublicDnsName') if [ -n "$dnsname" ]; then - log "TSTRUCT_LINUX_ARM64_BUILDER=ec2-user@$dnsname" - export TSTRUCT_LINUX_ARM64_BUILDER=ec2-user@$dnsname + log "TSTRUCT_LINUX_ARM64_BUILDER=admin@$dnsname" + export TSTRUCT_LINUX_ARM64_BUILDER=admin@$dnsname break fi sleep 5 @@ -218,11 +218,32 @@ init_remote_linux() { fi sleep 5 done - sh_c ssh "$REMOTE_HOST" 'sudo yum upgrade -y' - sh_c ssh "$REMOTE_HOST" 'sudo yum install -y docker' - sh_c ssh "$REMOTE_HOST" 'sudo systemctl start docker' - sh_c ssh "$REMOTE_HOST" 'sudo systemctl enable docker' - sh_c ssh "$REMOTE_HOST" 'sudo usermod -a -G docker ec2-user' + + sh_c ssh "$REMOTE_HOST" sh -s -- < /dev/null +sudo -E apt-get update -y +sudo -E apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin +sudo groupadd docker || true +sudo usermod -aG docker \$USER +EOF + sh_c ssh "$REMOTE_HOST" 'sudo reboot' || true } @@ -233,7 +254,7 @@ init_remote_macos() { fi sleep 5 done - sh_c ssh "$REMOTE_HOST" '": | /bin/bash -c \"\$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)\""' + sh_c ssh "$REMOTE_HOST" '"/bin/bash -c \"\$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)\""' sh_c ssh "$REMOTE_HOST" 'PATH="/usr/local/bin:/opt/homebrew/bin:\$PATH" brew update' sh_c ssh "$REMOTE_HOST" 'PATH="/usr/local/bin:/opt/homebrew/bin:\$PATH" brew upgrade' sh_c ssh "$REMOTE_HOST" 'PATH="/usr/local/bin:/opt/homebrew/bin:\$PATH" brew install go' From cf264788ad5a5ac7ade50fcb4620ec72bf37951d Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Wed, 16 Nov 2022 08:43:57 -0800 Subject: [PATCH 31/36] ci/release/builders/ssh.sh: Add --- ci/release/builders/ssh.sh | 46 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100755 ci/release/builders/ssh.sh diff --git a/ci/release/builders/ssh.sh b/ci/release/builders/ssh.sh new file mode 100755 index 000000000..0325a99dd --- /dev/null +++ b/ci/release/builders/ssh.sh @@ -0,0 +1,46 @@ +#!/bin/sh +set -eu +cd -- "$(dirname "$0")/../../.." +. ./ci/sub/lib.sh + +help() { + cat < Date: Wed, 16 Nov 2022 14:58:06 -0300 Subject: [PATCH 32/36] Add test for edge column index --- d2compiler/compile_test.go | 26 + .../TestCompile/edge_column_index.exp.json | 559 ++++++++++++++++++ 2 files changed, 585 insertions(+) create mode 100644 testdata/d2compiler/TestCompile/edge_column_index.exp.json diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index 54f59d64c..34e262e69 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -1474,6 +1474,32 @@ b`, g.Objects[0].Attributes.Label.Value) SVP1.style.3d: true`, expErr: `d2/testdata/d2compiler/TestCompile/3d_oval.d2:2:1: key "3d" can only be applied to squares and rectangles `, + }, { + name: "edge_column_index", + text: `src: { + shape: sql_table + id: int + dst_id: int +} + +dst: { + shape: sql_table + id: int + name: string +} + +dst.id <-> src.dst_id +`, + assertions: func(t *testing.T, g *d2graph.Graph) { + fromIndex := g.Edges[0].FromTableColumnIndex + if fromIndex == nil || *fromIndex != 0 { + t.Fatalf("Expected FromTableColumnIndex to be 0, got %v", fromIndex) + } + toIndex := g.Edges[0].ToTableColumnIndex + if toIndex == nil || *toIndex != 1 { + t.Fatalf("Expected ToTableColumnIndex to be 1, got %v", toIndex) + } + }, }, } diff --git a/testdata/d2compiler/TestCompile/edge_column_index.exp.json b/testdata/d2compiler/TestCompile/edge_column_index.exp.json new file mode 100644 index 000000000..74cf487cd --- /dev/null +++ b/testdata/d2compiler/TestCompile/edge_column_index.exp.json @@ -0,0 +1,559 @@ +{ + "graph": { + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,0:0:0-13:0:123", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,0:0:0-4:1:48", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,0:0:0-0:3:3", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,0:0:0-0:3:3", + "value": [ + { + "string": "src", + "raw_string": "src" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,0:5:5-4:0:47", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,1:1:8-1:17:24", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,1:1:8-1:6:13", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,1:1:8-1:6:13", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,1:8:15-1:17:24", + "value": [ + { + "string": "sql_table", + "raw_string": "sql_table" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,2:1:26-2:8:33", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,2:1:26-2:3:28", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,2:1:26-2:3:28", + "value": [ + { + "string": "id", + "raw_string": "id" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,2:5:30-2:8:33", + "value": [ + { + "string": "int", + "raw_string": "int" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,3:1:35-3:12:46", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,3:1:35-3:7:41", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,3:1:35-3:7:41", + "value": [ + { + "string": "dst_id", + "raw_string": "dst_id" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,3:9:43-3:12:46", + "value": [ + { + "string": "int", + "raw_string": "int" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,6:0:50-10:1:99", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,6:0:50-6:3:53", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,6:0:50-6:3:53", + "value": [ + { + "string": "dst", + "raw_string": "dst" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,6:5:55-10:0:98", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,7:1:58-7:17:74", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,7:1:58-7:6:63", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,7:1:58-7:6:63", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,7:8:65-7:17:74", + "value": [ + { + "string": "sql_table", + "raw_string": "sql_table" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,8:1:76-8:8:83", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,8:1:76-8:3:78", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,8:1:76-8:3:78", + "value": [ + { + "string": "id", + "raw_string": "id" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,8:5:80-8:8:83", + "value": [ + { + "string": "int", + "raw_string": "int" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,9:1:85-9:13:97", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,9:1:85-9:5:89", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,9:1:85-9:5:89", + "value": [ + { + "string": "name", + "raw_string": "name" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,9:7:91-9:13:97", + "value": [ + { + "string": "string", + "raw_string": "string" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:0:101-12:21:122", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:0:101-12:21:122", + "src": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:0:101-12:7:108", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:0:101-12:3:104", + "value": [ + { + "string": "dst", + "raw_string": "dst" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:4:105-12:6:107", + "value": [ + { + "string": "id", + "raw_string": "id" + } + ] + } + } + ] + }, + "src_arrow": "<", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:10:111-12:21:122", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:11:112-12:14:115", + "value": [ + { + "string": "src", + "raw_string": "src" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:15:116-12:21:122", + "value": [ + { + "string": "dst_id", + "raw_string": "dst_id" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "attributes": { + "label": { + "value": "" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + } + } + }, + "edges": [ + { + "index": 0, + "minWidth": 0, + "minHeight": 0, + "fromTableColumnIndex": 0, + "toTableColumnIndex": 1, + "label_dimensions": { + "width": 0, + "height": 0 + }, + "isCurve": false, + "src_arrow": true, + "dst_arrow": true, + "references": [ + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + } + } + } + ], + "objects": [ + { + "id": "src", + "id_val": "src", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,0:0:0-0:3:3", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,0:0:0-0:3:3", + "value": [ + { + "string": "src", + "raw_string": "src" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:10:111-12:21:122", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:11:112-12:14:115", + "value": [ + { + "string": "src", + "raw_string": "src" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:15:116-12:21:122", + "value": [ + { + "string": "dst_id", + "raw_string": "dst_id" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "sql_table": { + "columns": [ + { + "name": "id", + "type": "int", + "constraint": "", + "reference": "" + }, + { + "name": "dst_id", + "type": "int", + "constraint": "", + "reference": "" + } + ] + }, + "attributes": { + "label": { + "value": "src" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "sql_table" + } + } + }, + { + "id": "dst", + "id_val": "dst", + "label_dimensions": { + "width": 0, + "height": 0 + }, + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,6:0:50-6:3:53", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,6:0:50-6:3:53", + "value": [ + { + "string": "dst", + "raw_string": "dst" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:0:101-12:7:108", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:0:101-12:3:104", + "value": [ + { + "string": "dst", + "raw_string": "dst" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/edge_column_index.d2,12:4:105-12:6:107", + "value": [ + { + "string": "id", + "raw_string": "id" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "sql_table": { + "columns": [ + { + "name": "id", + "type": "int", + "constraint": "", + "reference": "src.dst_id" + }, + { + "name": "name", + "type": "string", + "constraint": "", + "reference": "" + } + ] + }, + "attributes": { + "label": { + "value": "dst" + }, + "style": {}, + "near_key": null, + "shape": { + "value": "sql_table" + } + } + } + ] + }, + "err": null +} From 06a30f78200ed4073f2d6d3f2300db688dc61b42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlio=20C=C3=A9sar=20Batista?= Date: Wed, 16 Nov 2022 15:54:34 -0300 Subject: [PATCH 33/36] Rename From/To to Src/Dst --- d2compiler/compile.go | 20 +++++++++---------- d2compiler/compile_test.go | 12 +++++------ d2graph/d2graph.go | 4 ++-- .../TestCompile/edge_column_index.exp.json | 4 ++-- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/d2compiler/compile.go b/d2compiler/compile.go index d2bd49d2e..0db0d62d4 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -681,11 +681,11 @@ func (c *compiler) compileSQLTable(obj *d2graph.Object) { } if srcID == absID { d2Col.Reference = strings.TrimPrefix(dstID, parentID+".") - e.FromTableColumnIndex = new(int) - *e.FromTableColumnIndex = len(obj.SQLTable.Columns) + e.SrcTableColumnIndex = new(int) + *e.SrcTableColumnIndex = len(obj.SQLTable.Columns) } else if dstID == absID { - e.ToTableColumnIndex = new(int) - *e.ToTableColumnIndex = len(obj.SQLTable.Columns) + e.DstTableColumnIndex = new(int) + *e.DstTableColumnIndex = len(obj.SQLTable.Columns) } } @@ -746,13 +746,13 @@ func flattenContainer(g *d2graph.Graph, obj *d2graph.Object) { newEdge, _ = g.Root.Connect(e.Src.AbsIDArray(), obj.AbsIDArray(), e.SrcArrow, e.DstArrow, e.Attributes.Label.Value) } // TODO more attributes - if e.FromTableColumnIndex != nil { - newEdge.FromTableColumnIndex = new(int) - *newEdge.FromTableColumnIndex = *e.FromTableColumnIndex + if e.SrcTableColumnIndex != nil { + newEdge.SrcTableColumnIndex = new(int) + *newEdge.SrcTableColumnIndex = *e.SrcTableColumnIndex } - if e.ToTableColumnIndex != nil { - newEdge.ToTableColumnIndex = new(int) - *newEdge.ToTableColumnIndex = *e.ToTableColumnIndex + if e.DstTableColumnIndex != nil { + newEdge.DstTableColumnIndex = new(int) + *newEdge.DstTableColumnIndex = *e.DstTableColumnIndex } newEdge.Attributes.Label = e.Attributes.Label newEdge.References = e.References diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index 34e262e69..51b546f08 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -1491,13 +1491,13 @@ dst: { dst.id <-> src.dst_id `, assertions: func(t *testing.T, g *d2graph.Graph) { - fromIndex := g.Edges[0].FromTableColumnIndex - if fromIndex == nil || *fromIndex != 0 { - t.Fatalf("Expected FromTableColumnIndex to be 0, got %v", fromIndex) + srcIndex := g.Edges[0].SrcTableColumnIndex + if srcIndex == nil || *srcIndex != 0 { + t.Fatalf("Expected SrcTableColumnIndex to be 0, got %v", srcIndex) } - toIndex := g.Edges[0].ToTableColumnIndex - if toIndex == nil || *toIndex != 1 { - t.Fatalf("Expected ToTableColumnIndex to be 1, got %v", toIndex) + dstIndex := g.Edges[0].DstTableColumnIndex + if dstIndex == nil || *dstIndex != 1 { + t.Fatalf("Expected DstTableColumnIndex to be 1, got %v", dstIndex) } }, }, diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index 170aad88d..5687608f1 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -607,8 +607,8 @@ type Edge struct { MinWidth int `json:"minWidth"` MinHeight int `json:"minHeight"` - FromTableColumnIndex *int `json:"fromTableColumnIndex,omitempty"` - ToTableColumnIndex *int `json:"toTableColumnIndex,omitempty"` + SrcTableColumnIndex *int `json:"srcTableColumnIndex,omitempty"` + DstTableColumnIndex *int `json:"dstTableColumnIndex,omitempty"` LabelDimensions d2target.TextDimensions `json:"label_dimensions"` LabelPosition *string `json:"labelPosition,omitempty"` diff --git a/testdata/d2compiler/TestCompile/edge_column_index.exp.json b/testdata/d2compiler/TestCompile/edge_column_index.exp.json index 74cf487cd..8a9fde6d3 100644 --- a/testdata/d2compiler/TestCompile/edge_column_index.exp.json +++ b/testdata/d2compiler/TestCompile/edge_column_index.exp.json @@ -352,8 +352,8 @@ "index": 0, "minWidth": 0, "minHeight": 0, - "fromTableColumnIndex": 0, - "toTableColumnIndex": 1, + "srcTableColumnIndex": 0, + "dstTableColumnIndex": 1, "label_dimensions": { "width": 0, "height": 0 From af3477dffd3fc9e1eb05322ebd57a50b933aadea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlio=20C=C3=A9sar=20Batista?= Date: Wed, 16 Nov 2022 16:15:14 -0300 Subject: [PATCH 34/36] Minor adjustment --- d2compiler/compile_test.go | 4 +-- e2etests/stable_test.go | 63 +++++++++++++++++++------------------- 2 files changed, 33 insertions(+), 34 deletions(-) diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index 51b546f08..c43639cb8 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -1493,11 +1493,11 @@ dst.id <-> src.dst_id assertions: func(t *testing.T, g *d2graph.Graph) { srcIndex := g.Edges[0].SrcTableColumnIndex if srcIndex == nil || *srcIndex != 0 { - t.Fatalf("Expected SrcTableColumnIndex to be 0, got %v", srcIndex) + t.Fatalf("expected SrcTableColumnIndex to be 0, got %v", srcIndex) } dstIndex := g.Edges[0].DstTableColumnIndex if dstIndex == nil || *dstIndex != 1 { - t.Fatalf("Expected DstTableColumnIndex to be 1, got %v", dstIndex) + t.Fatalf("expected DstTableColumnIndex to be 1, got %v", dstIndex) } }, }, diff --git a/e2etests/stable_test.go b/e2etests/stable_test.go index 64d2403bb..ab7d770a9 100644 --- a/e2etests/stable_test.go +++ b/e2etests/stable_test.go @@ -833,42 +833,41 @@ a -> md -> b `, }, { name: "sql_tables", - script: ` - users: { - shape: sql_table - id: int - name: string - email: string - password: string - last_login: datetime - } + script: `users: { + shape: sql_table + id: int + name: string + email: string + password: string + last_login: datetime +} - products: { - shape: sql_table - id: int - price: decimal - sku: string - name: string - } +products: { + shape: sql_table + id: int + price: decimal + sku: string + name: string +} - orders: { - shape: sql_table - id: int - user_id: int - product_id: int - } +orders: { + shape: sql_table + id: int + user_id: int + product_id: int +} - shipments: { - shape: sql_table - id: int - order_id: int - tracking_number: string - status: string - } +shipments: { + shape: sql_table + id: int + order_id: int + tracking_number: string + status: string +} - users.id <-> orders.user_id - products.id <-> orders.product_id - shipments.order_id <-> orders.id`, +users.id <-> orders.user_id +products.id <-> orders.product_id +shipments.order_id <-> orders.id`, }, } From 87d41faef905f2525f123b8e5a7446621ddcd85c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlio=20C=C3=A9sar=20Batista?= Date: Wed, 16 Nov 2022 19:26:14 -0300 Subject: [PATCH 35/36] Update oss.terrastruct.com/diff version --- go.mod | 4 +--- go.sum | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 5f2d06a25..2a85752c5 100644 --- a/go.mod +++ b/go.mod @@ -20,12 +20,10 @@ require ( golang.org/x/text v0.3.7 gonum.org/v1/plot v0.12.0 nhooyr.io/websocket v1.8.7 - oss.terrastruct.com/cmdlog v0.0.0-20221025194258-d3fd7e0b8950 - oss.terrastruct.com/diff v1.0.1 + oss.terrastruct.com/diff v1.0.2-0.20221116222035-8bf4dd3ab541 oss.terrastruct.com/xcontext v0.0.0-20221018000442-50fdafb12f4f oss.terrastruct.com/xdefer v0.0.0-20221017222355-6f3b6e4d1557 oss.terrastruct.com/xjson v0.0.0-20221018000420-4986731c4c4a - oss.terrastruct.com/xos v0.0.0-20221018030138-c96e7ae96e5d oss.terrastruct.com/xrand v0.0.0-20221020211818-4ac08e618333 rogchap.com/v8go v0.7.1-0.20221102201510-1f00b5007d95 ) diff --git a/go.sum b/go.sum index affa68d94..f6ef06249 100644 --- a/go.sum +++ b/go.sum @@ -86,6 +86,7 @@ github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/creack/pty v1.1.9 h1:uDmaGzcdjhF4i/plgjmEsriH11Y0o7RKapEf/LDaM3w= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -772,6 +773,8 @@ oss.terrastruct.com/cmdlog v0.0.0-20221025194258-d3fd7e0b8950 h1:35gU5c1wwHKhXg5 oss.terrastruct.com/cmdlog v0.0.0-20221025194258-d3fd7e0b8950/go.mod h1:ROL3yxl2X+S3O+Rls00qdX6aMh+p1dF8IdxDRwDDpsg= oss.terrastruct.com/diff v1.0.1 h1:WJ0LPXIgj644ne7l9CtDT9sBMDqo1B2/Ir5zdvbxYN8= oss.terrastruct.com/diff v1.0.1/go.mod h1:cRGe5OvyjX7WWKk7CYh73SoS2tEghpTmAY1IPFWbqgE= +oss.terrastruct.com/diff v1.0.2-0.20221116222035-8bf4dd3ab541 h1:I9B1O1IJ6spivIQxbFRZmbhAwVeLwrcQRR1JbYUOvrI= +oss.terrastruct.com/diff v1.0.2-0.20221116222035-8bf4dd3ab541/go.mod h1:ags2QDy/T6jr69hT6bpmAmhr2H98n9o8Atf3QlUJPiU= oss.terrastruct.com/xcontext v0.0.0-20221018000442-50fdafb12f4f h1:7voRCwKM7TZkTo9u7hj+uV/zXoVB8czWrTq6MVIh3dg= oss.terrastruct.com/xcontext v0.0.0-20221018000442-50fdafb12f4f/go.mod h1:Y0coTLsWwX0q3a+/Ndq797t+vWyxm42T49Ik3bzaDKY= oss.terrastruct.com/xdefer v0.0.0-20221017222355-6f3b6e4d1557 h1:rPbhJbN1q7B4tnppSPoAMwq0t6Pk5SrQDQ5S6uoNNHg= From 3d8e30b5e92c0520f6c7a76121ac8b5e7092208d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlio=20C=C3=A9sar=20Batista?= Date: Wed, 16 Nov 2022 19:58:40 -0300 Subject: [PATCH 36/36] tidy --- go.mod | 2 ++ go.sum | 7 ++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 2a85752c5..72c8feb60 100644 --- a/go.mod +++ b/go.mod @@ -20,10 +20,12 @@ require ( golang.org/x/text v0.3.7 gonum.org/v1/plot v0.12.0 nhooyr.io/websocket v1.8.7 + oss.terrastruct.com/cmdlog v0.0.0-20221116181457-07977d95ac37 oss.terrastruct.com/diff v1.0.2-0.20221116222035-8bf4dd3ab541 oss.terrastruct.com/xcontext v0.0.0-20221018000442-50fdafb12f4f oss.terrastruct.com/xdefer v0.0.0-20221017222355-6f3b6e4d1557 oss.terrastruct.com/xjson v0.0.0-20221018000420-4986731c4c4a + oss.terrastruct.com/xos v0.0.0-20221018030138-c96e7ae96e5d oss.terrastruct.com/xrand v0.0.0-20221020211818-4ac08e618333 rogchap.com/v8go v0.7.1-0.20221102201510-1f00b5007d95 ) diff --git a/go.sum b/go.sum index f6ef06249..c9976a706 100644 --- a/go.sum +++ b/go.sum @@ -86,7 +86,6 @@ github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/creack/pty v1.1.9 h1:uDmaGzcdjhF4i/plgjmEsriH11Y0o7RKapEf/LDaM3w= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -769,10 +768,8 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= 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/cmdlog v0.0.0-20221025194258-d3fd7e0b8950 h1:35gU5c1wwHKhXg58F500d6Ev8s+jqQUg4BiDbx2Zr+g= -oss.terrastruct.com/cmdlog v0.0.0-20221025194258-d3fd7e0b8950/go.mod h1:ROL3yxl2X+S3O+Rls00qdX6aMh+p1dF8IdxDRwDDpsg= -oss.terrastruct.com/diff v1.0.1 h1:WJ0LPXIgj644ne7l9CtDT9sBMDqo1B2/Ir5zdvbxYN8= -oss.terrastruct.com/diff v1.0.1/go.mod h1:cRGe5OvyjX7WWKk7CYh73SoS2tEghpTmAY1IPFWbqgE= +oss.terrastruct.com/cmdlog v0.0.0-20221116181457-07977d95ac37 h1:Xy1JKJHc4hcuwi57s0BvGUY16GjxTtBmLUybsuGDU7E= +oss.terrastruct.com/cmdlog v0.0.0-20221116181457-07977d95ac37/go.mod h1:ROL3yxl2X+S3O+Rls00qdX6aMh+p1dF8IdxDRwDDpsg= oss.terrastruct.com/diff v1.0.2-0.20221116222035-8bf4dd3ab541 h1:I9B1O1IJ6spivIQxbFRZmbhAwVeLwrcQRR1JbYUOvrI= oss.terrastruct.com/diff v1.0.2-0.20221116222035-8bf4dd3ab541/go.mod h1:ags2QDy/T6jr69hT6bpmAmhr2H98n9o8Atf3QlUJPiU= oss.terrastruct.com/xcontext v0.0.0-20221018000442-50fdafb12f4f h1:7voRCwKM7TZkTo9u7hj+uV/zXoVB8czWrTq6MVIh3dg=